Shadow RGB

Normand Briere

2019-08-15 33504fc9a180903aace77613264550754fba5706

 ObjEditor.java
..
..
@@ -43,6 +43,35 @@
43
43
     
44
44
     static ObjEditor theFrame;
45
45
 
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
74
+
46
75
     public cGridBag GetSeparator()
47
76
     {
48
77
         cGridBag separator = new cGridBag();
..
..
@@ -75,8 +104,16 @@
75
104
         return new cCheckBox(icon, border);
76
105
     }
77
106
 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
78
109
     ImageIcon GetIcon(String name)
79
110
     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
80
117
         try
81
118
         {
82
119
             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
..
..
@@ -94,10 +131,14 @@
94
131
 //            }
95
132
 
96
133
             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
97
137
             return icon;
98
138
         }
99
139
         catch (Exception e)
100
140
         {
141
+            //icons.put(name, null);
101
142
             return null;
102
143
         }
103
144
     }
..
..
@@ -433,7 +474,7 @@
433
474
         
434
475
         ChangeListener changeListener = new ChangeListener()
435
476
         {
436
-            String name;
477
+            //String name;
437
478
             
438
479
             public void stateChanged(ChangeEvent changeEvent)
439
480
             {
..
..
@@ -453,33 +494,34 @@
453
494
 //                        EditSelection(false);
454
495
 //                }
455
496
 
456
-                if (objectPanel.getSelectedIndex() == 4)
457
-                {
458
-                    name = copy.skyboxname;
459
-                    
460
-                    if (name == null)
461
-                    {
462
-                        name = "";
463
-                    }
464
-                    
465
-                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
-                    copy.skyboxext = "jpg";
467
-                }
468
-                else
469
-                {
470
-                    if (name != null)
471
-                    {
472
-                        if (name.equals(""))
473
-                        {
474
-                            copy.skyboxname = null;
475
-                            copy.skyboxext = null;
476
-                        }
477
-                        else
478
-                        {
479
-                            copy.skyboxname = name;
480
-                        }
481
-                    }
482
-                }
497
+//                if (objectPanel.getSelectedIndex() == 4)
498
+//                {
499
+//                    name = copy.skyboxname;
500
+//                    
501
+//                    if (name == null)
502
+//                    {
503
+//                        name = "";
504
+//                    }
505
+//                    
506
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
507
+//                    copy.skyboxext = "jpg";
508
+//                }
509
+//                else
510
+//                {
511
+//                    if (name != null)
512
+//                    {
513
+//                        if (name.equals(""))
514
+//                        {
515
+//                            copy.skyboxname = null;
516
+//                            copy.skyboxext = null;
517
+//                        }
518
+//                        else
519
+//                        {
520
+//                            copy.skyboxname = name;
521
+//                        }
522
+//                    }
523
+//                }
524
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483
525
                 
484
526
 //                refreshContents(false); // To refresh Info tab
485
527
                 cameraView.repaint();
..
..
@@ -1676,9 +1718,9 @@
1676
1718
         scenePanel.add(tabbedPane);
1677
1719
 
1678
1720
         //if (Globals.ADVANCED)
1679
-            tabbedPane.add(infoPanel);
1680
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
-        tabbedPane.setToolTipTextAt(3, "Information");
1721
+//            tabbedPane.add(infoPanel);
1722
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723
+//        tabbedPane.setToolTipTextAt(3, "Information");
1682
1724
         
1683
1725
         /*
1684
1726
         cTree jTree = new cTree(null);
..
..
@@ -1776,7 +1818,7 @@
1776
1818
 
1777
1819
         frame.getContentPane().setLayout(new BorderLayout());
1778
1820
         /**/
1779
-        JTabbedPane worldPane = new JTabbedPane();
1821
+        //JTabbedPane worldPane = new JTabbedPane();
1780
1822
         //worldPane.add(bigPanel);
1781
1823
         //worldPane.add(worldPanel);
1782
1824
                 /**/
..
..
@@ -2146,6 +2188,21 @@
2146
2188
             }
2147
2189
         });
2148
2190
         presetpanel.add(bump0);
2191
+        
2192
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2193
+        borderShader.setToolTipText("Border fade");
2194
+        borderShader.addMouseListener(new MouseAdapter()
2195
+        {
2196
+            public void mouseClicked(MouseEvent e)
2197
+            {
2198
+                borderfadeField.setFloat(0.5);
2199
+                opacityField.setFloat(0.6);
2200
+
2201
+                materialtouched = true;
2202
+                applySelf();
2203
+            }
2204
+        });
2205
+        presetpanel.add(borderShader);
2149
2206
         
2150
2207
         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2151
2208
         halo.setToolTipText("Halo");
..
..
@@ -3532,32 +3589,8 @@
3532
3589
 
3533
3590
         if (multiplyToggle != null)
3534
3591
                 multiplyToggle.setSelected(mat.multiply);
3535
-
3536
-        assert (object.projectedVertices != null);
3537
-
3538
-        if (object.projectedVertices.length <= 2)
3539
-        {
3540
-            // Side effect...
3541
-            Object3D.cVector2[] keep = object.projectedVertices;
3542
-            object.projectedVertices = new Object3D.cVector2[3];
3543
-            for (int i = 0; i < 3; i++)
3544
-            {
3545
-                if (i < keep.length)
3546
-                {
3547
-                    object.projectedVertices[i] = keep[i];
3548
-                } else
3549
-                {
3550
-                    object.projectedVertices[i] = new Object3D.cVector2();
3551
-                }
3552
-                /*
3553
-                if(keep.length == 0)
3554
-                object.projectedVertices[0] = new Object3D.cVector2();
3555
-                else
3556
-                object.projectedVertices[0] = keep[0];
3557
-                object.projectedVertices[1] = new Object3D.cVector2();
3558
-                 */
3559
-            }
3560
-        }
3592
+        
3593
+        AllocProjectedVertices(object);
3561
3594
 
3562
3595
         SetMaterial(mat, object.projectedVertices);
3563
3596
     }
..
..
@@ -4781,6 +4814,8 @@
4781
4814
             if (muteSlider)
4782
4815
                 return;
4783
4816
             
4817
+            Replace();
4818
+            
4784
4819
             int version = versionSlider.getInteger();
4785
4820
             
4786
4821
             if (version != -1 && copy.versionlist[version] != null)
..
..
@@ -5535,7 +5570,7 @@
5535
5570
             copy.versionlist = new Object3D[100];
5536
5571
             copy.versionindex = -1;
5537
5572
             
5538
-            Save(true);
5573
+            //Save(true);
5539
5574
         }
5540
5575
         
5541
5576
             //? SetUndoStates();