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     }
....@@ -347,7 +391,8 @@
347391         //parent = p;
348392 
349393         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
394
+        if (Globals.DEBUG)
395
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351396         //gd.setFullScreenWindow(this);
352397         //setResizable(false);
353398         //if (!isDisplayable())
....@@ -384,6 +429,9 @@
384429 
385430     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386431 
432
+    // This is to refresh the UI of the material panel.
433
+    boolean patchMaterial;
434
+    
387435     void SetupMenu()
388436     {
389437         frame.setMenuBar(menuBar = new MenuBar());
....@@ -433,6 +481,8 @@
433481         
434482         ChangeListener changeListener = new ChangeListener()
435483         {
484
+            //String name;
485
+            
436486             public void stateChanged(ChangeEvent changeEvent)
437487             {
438488 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -451,7 +501,37 @@
451501 //                        EditSelection(false);
452502 //                }
453503 
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
+                
454533 //                refreshContents(false); // To refresh Info tab
534
+                cameraView.repaint();
455535             }
456536         };
457537         objectPanel.addChangeListener(changeListener);
....@@ -877,18 +957,29 @@
877957         boolean temp = CameraPane.SWITCH;
878958         CameraPane.SWITCH = false;
879959         
880
-        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);
881964         // if (copy == client)
882965         
883966         Object3D versions[] = object.versionlist;
967
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
884968         object.versionlist = null;
969
+        object.versiontable = null;
970
+        
971
+        Object3D parent = object.parent;
972
+        object.parent = null;
885973         
886974         //byte[] compress = Compress(copy);
887975         Object3D compress = (Object3D)Grafreed.clone(object);
888976         
889
-        object.versionlist = versions;
977
+        object.parent = parent;
890978         
891
-        object.RestoreBigData(versiontable);
979
+        object.versionlist = versions;
980
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
981
+        
982
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
892983         
893984         CameraPane.SWITCH = temp;
894985         
....@@ -1250,14 +1341,14 @@
12501341             
12511342         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12521343                 liveCB.setToolTipText("Animate object");
1344
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1345
+        markCB.setToolTipText("Set target transform");
12531346         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12541347                 selectableCB.setToolTipText("Make object selectable");
12551348 //            Return();
12561349                 
12571350         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12581351                 hideCB.setToolTipText("Hide object");
1259
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260
-        markCB.setToolTipText("As animation target transform");
12611352         
12621353         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12631354         
....@@ -1459,6 +1550,7 @@
14591550 
14601551         if (cam == null || !(copy.get(0) instanceof cGroup))
14611552         {
1553
+        if (Globals.DEBUG)
14621554             System.out.println("CREATE CAMERAS");
14631555             cams = new cTemplate();
14641556             cams.name = "Cameras";
....@@ -1540,6 +1632,42 @@
15401632         //frontView.object = copy;
15411633         //sideView.object = copy;
15421634 
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
+        
15431671         XYZPanel = new cGridBag().setVertical(true);
15441672         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15451673 
....@@ -1549,6 +1677,9 @@
15491677         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15501678         //XYZPanel.setName("XYZ");
15511679 
1680
+        transformPanel.add(resetTransformPanel);
1681
+        transformPanel.add(XYZPanel);
1682
+        
15521683         /*
15531684         gridPanel = new JPanel(); //new BorderLayout());
15541685         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1556,12 +1687,12 @@
15561687         gridPanel.add(cameraView);
15571688         gridPanel.add(XYZPanel);
15581689          */
1559
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1560
-        gridPanel.setContinuousLayout(true);
1561
-        gridPanel.setOneTouchExpandable(true);
1562
-        gridPanel.setDividerLocation(1.0);
1563
-        gridPanel.setDividerSize(9);
1564
-        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);
15651696 
15661697 //                aConstraints.weighty = 0;
15671698         //System.out.println("THIS = " + this);
....@@ -1584,14 +1715,14 @@
15841715 
15851716         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15861717         //tmp.setName("Edit");
1587
-        objectPanel.add(materialPanel);
1588
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1589
-        objectPanel.setToolTipTextAt(0, "Material");
1590
-    
15911718         objectPanel.add(toolboxPanel);
1592
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1719
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1720
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15941721 
1722
+        objectPanel.add(materialPanel);
1723
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1724
+        objectPanel.setToolTipTextAt(1, "Material");
1725
+    
15951726         objectPanel.add(skyboxPanel);
15961727         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15971728         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1604,10 +1735,14 @@
16041735         objectPanel.setIconAt(3, GetIcon("icons/write.png"));
16051736         objectPanel.setToolTipTextAt(3, "Edit controls");
16061737         
1607
-        objectPanel.add(XYZPanel);
1738
+        objectPanel.add(transformPanel);
16081739         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1609
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1740
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16101741         
1742
+        patchMaterial = true;
1743
+        cameraView.patchMaterial = this;
1744
+        objectPanel.setSelectedIndex(1);
1745
+                
16111746         /*
16121747         aConstraints.gridx = 0;
16131748         aConstraints.gridwidth = 1;
....@@ -1627,7 +1762,7 @@
16271762         scrollpane.addMouseWheelListener(this); // Default not fast enough
16281763 
16291764         /*JTabbedPane*/ scenePanel = new cGridBag();
1630
-        scenePanel.preferredWidth = 5;
1765
+        scenePanel.preferredWidth = 6;
16311766         
16321767         JTabbedPane tabbedPane = new JTabbedPane();
16331768         tabbedPane.add(scrollpane);
....@@ -1645,9 +1780,9 @@
16451780         scenePanel.add(tabbedPane);
16461781 
16471782         //if (Globals.ADVANCED)
1648
-            tabbedPane.add(infoPanel);
1649
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
-        tabbedPane.setToolTipTextAt(3, "Information");
1783
+//            tabbedPane.add(infoPanel);
1784
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1785
+//        tabbedPane.setToolTipTextAt(3, "Information");
16511786         
16521787         /*
16531788         cTree jTree = new cTree(null);
....@@ -1669,13 +1804,13 @@
16691804         jtp.add(tree);
16701805          */
16711806 
1672
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1673
-        bigPanel.setContinuousLayout(true);
1674
-        bigPanel.setOneTouchExpandable(true);
1675
-        bigPanel.setDividerLocation(0.8);
1676
-        bigPanel.setDividerSize(15);
1677
-        bigPanel.setResizeWeight(0.15);
1678
-        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");
16791814 
16801815         //bigPanel.setLayout(new BorderLayout());
16811816         //bigPanel.setSize(new Dimension(10,10));
....@@ -1745,7 +1880,7 @@
17451880 
17461881         frame.getContentPane().setLayout(new BorderLayout());
17471882         /**/
1748
-        JTabbedPane worldPane = new JTabbedPane();
1883
+        //JTabbedPane worldPane = new JTabbedPane();
17491884         //worldPane.add(bigPanel);
17501885         //worldPane.add(worldPanel);
17511886                 /**/
....@@ -1759,7 +1894,7 @@
17591894         
17601895                     cameraView.requestFocusInWindow();
17611896                     
1762
-        gridPanel.setDividerLocation(1.0);
1897
+//        gridPanel.setDividerLocation(1.0);
17631898         
17641899         frame.validate();
17651900 
....@@ -1805,7 +1940,15 @@
18051940                 
18061941                 // Skin
18071942                 colorField.setFloat(material.color);
1808
-                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
+                
18091952                 subsurfaceField.setFloat(material.subsurface);
18101953                 selfshadowField.setFloat(material.diffuseness);
18111954                 diffusenessField.setFloat(material.factor);
....@@ -2116,6 +2259,21 @@
21162259         });
21172260         presetpanel.add(bump0);
21182261         
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
+        
21192277         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21202278         halo.setToolTipText("Halo");
21212279         halo.addMouseListener(new MouseAdapter()
....@@ -2223,9 +2381,20 @@
22232381 
22242382         cGridBag huepanel = new cGridBag();
22252383             cGridBag huelabel = new cGridBag();
2226
-        skin = GetLabel("icons/hue.png", false);
2227
-        skin.fit = true;
2228
-            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);
22292398             huelabel.preferredWidth = 20;
22302399             huepanel.add(new cGridBag()); // Label
22312400             huepanel.add(huelabel); // Field/slider
....@@ -3501,32 +3670,8 @@
35013670 
35023671         if (multiplyToggle != null)
35033672                 multiplyToggle.setSelected(mat.multiply);
3504
-
3505
-        assert (object.projectedVertices != null);
3506
-
3507
-        if (object.projectedVertices.length <= 2)
3508
-        {
3509
-            // Side effect...
3510
-            Object3D.cVector2[] keep = object.projectedVertices;
3511
-            object.projectedVertices = new Object3D.cVector2[3];
3512
-            for (int i = 0; i < 3; i++)
3513
-            {
3514
-                if (i < keep.length)
3515
-                {
3516
-                    object.projectedVertices[i] = keep[i];
3517
-                } else
3518
-                {
3519
-                    object.projectedVertices[i] = new Object3D.cVector2();
3520
-                }
3521
-                /*
3522
-                if(keep.length == 0)
3523
-                object.projectedVertices[0] = new Object3D.cVector2();
3524
-                else
3525
-                object.projectedVertices[0] = keep[0];
3526
-                object.projectedVertices[1] = new Object3D.cVector2();
3527
-                 */
3528
-            }
3529
-        }
3673
+        
3674
+        AllocProjectedVertices(object);
35303675 
35313676         SetMaterial(mat, object.projectedVertices);
35323677     }
....@@ -3836,7 +3981,7 @@
38363981             //System.out.println("ObjEditor " + event);
38373982             applySelf0(true);
38383983             //parent.applySelf();
3839
-            objEditor.refreshContents();
3984
+     // conflicts with requestFocus       objEditor.refreshContents();
38403985         } else if (source == resetButton)
38413986         {
38423987             CameraPane.fullreset = true;
....@@ -4129,7 +4274,7 @@
41294274     {
41304275         //Save(true);
41314276         Replace();
4132
-        SetUndoStates();
4277
+        SetVersionStates();
41334278     }
41344279     
41354280     private boolean Equal(byte[] compress, byte[] name)
....@@ -4148,8 +4293,6 @@
41484293         return true;
41494294     }
41504295 
4151
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4152
-    
41534296     void DeleteVersion()
41544297     {
41554298         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4157,9 +4300,13 @@
41574300             copy.versionlist[i] = copy.versionlist[i+1];
41584301         }
41594302         
4160
-        CopyChanged();
4303
+        if (copy.versionlist[copy.versionindex] == null)
4304
+            copy.versionindex -= 1;
41614305         
4162
-        SetUndoStates();
4306
+        if (copy.versionindex != -1)
4307
+            CopyChanged();
4308
+        
4309
+        SetVersionStates();
41634310     }
41644311     
41654312     public boolean Save(boolean user)
....@@ -4205,7 +4352,7 @@
42054352 //            copy.versionlist[i] = null;
42064353 //        }
42074354 
4208
-        SetUndoStates();
4355
+        SetVersionStates();
42094356         
42104357         // test save
42114358         if (false)
....@@ -4265,12 +4412,12 @@
42654412     {
42664413         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42674414         
4268
-        SetUndoStates();
4415
+        SetVersionStates();
42694416         
42704417         boolean temp = CameraPane.SWITCH;
42714418         CameraPane.SWITCH = false;
42724419         
4273
-        copy.ExtractBigData(versiontable);
4420
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42744421         
42754422         copy.clear();
42764423         
....@@ -4282,7 +4429,7 @@
42824429             copy.add(obj.get(i));
42834430         }
42844431         
4285
-        copy.RestoreBigData(versiontable);
4432
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42864433         
42874434         CameraPane.SWITCH = temp;
42884435         
....@@ -4332,28 +4479,45 @@
43324479         return count;
43334480     }
43344481     
4335
-    void SetUndoStates()
4482
+    public cGridBag versionSliderPane;
4483
+    
4484
+    void SetVersionStates()
43364485     {
43374486         //if (true)
43384487         //    return;
43394488                     
43404489         //cRadio tab = GetCurrentTab();
43414490         
4342
-        restoreButton.setEnabled(copy.versionindex != -1);
4343
-        replaceButton.setEnabled(copy.versionindex != -1);
4344
-        
4345
-        previousVersionButton.setEnabled(copy.versionindex > 0);
4346
-        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4347
-        
4348
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4349
-                                        copy.versionlist[copy.versionindex + 1] != null);
4350
-        
4351
-        muteSlider = true;
4352
-        versionSlider.setMinimum(0);
4353
-        versionSlider.setMaximum(VersionCount() - 1);
4354
-        versionSlider.setInteger(copy.versionindex);
4355
-        versionSlider.setEnabled(copy.versionindex != -1);
4356
-        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
+        }
43574521     }
43584522     
43594523     public boolean PreviousVersion()
....@@ -4411,7 +4575,7 @@
44114575 
44124576     public boolean Replace()
44134577     {
4414
-        System.err.println("Replace");
4578
+        //System.err.println("Replace");
44154579         
44164580         //cRadio tab = GetCurrentTab();
44174581         
....@@ -4638,6 +4802,12 @@
46384802 //            else
46394803 //		applySelf(true);
46404804 //	}
4805
+    
4806
+    boolean Equal(double a, double b)
4807
+    {
4808
+        return Math.abs(a - b) < 0.001;
4809
+    }
4810
+    
46414811     void applySelf0(boolean name)
46424812     {
46434813         if (name)
....@@ -4687,29 +4857,52 @@
46874857                 {
46884858                     cMaterial mat = copy.material;
46894859                             
4690
-                    colorField.SetToolTipValue((mat.color));
4691
-                    saturationField.SetToolTipValue((mat.modulation));
4692
-                    metalnessField.SetToolTipValue((mat.metalness));
4693
-                    diffuseField.SetToolTipValue((mat.diffuse));
4694
-                    specularField.SetToolTipValue((mat.specular));
4695
-                    shininessField.SetToolTipValue((mat.shininess));
4696
-                    shiftField.SetToolTipValue((mat.shift));
4697
-                    ambientField.SetToolTipValue((mat.ambient));
4698
-                    lightareaField.SetToolTipValue((mat.lightarea));
4699
-                    diffusenessField.SetToolTipValue((mat.factor));
4700
-                    velvetField.SetToolTipValue((mat.velvet));
4701
-                    sheenField.SetToolTipValue((mat.sheen));
4702
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4703
-                    backlitField.SetToolTipValue((mat.bump));
4704
-                    anisoField.SetToolTipValue((mat.aniso));
4705
-                    anisoVField.SetToolTipValue((mat.anisoV));
4706
-                    cameraField.SetToolTipValue((mat.cameralight));
4707
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4708
-                    shadowField.SetToolTipValue((mat.shadow));
4709
-                    textureField.SetToolTipValue((mat.texture));
4710
-                    opacityField.SetToolTipValue((mat.opacity));
4711
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4712
-                    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));
47134906                 }
47144907                 
47154908                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4744,11 +4937,13 @@
47444937     
47454938     public void stateChanged(ChangeEvent e)
47464939     {
4747
-        //    assert(false);
4940
+        // assert(false);
47484941         if (e.getSource() == versionSlider)
47494942         {
47504943             if (muteSlider)
47514944                 return;
4945
+            
4946
+            Replace();
47524947             
47534948             int version = versionSlider.getInteger();
47544949             
....@@ -5111,7 +5306,9 @@
51115306         }
51125307         
51135308         if (previousVersionButton != null && copy.versionlist != null)
5114
-            SetUndoStates();
5309
+            SetVersionStates();
5310
+        
5311
+        cameraView.requestFocusInWindow();
51155312     }
51165313     
51175314     static TweenManager tweenManager = new TweenManager();
....@@ -5143,7 +5340,7 @@
51435340 //                group = (Composite) group.get(0);
51445341 //            }
51455342 
5146
-        System.out.println("makeSomething of " + thing);
5343
+        //System.out.println("makeSomething of " + thing);
51475344 
51485345         /*
51495346         if (deselect && jList != null)
....@@ -5497,6 +5694,7 @@
54975694 
54985695             copy.versionlist = readobj.versionlist;
54995696             copy.versionindex = readobj.versionindex;
5697
+            copy.versiontable = readobj.versiontable;
55005698             
55015699         if (copy.versionlist == null)
55025700         {
....@@ -5504,7 +5702,7 @@
55045702             copy.versionlist = new Object3D[100];
55055703             copy.versionindex = -1;
55065704             
5507
-            Save(true);
5705
+            //Save(true);
55085706         }
55095707         
55105708             //? SetUndoStates();
....@@ -5596,6 +5794,8 @@
55965794 
55975795     void save()
55985796     {
5797
+        Replace();
5798
+        
55995799         if (lastname == null)
56005800         {
56015801             return;
....@@ -5850,6 +6050,7 @@
58506050     boolean materialFlushed;
58516051     Object3D latestObject;
58526052     
6053
+    cGridBag transformPanel;
58536054     cGridBag XYZPanel;
58546055     
58556056     JSplitPane gridPanel;