blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 ObjEditor.java
....@@ -388,7 +388,8 @@
388388         //parent = p;
389389 
390390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
391
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
392393         //gd.setFullScreenWindow(this);
393394         //setResizable(false);
394395         //if (!isDisplayable())
....@@ -950,18 +951,24 @@
950951         boolean temp = CameraPane.SWITCH;
951952         CameraPane.SWITCH = false;
952953         
953
-        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);
954958         // if (copy == client)
955959         
956960         Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
957962         object.versionlist = null;
963
+        object.versiontable = null;
958964         
959965         //byte[] compress = Compress(copy);
960966         Object3D compress = (Object3D)Grafreed.clone(object);
961967         
962968         object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
963970         
964
-        object.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
965972         
966973         CameraPane.SWITCH = temp;
967974         
....@@ -1323,14 +1330,14 @@
13231330             
13241331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
13251332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
13261335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
13271336                 selectableCB.setToolTipText("Make object selectable");
13281337 //            Return();
13291338                 
13301339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
13311340                 hideCB.setToolTipText("Hide object");
1332
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333
-        markCB.setToolTipText("As animation target transform");
13341341         
13351342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
13361343         
....@@ -1532,6 +1539,7 @@
15321539 
15331540         if (cam == null || !(copy.get(0) instanceof cGroup))
15341541         {
1542
+        if (Globals.DEBUG)
15351543             System.out.println("CREATE CAMERAS");
15361544             cams = new cTemplate();
15371545             cams.name = "Cameras";
....@@ -1657,14 +1665,14 @@
16571665 
16581666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16591667         //tmp.setName("Edit");
1660
-        objectPanel.add(materialPanel);
1661
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1662
-        objectPanel.setToolTipTextAt(0, "Material");
1663
-    
16641668         objectPanel.add(toolboxPanel);
1665
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1666
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16671671 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
16681676         objectPanel.add(skyboxPanel);
16691677         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16701678         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -2196,7 +2204,7 @@
21962204             public void mouseClicked(MouseEvent e)
21972205             {
21982206                 borderfadeField.setFloat(0.5);
2199
-                opacityField.setFloat(0.6);
2207
+                opacityField.setFloat(0.75);
22002208 
22012209                 materialtouched = true;
22022210                 applySelf();
....@@ -2311,9 +2319,20 @@
23112319 
23122320         cGridBag huepanel = new cGridBag();
23132321             cGridBag huelabel = new cGridBag();
2314
-        skin = GetLabel("icons/hue.png", false);
2315
-        skin.fit = true;
2316
-            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);
23172336             huelabel.preferredWidth = 20;
23182337             huepanel.add(new cGridBag()); // Label
23192338             huepanel.add(huelabel); // Field/slider
....@@ -3900,7 +3919,7 @@
39003919             //System.out.println("ObjEditor " + event);
39013920             applySelf0(true);
39023921             //parent.applySelf();
3903
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
39043923         } else if (source == resetButton)
39053924         {
39063925             CameraPane.fullreset = true;
....@@ -4212,8 +4231,6 @@
42124231         return true;
42134232     }
42144233 
4215
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4216
-    
42174234     void DeleteVersion()
42184235     {
42194236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4221,7 +4238,11 @@
42214238             copy.versionlist[i] = copy.versionlist[i+1];
42224239         }
42234240         
4224
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
4243
+        
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
42254246         
42264247         SetVersionStates();
42274248     }
....@@ -4334,7 +4355,7 @@
43344355         boolean temp = CameraPane.SWITCH;
43354356         CameraPane.SWITCH = false;
43364357         
4337
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43384359         
43394360         copy.clear();
43404361         
....@@ -4346,7 +4367,7 @@
43464367             copy.add(obj.get(i));
43474368         }
43484369         
4349
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43504371         
43514372         CameraPane.SWITCH = temp;
43524373         
....@@ -4409,8 +4430,8 @@
44094430         previousVersionButton.setEnabled(copy.versionindex > 0);
44104431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
44114432         
4412
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4413
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
44144435         
44154436         muteSlider = true;
44164437         versionSlider.setMinimum(0);
....@@ -4475,7 +4496,7 @@
44754496 
44764497     public boolean Replace()
44774498     {
4478
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
44794500         
44804501         //cRadio tab = GetCurrentTab();
44814502         
....@@ -5178,6 +5199,8 @@
51785199         
51795200         if (previousVersionButton != null && copy.versionlist != null)
51805201             SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
51815204     }
51825205     
51835206     static TweenManager tweenManager = new TweenManager();
....@@ -5209,7 +5232,7 @@
52095232 //                group = (Composite) group.get(0);
52105233 //            }
52115234 
5212
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
52135236 
52145237         /*
52155238         if (deselect && jList != null)
....@@ -5563,6 +5586,7 @@
55635586 
55645587             copy.versionlist = readobj.versionlist;
55655588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
55665590             
55675591         if (copy.versionlist == null)
55685592         {