blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 ObjEditor.java
....@@ -43,6 +43,35 @@
4343     
4444     static ObjEditor theFrame;
4545 
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
+
4675     public cGridBag GetSeparator()
4776     {
4877         cGridBag separator = new cGridBag();
....@@ -359,7 +388,8 @@
359388         //parent = p;
360389 
361390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363393         //gd.setFullScreenWindow(this);
364394         //setResizable(false);
365395         //if (!isDisplayable())
....@@ -921,18 +951,24 @@
921951         boolean temp = CameraPane.SWITCH;
922952         CameraPane.SWITCH = false;
923953         
924
-        object.ExtractBigData(versiontable);
954
+        if (Grafreed.grafreed.universe.versiontable == null)
955
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+         
957
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
925958         // if (copy == client)
926959         
927960         Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928962         object.versionlist = null;
963
+        object.versiontable = null;
929964         
930965         //byte[] compress = Compress(copy);
931966         Object3D compress = (Object3D)Grafreed.clone(object);
932967         
933968         object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
934970         
935
-        object.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936972         
937973         CameraPane.SWITCH = temp;
938974         
....@@ -1294,14 +1330,14 @@
12941330             
12951331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12961332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
12971335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12981336                 selectableCB.setToolTipText("Make object selectable");
12991337 //            Return();
13001338                 
13011339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
13021340                 hideCB.setToolTipText("Hide object");
1303
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
-        markCB.setToolTipText("As animation target transform");
13051341         
13061342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
13071343         
....@@ -1503,6 +1539,7 @@
15031539 
15041540         if (cam == null || !(copy.get(0) instanceof cGroup))
15051541         {
1542
+        if (Globals.DEBUG)
15061543             System.out.println("CREATE CAMERAS");
15071544             cams = new cTemplate();
15081545             cams.name = "Cameras";
....@@ -1628,14 +1665,14 @@
16281665 
16291666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16301667         //tmp.setName("Edit");
1631
-        objectPanel.add(materialPanel);
1632
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633
-        objectPanel.setToolTipTextAt(0, "Material");
1634
-    
16351668         objectPanel.add(toolboxPanel);
1636
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16381671 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
16391676         objectPanel.add(skyboxPanel);
16401677         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16411678         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1789,7 +1826,7 @@
17891826 
17901827         frame.getContentPane().setLayout(new BorderLayout());
17911828         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1829
+        //JTabbedPane worldPane = new JTabbedPane();
17931830         //worldPane.add(bigPanel);
17941831         //worldPane.add(worldPanel);
17951832                 /**/
....@@ -2160,6 +2197,21 @@
21602197         });
21612198         presetpanel.add(bump0);
21622199         
2200
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2201
+        borderShader.setToolTipText("Border fade");
2202
+        borderShader.addMouseListener(new MouseAdapter()
2203
+        {
2204
+            public void mouseClicked(MouseEvent e)
2205
+            {
2206
+                borderfadeField.setFloat(0.5);
2207
+                opacityField.setFloat(0.75);
2208
+
2209
+                materialtouched = true;
2210
+                applySelf();
2211
+            }
2212
+        });
2213
+        presetpanel.add(borderShader);
2214
+        
21632215         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21642216         halo.setToolTipText("Halo");
21652217         halo.addMouseListener(new MouseAdapter()
....@@ -2267,9 +2319,20 @@
22672319 
22682320         cGridBag huepanel = new cGridBag();
22692321             cGridBag huelabel = new cGridBag();
2270
-        skin = GetLabel("icons/hue.png", false);
2271
-        skin.fit = true;
2272
-            huelabel.add(skin);
2322
+        cLabel hue = GetLabel("icons/hue.png", false);
2323
+        hue.fit = true;
2324
+        
2325
+        hue.addMouseListener(new MouseAdapter()
2326
+        {
2327
+            public void mousePressed(MouseEvent e)
2328
+            {
2329
+                int x = e.getX();
2330
+                
2331
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2332
+            }
2333
+        });
2334
+        
2335
+            huelabel.add(hue);
22732336             huelabel.preferredWidth = 20;
22742337             huepanel.add(new cGridBag()); // Label
22752338             huepanel.add(huelabel); // Field/slider
....@@ -3545,32 +3608,8 @@
35453608 
35463609         if (multiplyToggle != null)
35473610                 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
-        }
3611
+        
3612
+        AllocProjectedVertices(object);
35743613 
35753614         SetMaterial(mat, object.projectedVertices);
35763615     }
....@@ -3880,7 +3919,7 @@
38803919             //System.out.println("ObjEditor " + event);
38813920             applySelf0(true);
38823921             //parent.applySelf();
3883
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
38843923         } else if (source == resetButton)
38853924         {
38863925             CameraPane.fullreset = true;
....@@ -4192,8 +4231,6 @@
41924231         return true;
41934232     }
41944233 
4195
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196
-    
41974234     void DeleteVersion()
41984235     {
41994236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4201,7 +4238,11 @@
42014238             copy.versionlist[i] = copy.versionlist[i+1];
42024239         }
42034240         
4204
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
4243
+        
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
42054246         
42064247         SetVersionStates();
42074248     }
....@@ -4314,7 +4355,7 @@
43144355         boolean temp = CameraPane.SWITCH;
43154356         CameraPane.SWITCH = false;
43164357         
4317
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43184359         
43194360         copy.clear();
43204361         
....@@ -4326,7 +4367,7 @@
43264367             copy.add(obj.get(i));
43274368         }
43284369         
4329
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43304371         
43314372         CameraPane.SWITCH = temp;
43324373         
....@@ -4389,8 +4430,8 @@
43894430         previousVersionButton.setEnabled(copy.versionindex > 0);
43904431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43914432         
4392
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43944435         
43954436         muteSlider = true;
43964437         versionSlider.setMinimum(0);
....@@ -4455,7 +4496,7 @@
44554496 
44564497     public boolean Replace()
44574498     {
4458
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
44594500         
44604501         //cRadio tab = GetCurrentTab();
44614502         
....@@ -5158,6 +5199,8 @@
51585199         
51595200         if (previousVersionButton != null && copy.versionlist != null)
51605201             SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
51615204     }
51625205     
51635206     static TweenManager tweenManager = new TweenManager();
....@@ -5189,7 +5232,7 @@
51895232 //                group = (Composite) group.get(0);
51905233 //            }
51915234 
5192
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
51935236 
51945237         /*
51955238         if (deselect && jList != null)
....@@ -5543,6 +5586,7 @@
55435586 
55445587             copy.versionlist = readobj.versionlist;
55455588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
55465590             
55475591         if (copy.versionlist == null)
55485592         {
....@@ -5550,7 +5594,7 @@
55505594             copy.versionlist = new Object3D[100];
55515595             copy.versionindex = -1;
55525596             
5553
-            Save(true);
5597
+            //Save(true);
55545598         }
55555599         
55565600             //? SetUndoStates();