blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009 
 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();
....@@ -54,7 +83,10 @@
5483     cButton GetButton(String name, boolean border)
5584     {
5685         ImageIcon icon = GetIcon(name);
57
-        return new cButton(icon, border);
86
+        if (icon != null)
87
+            return new cButton(icon, border);
88
+        else
89
+            return new cButton(name, border);
5890     }
5991 
6092     cLabel GetLabel(String name, boolean border)
....@@ -75,11 +107,19 @@
75107         return new cCheckBox(icon, border);
76108     }
77109 
78
-    ImageIcon GetIcon(String name)
110
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
111
+    
112
+    static ImageIcon GetIcon(String name)
79113     {
114
+        javax.swing.ImageIcon iconCache = icons.get(name);
115
+        if (iconCache != null)
116
+        {
117
+            return iconCache;
118
+        }
119
+        
80120         try
81121         {
82
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
122
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83123 
84124 //            if (image.getWidth() > 48 && image.getHeight() > 48)
85125 //            {
....@@ -94,10 +134,14 @@
94134 //            }
95135 
96136             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
137
+            
138
+            icons.put(name, icon);
139
+            
97140             return icon;
98141         }
99142         catch (Exception e)
100143         {
144
+            //icons.put(name, null);
101145             return null;
102146         }
103147     }
....@@ -297,11 +341,13 @@
297341         client = inClient;
298342         copy = client;
299343 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
344
+//        if (copy.versionlist == null)
345
+//        {
346
+//            copy.versionlist = new Object3D[100];
347
+//            copy.versionindex = -1;
348
+//            
349
+//            callee.Save(true);
350
+//        }
305351         
306352         // "this" is not called: SetupUI2(objEditor);
307353     }
....@@ -320,6 +366,8 @@
320366         {
321367             copy.versionlist = new Object3D[100];
322368             copy.versionindex = -1;
369
+            
370
+//            Save(true);
323371         }
324372         
325373         SetupUI2(callee.GetEditor());
....@@ -343,7 +391,8 @@
343391         //parent = p;
344392 
345393         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
394
+        if (Globals.DEBUG)
395
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347396         //gd.setFullScreenWindow(this);
348397         //setResizable(false);
349398         //if (!isDisplayable())
....@@ -354,11 +403,13 @@
354403         copy = localCopy;
355404         copy.editWindow = this;
356405 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
406
+//        if (copy.versionlist == null)
407
+//        {
408
+//            copy.versionlist = new Object3D[100];
360409 //            copy.versionindex = -1;
361
-        }
410
+//            
411
+//            Save(true);
412
+//        }
362413         
363414         SetupMenu();
364415 
....@@ -378,6 +429,9 @@
378429 
379430     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380431 
432
+    // This is to refresh the UI of the material panel.
433
+    boolean patchMaterial;
434
+    
381435     void SetupMenu()
382436     {
383437         frame.setMenuBar(menuBar = new MenuBar());
....@@ -427,6 +481,8 @@
427481         
428482         ChangeListener changeListener = new ChangeListener()
429483         {
484
+            //String name;
485
+            
430486             public void stateChanged(ChangeEvent changeEvent)
431487             {
432488 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +501,37 @@
445501 //                        EditSelection(false);
446502 //                }
447503 
448
-                refreshContents(false); // To refresh Info tab
504
+//                if (objectPanel.getSelectedIndex() == 4)
505
+//                {
506
+//                    name = copy.skyboxname;
507
+//                    
508
+//                    if (name == null)
509
+//                    {
510
+//                        name = "";
511
+//                    }
512
+//                    
513
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
514
+//                    copy.skyboxext = "jpg";
515
+//                }
516
+//                else
517
+//                {
518
+//                    if (name != null)
519
+//                    {
520
+//                        if (name.equals(""))
521
+//                        {
522
+//                            copy.skyboxname = null;
523
+//                            copy.skyboxext = null;
524
+//                        }
525
+//                        else
526
+//                        {
527
+//                            copy.skyboxname = name;
528
+//                        }
529
+//                    }
530
+//                }
531
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
532
+                
533
+//                refreshContents(false); // To refresh Info tab
534
+                cameraView.repaint();
449535             }
450536         };
451537         objectPanel.addChangeListener(changeListener);
....@@ -871,18 +957,29 @@
871957         boolean temp = CameraPane.SWITCH;
872958         CameraPane.SWITCH = false;
873959         
874
-        object.ExtractBigData(versiontable);
960
+        if (Grafreed.grafreed.universe.versiontable == null)
961
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
962
+         
963
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
875964         // if (copy == client)
876965         
877966         Object3D versions[] = object.versionlist;
967
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878968         object.versionlist = null;
969
+        object.versiontable = null;
970
+        
971
+        Object3D parent = object.parent;
972
+        object.parent = null;
879973         
880974         //byte[] compress = Compress(copy);
881975         Object3D compress = (Object3D)Grafreed.clone(object);
882976         
883
-        object.versionlist = versions;
977
+        object.parent = parent;
884978         
885
-        object.RestoreBigData(versiontable);
979
+        object.versionlist = versions;
980
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
981
+        
982
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886983         
887984         CameraPane.SWITCH = temp;
888985         
....@@ -1244,14 +1341,14 @@
12441341             
12451342         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12461343                 liveCB.setToolTipText("Animate object");
1344
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1345
+        markCB.setToolTipText("Set target transform");
12471346         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12481347                 selectableCB.setToolTipText("Make object selectable");
12491348 //            Return();
12501349                 
12511350         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12521351                 hideCB.setToolTipText("Hide object");
1253
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254
-        markCB.setToolTipText("As animation target transform");
12551352         
12561353         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12571354         
....@@ -1453,6 +1550,7 @@
14531550 
14541551         if (cam == null || !(copy.get(0) instanceof cGroup))
14551552         {
1553
+        if (Globals.DEBUG)
14561554             System.out.println("CREATE CAMERAS");
14571555             cams = new cTemplate();
14581556             cams.name = "Cameras";
....@@ -1534,6 +1632,42 @@
15341632         //frontView.object = copy;
15351633         //sideView.object = copy;
15361634 
1635
+        transformPanel = new cGridBag().setVertical(true);
1636
+        
1637
+        cGridBag resetTransformPanel = new cGridBag();
1638
+        
1639
+        resetTransformPanel.preferredHeight = 2;
1640
+        
1641
+        cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
1642
+        resetTransform.addMouseListener(new MouseAdapter()
1643
+        {
1644
+            public void mouseClicked(MouseEvent e)
1645
+            {
1646
+                ResetTransform();
1647
+            }
1648
+        });
1649
+        resetTransformPanel.add(resetTransform);
1650
+        
1651
+        resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
1652
+        resetTransform.addMouseListener(new MouseAdapter()
1653
+        {
1654
+            public void mouseClicked(MouseEvent e)
1655
+            {
1656
+                ResetTransform(1);
1657
+            }
1658
+        });
1659
+        resetTransformPanel.add(resetTransform);
1660
+        
1661
+        resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
1662
+        resetTransform.addMouseListener(new MouseAdapter()
1663
+        {
1664
+            public void mouseClicked(MouseEvent e)
1665
+            {
1666
+                ResetTransform(2);
1667
+            }
1668
+        });
1669
+        resetTransformPanel.add(resetTransform);
1670
+        
15371671         XYZPanel = new cGridBag().setVertical(true);
15381672         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15391673 
....@@ -1543,6 +1677,9 @@
15431677         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15441678         //XYZPanel.setName("XYZ");
15451679 
1680
+        transformPanel.add(resetTransformPanel);
1681
+        transformPanel.add(XYZPanel);
1682
+        
15461683         /*
15471684         gridPanel = new JPanel(); //new BorderLayout());
15481685         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1550,12 +1687,12 @@
15501687         gridPanel.add(cameraView);
15511688         gridPanel.add(XYZPanel);
15521689          */
1553
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1554
-        gridPanel.setContinuousLayout(true);
1555
-        gridPanel.setOneTouchExpandable(true);
1556
-        gridPanel.setDividerLocation(1.0);
1557
-        gridPanel.setDividerSize(9);
1558
-        gridPanel.setResizeWeight(0.85);
1690
+//        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1691
+//        gridPanel.setContinuousLayout(true);
1692
+//        gridPanel.setOneTouchExpandable(true);
1693
+//        gridPanel.setDividerLocation(1.0);
1694
+//        gridPanel.setDividerSize(9);
1695
+//        gridPanel.setResizeWeight(0.85);
15591696 
15601697 //                aConstraints.weighty = 0;
15611698         //System.out.println("THIS = " + this);
....@@ -1578,14 +1715,14 @@
15781715 
15791716         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15801717         //tmp.setName("Edit");
1581
-        objectPanel.add(materialPanel);
1582
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583
-        objectPanel.setToolTipTextAt(0, "Material");
1584
-    
15851718         objectPanel.add(toolboxPanel);
1586
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1719
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1720
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15881721 
1722
+        objectPanel.add(materialPanel);
1723
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1724
+        objectPanel.setToolTipTextAt(1, "Material");
1725
+    
15891726         objectPanel.add(skyboxPanel);
15901727         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15911728         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1598,10 +1735,14 @@
15981735         objectPanel.setIconAt(3, GetIcon("icons/write.png"));
15991736         objectPanel.setToolTipTextAt(3, "Edit controls");
16001737         
1601
-        objectPanel.add(XYZPanel);
1738
+        objectPanel.add(transformPanel);
16021739         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1740
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16041741         
1742
+        patchMaterial = true;
1743
+        cameraView.patchMaterial = this;
1744
+        objectPanel.setSelectedIndex(1);
1745
+                
16051746         /*
16061747         aConstraints.gridx = 0;
16071748         aConstraints.gridwidth = 1;
....@@ -1621,7 +1762,7 @@
16211762         scrollpane.addMouseWheelListener(this); // Default not fast enough
16221763 
16231764         /*JTabbedPane*/ scenePanel = new cGridBag();
1624
-        scenePanel.preferredWidth = 5;
1765
+        scenePanel.preferredWidth = 6;
16251766         
16261767         JTabbedPane tabbedPane = new JTabbedPane();
16271768         tabbedPane.add(scrollpane);
....@@ -1639,9 +1780,9 @@
16391780         scenePanel.add(tabbedPane);
16401781 
16411782         //if (Globals.ADVANCED)
1642
-            tabbedPane.add(infoPanel);
1643
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
-        tabbedPane.setToolTipTextAt(3, "Information");
1783
+//            tabbedPane.add(infoPanel);
1784
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1785
+//        tabbedPane.setToolTipTextAt(3, "Information");
16451786         
16461787         /*
16471788         cTree jTree = new cTree(null);
....@@ -1663,13 +1804,13 @@
16631804         jtp.add(tree);
16641805          */
16651806 
1666
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1667
-        bigPanel.setContinuousLayout(true);
1668
-        bigPanel.setOneTouchExpandable(true);
1669
-        bigPanel.setDividerLocation(0.8);
1670
-        bigPanel.setDividerSize(15);
1671
-        bigPanel.setResizeWeight(0.15);
1672
-        bigPanel.setName("Scene");
1807
+//        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1808
+//        bigPanel.setContinuousLayout(true);
1809
+//        bigPanel.setOneTouchExpandable(true);
1810
+//        bigPanel.setDividerLocation(0.8);
1811
+//        bigPanel.setDividerSize(15);
1812
+//        bigPanel.setResizeWeight(0.15);
1813
+//        bigPanel.setName("Scene");
16731814 
16741815         //bigPanel.setLayout(new BorderLayout());
16751816         //bigPanel.setSize(new Dimension(10,10));
....@@ -1739,7 +1880,7 @@
17391880 
17401881         frame.getContentPane().setLayout(new BorderLayout());
17411882         /**/
1742
-        JTabbedPane worldPane = new JTabbedPane();
1883
+        //JTabbedPane worldPane = new JTabbedPane();
17431884         //worldPane.add(bigPanel);
17441885         //worldPane.add(worldPanel);
17451886                 /**/
....@@ -1753,7 +1894,7 @@
17531894         
17541895                     cameraView.requestFocusInWindow();
17551896                     
1756
-        gridPanel.setDividerLocation(1.0);
1897
+//        gridPanel.setDividerLocation(1.0);
17571898         
17581899         frame.validate();
17591900 
....@@ -1799,7 +1940,15 @@
17991940                 
18001941                 // Skin
18011942                 colorField.setFloat(material.color);
1802
-                saturationField.setFloat(material.modulation);
1943
+                float saturation = material.modulation;
1944
+                
1945
+                if (!cameraView.Skinshader)
1946
+                {
1947
+                    saturation /= 1.5;
1948
+                }
1949
+                
1950
+                saturationField.setFloat(saturation);
1951
+                
18031952                 subsurfaceField.setFloat(material.subsurface);
18041953                 selfshadowField.setFloat(material.diffuseness);
18051954                 diffusenessField.setFloat(material.factor);
....@@ -2110,6 +2259,21 @@
21102259         });
21112260         presetpanel.add(bump0);
21122261         
2262
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2263
+        borderShader.setToolTipText("Border fade");
2264
+        borderShader.addMouseListener(new MouseAdapter()
2265
+        {
2266
+            public void mouseClicked(MouseEvent e)
2267
+            {
2268
+                borderfadeField.setFloat(0.5);
2269
+                opacityField.setFloat(0.75);
2270
+
2271
+                materialtouched = true;
2272
+                applySelf();
2273
+            }
2274
+        });
2275
+        presetpanel.add(borderShader);
2276
+        
21132277         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21142278         halo.setToolTipText("Halo");
21152279         halo.addMouseListener(new MouseAdapter()
....@@ -2217,9 +2381,20 @@
22172381 
22182382         cGridBag huepanel = new cGridBag();
22192383             cGridBag huelabel = new cGridBag();
2220
-        skin = GetLabel("icons/hue.png", false);
2221
-        skin.fit = true;
2222
-            huelabel.add(skin);
2384
+        cLabel hue = GetLabel("icons/hue.png", false);
2385
+        hue.fit = true;
2386
+        
2387
+        hue.addMouseListener(new MouseAdapter()
2388
+        {
2389
+            public void mousePressed(MouseEvent e)
2390
+            {
2391
+                int x = e.getX();
2392
+                
2393
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2394
+            }
2395
+        });
2396
+        
2397
+            huelabel.add(hue);
22232398             huelabel.preferredWidth = 20;
22242399             huepanel.add(new cGridBag()); // Label
22252400             huepanel.add(huelabel); // Field/slider
....@@ -3495,32 +3670,8 @@
34953670 
34963671         if (multiplyToggle != null)
34973672                 multiplyToggle.setSelected(mat.multiply);
3498
-
3499
-        assert (object.projectedVertices != null);
3500
-
3501
-        if (object.projectedVertices.length <= 2)
3502
-        {
3503
-            // Side effect...
3504
-            Object3D.cVector2[] keep = object.projectedVertices;
3505
-            object.projectedVertices = new Object3D.cVector2[3];
3506
-            for (int i = 0; i < 3; i++)
3507
-            {
3508
-                if (i < keep.length)
3509
-                {
3510
-                    object.projectedVertices[i] = keep[i];
3511
-                } else
3512
-                {
3513
-                    object.projectedVertices[i] = new Object3D.cVector2();
3514
-                }
3515
-                /*
3516
-                if(keep.length == 0)
3517
-                object.projectedVertices[0] = new Object3D.cVector2();
3518
-                else
3519
-                object.projectedVertices[0] = keep[0];
3520
-                object.projectedVertices[1] = new Object3D.cVector2();
3521
-                 */
3522
-            }
3523
-        }
3673
+        
3674
+        AllocProjectedVertices(object);
35243675 
35253676         SetMaterial(mat, object.projectedVertices);
35263677     }
....@@ -3830,7 +3981,7 @@
38303981             //System.out.println("ObjEditor " + event);
38313982             applySelf0(true);
38323983             //parent.applySelf();
3833
-            objEditor.refreshContents();
3984
+     // conflicts with requestFocus       objEditor.refreshContents();
38343985         } else if (source == resetButton)
38353986         {
38363987             CameraPane.fullreset = true;
....@@ -4123,7 +4274,7 @@
41234274     {
41244275         //Save(true);
41254276         Replace();
4126
-        SetUndoStates();
4277
+        SetVersionStates();
41274278     }
41284279     
41294280     private boolean Equal(byte[] compress, byte[] name)
....@@ -4142,8 +4293,6 @@
41424293         return true;
41434294     }
41444295 
4145
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146
-    
41474296     void DeleteVersion()
41484297     {
41494298         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4151,9 +4300,13 @@
41514300             copy.versionlist[i] = copy.versionlist[i+1];
41524301         }
41534302         
4154
-        CopyChanged();
4303
+        if (copy.versionlist[copy.versionindex] == null)
4304
+            copy.versionindex -= 1;
41554305         
4156
-        SetUndoStates();
4306
+        if (copy.versionindex != -1)
4307
+            CopyChanged();
4308
+        
4309
+        SetVersionStates();
41574310     }
41584311     
41594312     public boolean Save(boolean user)
....@@ -4161,7 +4314,7 @@
41614314         System.err.println("Save");
41624315         Replace();
41634316         
4164
-        cRadio tab = GetCurrentTab();
4317
+        //cRadio tab = GetCurrentTab();
41654318         
41664319         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674320         
....@@ -4199,7 +4352,7 @@
41994352 //            copy.versionlist[i] = null;
42004353 //        }
42014354 
4202
-        SetUndoStates();
4355
+        SetVersionStates();
42034356         
42044357         // test save
42054358         if (false)
....@@ -4259,12 +4412,12 @@
42594412     {
42604413         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614414         
4262
-        SetUndoStates();
4415
+        SetVersionStates();
42634416         
42644417         boolean temp = CameraPane.SWITCH;
42654418         CameraPane.SWITCH = false;
42664419         
4267
-        copy.ExtractBigData(versiontable);
4420
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42684421         
42694422         copy.clear();
42704423         
....@@ -4276,7 +4429,7 @@
42764429             copy.add(obj.get(i));
42774430         }
42784431         
4279
-        copy.RestoreBigData(versiontable);
4432
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42804433         
42814434         CameraPane.SWITCH = temp;
42824435         
....@@ -4326,23 +4479,45 @@
43264479         return count;
43274480     }
43284481     
4329
-    void SetUndoStates()
4482
+    public cGridBag versionSliderPane;
4483
+    
4484
+    void SetVersionStates()
43304485     {
4331
-        cRadio tab = GetCurrentTab();
4486
+        //if (true)
4487
+        //    return;
4488
+                    
4489
+        //cRadio tab = GetCurrentTab();
43324490         
4333
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4335
-        
4336
-        previousVersionButton.setEnabled(copy.versionindex > 0);
4337
-        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4338
-        
4339
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340
-                                        copy.versionlist[copy.versionindex + 1] != null);
4341
-        
4342
-        muteSlider = true;
4343
-        versionSlider.setMaximum(VersionCount() - 1);
4344
-        versionSlider.setInteger(copy.versionindex);
4345
-        muteSlider = false;
4491
+        if (copy.versionlist == null)
4492
+        {
4493
+            saveVersionButton.setEnabled(false);
4494
+            restoreButton.setEnabled(false);
4495
+            replaceButton.setEnabled(false);
4496
+            previousVersionButton.setEnabled(false);
4497
+            nextVersionButton.setEnabled(false);
4498
+            deleteVersionButton.setEnabled(false);
4499
+            versionSliderPane.setVisible(false);
4500
+        }
4501
+        else
4502
+        {
4503
+            restoreButton.setEnabled(copy.versionindex != -1);
4504
+            replaceButton.setEnabled(copy.versionindex != -1);
4505
+
4506
+            previousVersionButton.setEnabled(copy.versionindex > 0);
4507
+            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4508
+
4509
+            deleteVersionButton.setEnabled(copy.versionindex != -1);
4510
+                                            //copy.versionlist[copy.versionindex + 1] != null);
4511
+
4512
+            muteSlider = true;
4513
+            versionSlider.setMinimum(0);
4514
+            versionSlider.setMaximum(VersionCount() - 1);
4515
+            versionSlider.setInteger(copy.versionindex);
4516
+            versionSlider.setEnabled(copy.versionindex != -1);
4517
+            muteSlider = false;
4518
+            
4519
+            versionSliderPane.setVisible(true);
4520
+        }
43464521     }
43474522     
43484523     public boolean PreviousVersion()
....@@ -4352,7 +4527,7 @@
43524527         
43534528         System.err.println("Undo");
43544529         
4355
-        cRadio tab = GetCurrentTab();
4530
+        //cRadio tab = GetCurrentTab();
43564531         
43574532         if (copy.versionindex == 0)
43584533         {
....@@ -4384,7 +4559,7 @@
43844559     {
43854560         System.err.println("Restore");
43864561         
4387
-        cRadio tab = GetCurrentTab();
4562
+        //cRadio tab = GetCurrentTab();
43884563         
43894564         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904565         {
....@@ -4400,9 +4575,9 @@
44004575 
44014576     public boolean Replace()
44024577     {
4403
-        System.err.println("Replace");
4578
+        //System.err.println("Replace");
44044579         
4405
-        cRadio tab = GetCurrentTab();
4580
+        //cRadio tab = GetCurrentTab();
44064581         
44074582         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084583         {
....@@ -4420,7 +4595,7 @@
44204595         // Option?
44214596         Replace();
44224597         
4423
-        cRadio tab = GetCurrentTab();
4598
+        //cRadio tab = GetCurrentTab();
44244599         
44254600         if (copy.versionlist[copy.versionindex + 1] == null)
44264601         {
....@@ -4627,6 +4802,12 @@
46274802 //            else
46284803 //		applySelf(true);
46294804 //	}
4805
+    
4806
+    boolean Equal(double a, double b)
4807
+    {
4808
+        return Math.abs(a - b) < 0.001;
4809
+    }
4810
+    
46304811     void applySelf0(boolean name)
46314812     {
46324813         if (name)
....@@ -4676,29 +4857,52 @@
46764857                 {
46774858                     cMaterial mat = copy.material;
46784859                             
4679
-                    colorField.SetToolTipValue((mat.color));
4680
-                    saturationField.SetToolTipValue((mat.modulation));
4681
-                    metalnessField.SetToolTipValue((mat.metalness));
4682
-                    diffuseField.SetToolTipValue((mat.diffuse));
4683
-                    specularField.SetToolTipValue((mat.specular));
4684
-                    shininessField.SetToolTipValue((mat.shininess));
4685
-                    shiftField.SetToolTipValue((mat.shift));
4686
-                    ambientField.SetToolTipValue((mat.ambient));
4687
-                    lightareaField.SetToolTipValue((mat.lightarea));
4688
-                    diffusenessField.SetToolTipValue((mat.factor));
4689
-                    velvetField.SetToolTipValue((mat.velvet));
4690
-                    sheenField.SetToolTipValue((mat.sheen));
4691
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4692
-                    backlitField.SetToolTipValue((mat.bump));
4693
-                    anisoField.SetToolTipValue((mat.aniso));
4694
-                    anisoVField.SetToolTipValue((mat.anisoV));
4695
-                    cameraField.SetToolTipValue((mat.cameralight));
4696
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4697
-                    shadowField.SetToolTipValue((mat.shadow));
4698
-                    textureField.SetToolTipValue((mat.texture));
4699
-                    opacityField.SetToolTipValue((mat.opacity));
4700
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4701
-                    shadowbiasField.SetToolTipValue((mat.shadowbias));
4860
+                    if (!Equal(colorField.getFloat(), mat.color))
4861
+                        colorField.SetToolTipValue((mat.color));
4862
+                    if (!Equal(saturationField.getFloat(), mat.modulation))
4863
+                        saturationField.SetToolTipValue((mat.modulation));
4864
+                    if (!Equal(metalnessField.getFloat(), mat.metalness))
4865
+                        metalnessField.SetToolTipValue((mat.metalness));
4866
+                    if (!Equal(diffuseField.getFloat(), mat.diffuse))
4867
+                        diffuseField.SetToolTipValue((mat.diffuse));
4868
+                    if (!Equal(specularField.getFloat(), mat.specular))
4869
+                        specularField.SetToolTipValue((mat.specular));
4870
+                    if (!Equal(shininessField.getFloat(), mat.shininess))
4871
+                        shininessField.SetToolTipValue((mat.shininess));
4872
+                    if (!Equal(shiftField.getFloat(), mat.shift))
4873
+                        shiftField.SetToolTipValue((mat.shift));
4874
+                    if (!Equal(ambientField.getFloat(), mat.ambient))
4875
+                        ambientField.SetToolTipValue((mat.ambient));
4876
+                    if (!Equal(lightareaField.getFloat(), mat.lightarea))
4877
+                        lightareaField.SetToolTipValue((mat.lightarea));
4878
+                    if (!Equal(diffusenessField.getFloat(), mat.factor))
4879
+                        diffusenessField.SetToolTipValue((mat.factor));
4880
+                    if (!Equal(velvetField.getFloat(), mat.velvet))
4881
+                        velvetField.SetToolTipValue((mat.velvet));
4882
+                    if (!Equal(sheenField.getFloat(), mat.sheen))
4883
+                        sheenField.SetToolTipValue((mat.sheen));
4884
+                    if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4885
+                        subsurfaceField.SetToolTipValue((mat.subsurface));
4886
+                    if (!Equal(backlitField.getFloat(), mat.bump))
4887
+                        backlitField.SetToolTipValue((mat.bump));
4888
+                    if (!Equal(anisoField.getFloat(), mat.aniso))
4889
+                        anisoField.SetToolTipValue((mat.aniso));
4890
+                    if (!Equal(anisoVField.getFloat(), mat.anisoV))
4891
+                        anisoVField.SetToolTipValue((mat.anisoV));
4892
+                    if (!Equal(cameraField.getFloat(), mat.cameralight))
4893
+                        cameraField.SetToolTipValue((mat.cameralight));
4894
+                    if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4895
+                        selfshadowField.SetToolTipValue((mat.diffuseness));
4896
+                    if (!Equal(shadowField.getFloat(), mat.shadow))
4897
+                        shadowField.SetToolTipValue((mat.shadow));
4898
+                    if (!Equal(textureField.getFloat(), mat.texture))
4899
+                        textureField.SetToolTipValue((mat.texture));
4900
+                    if (!Equal(opacityField.getFloat(), mat.opacity))
4901
+                        opacityField.SetToolTipValue((mat.opacity));
4902
+                    if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4903
+                        fakedepthField.SetToolTipValue((mat.fakedepth));
4904
+                    if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4905
+                        shadowbiasField.SetToolTipValue((mat.shadowbias));
47024906                 }
47034907                 
47044908                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4733,15 +4937,17 @@
47334937     
47344938     public void stateChanged(ChangeEvent e)
47354939     {
4736
-        //    assert(false);
4940
+        // assert(false);
47374941         if (e.getSource() == versionSlider)
47384942         {
47394943             if (muteSlider)
47404944                 return;
47414945             
4946
+            Replace();
4947
+            
47424948             int version = versionSlider.getInteger();
47434949             
4744
-            if (copy.versionlist[version] != null)
4950
+            if (version != -1 && copy.versionlist[version] != null)
47454951             {
47464952                 copy.versionindex = version;
47474953                 CopyChanged();
....@@ -5100,7 +5306,9 @@
51005306         }
51015307         
51025308         if (previousVersionButton != null && copy.versionlist != null)
5103
-            SetUndoStates();
5309
+            SetVersionStates();
5310
+        
5311
+        cameraView.requestFocusInWindow();
51045312     }
51055313     
51065314     static TweenManager tweenManager = new TweenManager();
....@@ -5132,7 +5340,7 @@
51325340 //                group = (Composite) group.get(0);
51335341 //            }
51345342 
5135
-        System.out.println("makeSomething of " + thing);
5343
+        //System.out.println("makeSomething of " + thing);
51365344 
51375345         /*
51385346         if (deselect && jList != null)
....@@ -5486,11 +5694,15 @@
54865694 
54875695             copy.versionlist = readobj.versionlist;
54885696             copy.versionindex = readobj.versionindex;
5697
+            copy.versiontable = readobj.versiontable;
54895698             
54905699         if (copy.versionlist == null)
54915700         {
5701
+            // Backward compatibility
54925702             copy.versionlist = new Object3D[100];
54935703             copy.versionindex = -1;
5704
+            
5705
+            //Save(true);
54945706         }
54955707         
54965708             //? SetUndoStates();
....@@ -5582,6 +5794,8 @@
55825794 
55835795     void save()
55845796     {
5797
+        Replace();
5798
+        
55855799         if (lastname == null)
55865800         {
55875801             return;
....@@ -5836,6 +6050,7 @@
58366050     boolean materialFlushed;
58376051     Object3D latestObject;
58386052     
6053
+    cGridBag transformPanel;
58396054     cGridBag XYZPanel;
58406055     
58416056     JSplitPane gridPanel;