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();
..
..
@@ -1789,7 +1818,7 @@
1789
1818
 
1790
1819
         frame.getContentPane().setLayout(new BorderLayout());
1791
1820
         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1821
+        //JTabbedPane worldPane = new JTabbedPane();
1793
1822
         //worldPane.add(bigPanel);
1794
1823
         //worldPane.add(worldPanel);
1795
1824
                 /**/
..
..
@@ -2159,6 +2188,21 @@
2159
2188
             }
2160
2189
         });
2161
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);
2162
2206
         
2163
2207
         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2164
2208
         halo.setToolTipText("Halo");
..
..
@@ -3545,32 +3589,8 @@
3545
3589
 
3546
3590
         if (multiplyToggle != null)
3547
3591
                 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
-        assert (object.projectedVertices != null);
3550
-
3551
-        if (object.projectedVertices.length <= 2)
3552
-        {
3553
-            // Side effect...
3554
-            Object3D.cVector2[] keep = object.projectedVertices;
3555
-            object.projectedVertices = new Object3D.cVector2[3];
3556
-            for (int i = 0; i < 3; i++)
3557
-            {
3558
-                if (i < keep.length)
3559
-                {
3560
-                    object.projectedVertices[i] = keep[i];
3561
-                } else
3562
-                {
3563
-                    object.projectedVertices[i] = new Object3D.cVector2();
3564
-                }
3565
-                /*
3566
-                if(keep.length == 0)
3567
-                object.projectedVertices[0] = new Object3D.cVector2();
3568
-                else
3569
-                object.projectedVertices[0] = keep[0];
3570
-                object.projectedVertices[1] = new Object3D.cVector2();
3571
-                 */
3572
-            }
3573
-        }
3592
+        
3593
+        AllocProjectedVertices(object);
3574
3594
 
3575
3595
         SetMaterial(mat, object.projectedVertices);
3576
3596
     }
..
..
@@ -5550,7 +5570,7 @@
5550
5570
             copy.versionlist = new Object3D[100];
5551
5571
             copy.versionindex = -1;
5552
5572
             
5553
-            Save(true);
5573
+            //Save(true);
5554
5574
         }
5555
5575
         
5556
5576
             //? SetUndoStates();