blame | history | patch | commit | commitdiff
Normand Briere
2019-08-18 66aca73cce89e4b4d7521862760edf4b0888bc38 
 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 || name.contains("/"))
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         
....@@ -1221,7 +1318,7 @@
12211318             
12221319         //if (copy.pinned)
12231320         {
1224
-            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1321
+            pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
12251322             pinButton.setSelected(copy.pinned);
12261323             cGridBag t = new cGridBag();
12271324             t.preferredWidth = 2;
....@@ -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,45 @@
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", !Globals.NIMBUSLAF);
1642
+        resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1643
+        resetTransform.addMouseListener(new MouseAdapter()
1644
+        {
1645
+            public void mouseClicked(MouseEvent e)
1646
+            {
1647
+                ResetTransform();
1648
+            }
1649
+        });
1650
+        resetTransformPanel.add(resetTransform);
1651
+        
1652
+        resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1653
+        resetTransform.setToolTipText("Reset Translation only");
1654
+        resetTransform.addMouseListener(new MouseAdapter()
1655
+        {
1656
+            public void mouseClicked(MouseEvent e)
1657
+            {
1658
+                ResetTransform(1);
1659
+            }
1660
+        });
1661
+        resetTransformPanel.add(resetTransform);
1662
+        
1663
+        resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1664
+        resetTransform.setToolTipText("Reset Rotation and Scale only");
1665
+        resetTransform.addMouseListener(new MouseAdapter()
1666
+        {
1667
+            public void mouseClicked(MouseEvent e)
1668
+            {
1669
+                ResetTransform(2);
1670
+            }
1671
+        });
1672
+        resetTransformPanel.add(resetTransform);
1673
+        
15371674         XYZPanel = new cGridBag().setVertical(true);
15381675         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15391676 
....@@ -1543,6 +1680,9 @@
15431680         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15441681         //XYZPanel.setName("XYZ");
15451682 
1683
+        transformPanel.add(resetTransformPanel);
1684
+        transformPanel.add(XYZPanel);
1685
+        
15461686         /*
15471687         gridPanel = new JPanel(); //new BorderLayout());
15481688         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1550,12 +1690,12 @@
15501690         gridPanel.add(cameraView);
15511691         gridPanel.add(XYZPanel);
15521692          */
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);
1693
+//        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1694
+//        gridPanel.setContinuousLayout(true);
1695
+//        gridPanel.setOneTouchExpandable(true);
1696
+//        gridPanel.setDividerLocation(1.0);
1697
+//        gridPanel.setDividerSize(9);
1698
+//        gridPanel.setResizeWeight(0.85);
15591699 
15601700 //                aConstraints.weighty = 0;
15611701         //System.out.println("THIS = " + this);
....@@ -1578,14 +1718,14 @@
15781718 
15791719         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15801720         //tmp.setName("Edit");
1581
-        objectPanel.add(materialPanel);
1582
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583
-        objectPanel.setToolTipTextAt(0, "Material");
1584
-    
15851721         objectPanel.add(toolboxPanel);
1586
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1722
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1723
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15881724 
1725
+        objectPanel.add(materialPanel);
1726
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1727
+        objectPanel.setToolTipTextAt(1, "Material");
1728
+    
15891729         objectPanel.add(skyboxPanel);
15901730         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15911731         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1598,10 +1738,14 @@
15981738         objectPanel.setIconAt(3, GetIcon("icons/write.png"));
15991739         objectPanel.setToolTipTextAt(3, "Edit controls");
16001740         
1601
-        objectPanel.add(XYZPanel);
1741
+        objectPanel.add(transformPanel);
16021742         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1743
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16041744         
1745
+        patchMaterial = true;
1746
+        cameraView.patchMaterial = this;
1747
+        objectPanel.setSelectedIndex(1);
1748
+                
16051749         /*
16061750         aConstraints.gridx = 0;
16071751         aConstraints.gridwidth = 1;
....@@ -1621,7 +1765,7 @@
16211765         scrollpane.addMouseWheelListener(this); // Default not fast enough
16221766 
16231767         /*JTabbedPane*/ scenePanel = new cGridBag();
1624
-        scenePanel.preferredWidth = 5;
1768
+        scenePanel.preferredWidth = 6;
16251769         
16261770         JTabbedPane tabbedPane = new JTabbedPane();
16271771         tabbedPane.add(scrollpane);
....@@ -1632,17 +1776,52 @@
16321776         
16331777         AddOptions(optionsPanel); //, aConstraints);
16341778         
1635
-        tabbedPane.add(optionsPanel);
1636
-        
16371779         tabbedPane.add(FSPane = new cFileSystemPane(this));
16381780 
1781
+        tabbedPane.add(optionsPanel);
1782
+        
16391783         scenePanel.add(tabbedPane);
16401784 
1641
-        //if (Globals.ADVANCED)
1642
-            tabbedPane.add(infoPanel);
1643
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
-        tabbedPane.setToolTipTextAt(3, "Information");
1785
+        cGridBag creditsPanel = new cGridBag().setVertical(true);
1786
+        creditsPanel.setName("Credits");
16451787         
1788
+        cLabel ogaLabel = new cLabel("   Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1789
+	creditsPanel.add(ogaLabel);
1790
+        
1791
+        cButton opengameartButton;
1792
+	creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1793
+        opengameartButton.setToolTipText("https://opengameart.org");
1794
+        
1795
+        opengameartButton.addMouseListener(new MouseAdapter()
1796
+        {
1797
+            public void mouseClicked(MouseEvent e)
1798
+            {
1799
+                try
1800
+                {
1801
+                    Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1802
+                } catch (Exception e1)
1803
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1804
+                {
1805
+                    e1.printStackTrace();
1806
+                }
1807
+            }
1808
+        });
1809
+        
1810
+        for (int i=10; --i>=0;)
1811
+        {
1812
+            creditsPanel.add(new cGridBag());
1813
+        }
1814
+        
1815
+        tabbedPane.add(creditsPanel);
1816
+        tabbedPane.setToolTipTextAt(3, "Credits");
1817
+        
1818
+        if (Globals.ADVANCED)
1819
+        {
1820
+            tabbedPane.add(infoPanel);
1821
+            tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1822
+            tabbedPane.setToolTipTextAt(4, "Information");
1823
+        }
1824
+
16461825         /*
16471826         cTree jTree = new cTree(null);
16481827         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1663,13 +1842,13 @@
16631842         jtp.add(tree);
16641843          */
16651844 
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");
1845
+//        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1846
+//        bigPanel.setContinuousLayout(true);
1847
+//        bigPanel.setOneTouchExpandable(true);
1848
+//        bigPanel.setDividerLocation(0.8);
1849
+//        bigPanel.setDividerSize(15);
1850
+//        bigPanel.setResizeWeight(0.15);
1851
+//        bigPanel.setName("Scene");
16731852 
16741853         //bigPanel.setLayout(new BorderLayout());
16751854         //bigPanel.setSize(new Dimension(10,10));
....@@ -1739,7 +1918,7 @@
17391918 
17401919         frame.getContentPane().setLayout(new BorderLayout());
17411920         /**/
1742
-        JTabbedPane worldPane = new JTabbedPane();
1921
+        //JTabbedPane worldPane = new JTabbedPane();
17431922         //worldPane.add(bigPanel);
17441923         //worldPane.add(worldPanel);
17451924                 /**/
....@@ -1753,7 +1932,7 @@
17531932         
17541933                     cameraView.requestFocusInWindow();
17551934                     
1756
-        gridPanel.setDividerLocation(1.0);
1935
+//        gridPanel.setDividerLocation(1.0);
17571936         
17581937         frame.validate();
17591938 
....@@ -1788,7 +1967,7 @@
17881967     {
17891968         cGridBag presetpanel = new cGridBag().setVertical(true);
17901969         
1791
-        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1970
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
17921971         skin.setToolTipText("Skin");
17931972         skin.addMouseListener(new MouseAdapter()
17941973         {
....@@ -1799,7 +1978,15 @@
17991978                 
18001979                 // Skin
18011980                 colorField.setFloat(material.color);
1802
-                saturationField.setFloat(material.modulation);
1981
+                float saturation = material.modulation;
1982
+                
1983
+                if (!cameraView.Skinshader)
1984
+                {
1985
+                    saturation /= 1.5;
1986
+                }
1987
+                
1988
+                saturationField.setFloat(saturation);
1989
+                
18031990                 subsurfaceField.setFloat(material.subsurface);
18041991                 selfshadowField.setFloat(material.diffuseness);
18051992                 diffusenessField.setFloat(material.factor);
....@@ -1818,7 +2005,7 @@
18182005         });
18192006         presetpanel.add(skin);
18202007         
1821
-        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2008
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
18222009         lambert.setToolTipText("Diffuse");
18232010         lambert.addMouseListener(new MouseAdapter()
18242011         {
....@@ -1836,7 +2023,7 @@
18362023         });
18372024         presetpanel.add(lambert);
18382025         
1839
-        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2026
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
18402027         diffuse2.setToolTipText("Diffuse2");
18412028         diffuse2.addMouseListener(new MouseAdapter()
18422029         {
....@@ -1854,7 +2041,7 @@
18542041         });
18552042         presetpanel.add(diffuse2);
18562043         
1857
-        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2044
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
18582045         diffusemoon.setToolTipText("Moon");
18592046         diffusemoon.addMouseListener(new MouseAdapter()
18602047         {
....@@ -1872,7 +2059,7 @@
18722059         });
18732060         presetpanel.add(diffusemoon);
18742061         
1875
-        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2062
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
18762063         diffusemoon2.setToolTipText("Moon2");
18772064         diffusemoon2.addMouseListener(new MouseAdapter()
18782065         {
....@@ -1890,7 +2077,7 @@
18902077         });
18912078         presetpanel.add(diffusemoon2);
18922079         
1893
-        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2080
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
18942081         diffusemoon3.setToolTipText("Moon3");
18952082         diffusemoon3.addMouseListener(new MouseAdapter()
18962083         {
....@@ -1908,7 +2095,7 @@
19082095         });
19092096         presetpanel.add(diffusemoon3);
19102097         
1911
-        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2098
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
19122099         diffusesheen.setToolTipText("Sheen");
19132100         diffusesheen.addMouseListener(new MouseAdapter()
19142101         {
....@@ -1925,7 +2112,7 @@
19252112         });
19262113         presetpanel.add(diffusesheen);
19272114         
1928
-        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2115
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
19292116         rough.setToolTipText("Rough metal");
19302117         rough.addMouseListener(new MouseAdapter()
19312118         {
....@@ -1943,7 +2130,7 @@
19432130         });
19442131         presetpanel.add(rough);
19452132         
1946
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2133
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
19472134         rough2.setToolTipText("Medium metal");
19482135         rough2.addMouseListener(new MouseAdapter()
19492136         {
....@@ -1961,7 +2148,7 @@
19612148         });
19622149         presetpanel.add(rough2);
19632150         
1964
-        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2151
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
19652152         shini0.setToolTipText("Shiny");
19662153         shini0.addMouseListener(new MouseAdapter()
19672154         {
....@@ -1979,7 +2166,7 @@
19792166         });
19802167         presetpanel.add(shini0);
19812168         
1982
-        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2169
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
19832170         shini1.setToolTipText("Shiny2");
19842171         shini1.addMouseListener(new MouseAdapter()
19852172         {
....@@ -1997,7 +2184,7 @@
19972184         });
19982185         presetpanel.add(shini1);
19992186         
2000
-        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2187
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
20012188         shini2.setToolTipText("Shiny3");
20022189         shini2.addMouseListener(new MouseAdapter()
20032190         {
....@@ -2015,7 +2202,7 @@
20152202         });
20162203         presetpanel.add(shini2);
20172204         
2018
-        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2205
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
20192206         aniso.setToolTipText("AnisoU");
20202207         aniso.addMouseListener(new MouseAdapter()
20212208         {
....@@ -2033,7 +2220,7 @@
20332220         });
20342221         presetpanel.add(aniso);
20352222         
2036
-        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2223
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
20372224         aniso2.setToolTipText("AnisoV");
20382225         aniso2.addMouseListener(new MouseAdapter()
20392226         {
....@@ -2051,7 +2238,7 @@
20512238         });
20522239         presetpanel.add(aniso2);
20532240         
2054
-        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2241
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
20552242         aniso3.setToolTipText("AnisoUV");
20562243         aniso3.addMouseListener(new MouseAdapter()
20572244         {
....@@ -2069,7 +2256,7 @@
20692256         });
20702257         presetpanel.add(aniso3);
20712258         
2072
-        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2259
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
20732260         velvet0.setToolTipText("Velvet");
20742261         velvet0.addMouseListener(new MouseAdapter()
20752262         {
....@@ -2091,7 +2278,7 @@
20912278         });
20922279         presetpanel.add(velvet0);
20932280         
2094
-        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2281
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
20952282         bump0.setToolTipText("Bump texture");
20962283         bump0.addMouseListener(new MouseAdapter()
20972284         {
....@@ -2110,7 +2297,22 @@
21102297         });
21112298         presetpanel.add(bump0);
21122299         
2113
-        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2300
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2301
+        borderShader.setToolTipText("Border fade");
2302
+        borderShader.addMouseListener(new MouseAdapter()
2303
+        {
2304
+            public void mouseClicked(MouseEvent e)
2305
+            {
2306
+                borderfadeField.setFloat(0.5);
2307
+                opacityField.setFloat(0.75);
2308
+
2309
+                materialtouched = true;
2310
+                applySelf();
2311
+            }
2312
+        });
2313
+        presetpanel.add(borderShader);
2314
+        
2315
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
21142316         halo.setToolTipText("Halo");
21152317         halo.addMouseListener(new MouseAdapter()
21162318         {
....@@ -2127,7 +2329,7 @@
21272329         });
21282330         presetpanel.add(halo);
21292331         
2130
-        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2332
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
21312333         candle.setToolTipText("Candle");
21322334         candle.addMouseListener(new MouseAdapter()
21332335         {
....@@ -2149,7 +2351,7 @@
21492351         });
21502352         presetpanel.add(candle);
21512353         
2152
-        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2354
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
21532355         shadowShader.setToolTipText("Shadow");
21542356         shadowShader.addMouseListener(new MouseAdapter()
21552357         {
....@@ -2184,19 +2386,19 @@
21842386 
21852387         cGridBag editBar = new cGridBag().setVertical(false);
21862388             
2187
-        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2389
+        editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
21882390                 createMaterialButton.setToolTipText("Create material");
21892391 
21902392         /*
21912393         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
21922394          */
21932395 
2194
-        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2396
+        editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
21952397                 clearMaterialButton.setToolTipText("Clear material");
21962398         
21972399         if (Globals.ADVANCED)
21982400         {
2199
-                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2401
+                editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
22002402                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
22012403                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
22022404         }
....@@ -2217,9 +2419,20 @@
22172419 
22182420         cGridBag huepanel = new cGridBag();
22192421             cGridBag huelabel = new cGridBag();
2220
-        skin = GetLabel("icons/hue.png", false);
2221
-        skin.fit = true;
2222
-            huelabel.add(skin);
2422
+        cLabel hue = GetLabel("icons/hue.png", false);
2423
+        hue.fit = true;
2424
+        
2425
+        hue.addMouseListener(new MouseAdapter()
2426
+        {
2427
+            public void mousePressed(MouseEvent e)
2428
+            {
2429
+                int x = e.getX();
2430
+                
2431
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2432
+            }
2433
+        });
2434
+        
2435
+            huelabel.add(hue);
22232436             huelabel.preferredWidth = 20;
22242437             huepanel.add(new cGridBag()); // Label
22252438             huepanel.add(huelabel); // Field/slider
....@@ -3495,32 +3708,8 @@
34953708 
34963709         if (multiplyToggle != null)
34973710                 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
-        }
3711
+        
3712
+        AllocProjectedVertices(object);
35243713 
35253714         SetMaterial(mat, object.projectedVertices);
35263715     }
....@@ -3830,7 +4019,7 @@
38304019             //System.out.println("ObjEditor " + event);
38314020             applySelf0(true);
38324021             //parent.applySelf();
3833
-            objEditor.refreshContents();
4022
+     // conflicts with requestFocus       objEditor.refreshContents();
38344023         } else if (source == resetButton)
38354024         {
38364025             CameraPane.fullreset = true;
....@@ -4010,12 +4199,15 @@
40104199 
40114200     void New()
40124201     {
4013
-        while (copy.Size() > 1)
4202
+        while (copy.Size() > 0)
40144203         {
4015
-            copy.remove(1);
4204
+            copy.remove(0);
40164205         }
40174206         
4207
+        copy.selection.clear();
4208
+        
40184209         ResetModel();
4210
+        SetupViews();
40194211         objEditor.refreshContents();
40204212     }
40214213     
....@@ -4123,7 +4315,7 @@
41234315     {
41244316         //Save(true);
41254317         Replace();
4126
-        SetUndoStates();
4318
+        SetVersionStates();
41274319     }
41284320     
41294321     private boolean Equal(byte[] compress, byte[] name)
....@@ -4142,8 +4334,6 @@
41424334         return true;
41434335     }
41444336 
4145
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146
-    
41474337     void DeleteVersion()
41484338     {
41494339         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4151,9 +4341,13 @@
41514341             copy.versionlist[i] = copy.versionlist[i+1];
41524342         }
41534343         
4154
-        CopyChanged();
4344
+        if (copy.versionlist[copy.versionindex] == null)
4345
+            copy.versionindex -= 1;
41554346         
4156
-        SetUndoStates();
4347
+        if (copy.versionindex != -1)
4348
+            CopyChanged();
4349
+        
4350
+        SetVersionStates();
41574351     }
41584352     
41594353     public boolean Save(boolean user)
....@@ -4161,7 +4355,7 @@
41614355         System.err.println("Save");
41624356         Replace();
41634357         
4164
-        cRadio tab = GetCurrentTab();
4358
+        //cRadio tab = GetCurrentTab();
41654359         
41664360         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674361         
....@@ -4199,7 +4393,7 @@
41994393 //            copy.versionlist[i] = null;
42004394 //        }
42014395 
4202
-        SetUndoStates();
4396
+        SetVersionStates();
42034397         
42044398         // test save
42054399         if (false)
....@@ -4259,12 +4453,12 @@
42594453     {
42604454         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614455         
4262
-        SetUndoStates();
4456
+        SetVersionStates();
42634457         
42644458         boolean temp = CameraPane.SWITCH;
42654459         CameraPane.SWITCH = false;
42664460         
4267
-        copy.ExtractBigData(versiontable);
4461
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42684462         
42694463         copy.clear();
42704464         
....@@ -4276,7 +4470,7 @@
42764470             copy.add(obj.get(i));
42774471         }
42784472         
4279
-        copy.RestoreBigData(versiontable);
4473
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42804474         
42814475         CameraPane.SWITCH = temp;
42824476         
....@@ -4326,23 +4520,45 @@
43264520         return count;
43274521     }
43284522     
4329
-    void SetUndoStates()
4523
+    public cGridBag versionSliderPane;
4524
+    
4525
+    void SetVersionStates()
43304526     {
4331
-        cRadio tab = GetCurrentTab();
4527
+        //if (true)
4528
+        //    return;
4529
+                    
4530
+        //cRadio tab = GetCurrentTab();
43324531         
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;
4532
+        if (copy.versionlist == null)
4533
+        {
4534
+            saveVersionButton.setEnabled(false);
4535
+            restoreButton.setEnabled(false);
4536
+            replaceButton.setEnabled(false);
4537
+            previousVersionButton.setEnabled(false);
4538
+            nextVersionButton.setEnabled(false);
4539
+            deleteVersionButton.setEnabled(false);
4540
+            versionSliderPane.setVisible(false);
4541
+        }
4542
+        else
4543
+        {
4544
+            restoreButton.setEnabled(copy.versionindex != -1);
4545
+            replaceButton.setEnabled(copy.versionindex != -1);
4546
+
4547
+            previousVersionButton.setEnabled(copy.versionindex > 0);
4548
+            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4549
+
4550
+            deleteVersionButton.setEnabled(copy.versionindex != -1);
4551
+                                            //copy.versionlist[copy.versionindex + 1] != null);
4552
+
4553
+            muteSlider = true;
4554
+            versionSlider.setMinimum(0);
4555
+            versionSlider.setMaximum(VersionCount() - 1);
4556
+            versionSlider.setInteger(copy.versionindex);
4557
+            versionSlider.setEnabled(copy.versionindex != -1);
4558
+            muteSlider = false;
4559
+            
4560
+            versionSliderPane.setVisible(true);
4561
+        }
43464562     }
43474563     
43484564     public boolean PreviousVersion()
....@@ -4352,7 +4568,7 @@
43524568         
43534569         System.err.println("Undo");
43544570         
4355
-        cRadio tab = GetCurrentTab();
4571
+        //cRadio tab = GetCurrentTab();
43564572         
43574573         if (copy.versionindex == 0)
43584574         {
....@@ -4384,7 +4600,7 @@
43844600     {
43854601         System.err.println("Restore");
43864602         
4387
-        cRadio tab = GetCurrentTab();
4603
+        //cRadio tab = GetCurrentTab();
43884604         
43894605         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904606         {
....@@ -4400,9 +4616,9 @@
44004616 
44014617     public boolean Replace()
44024618     {
4403
-        System.err.println("Replace");
4619
+        //System.err.println("Replace");
44044620         
4405
-        cRadio tab = GetCurrentTab();
4621
+        //cRadio tab = GetCurrentTab();
44064622         
44074623         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084624         {
....@@ -4420,7 +4636,7 @@
44204636         // Option?
44214637         Replace();
44224638         
4423
-        cRadio tab = GetCurrentTab();
4639
+        //cRadio tab = GetCurrentTab();
44244640         
44254641         if (copy.versionlist[copy.versionindex + 1] == null)
44264642         {
....@@ -4627,6 +4843,12 @@
46274843 //            else
46284844 //		applySelf(true);
46294845 //	}
4846
+    
4847
+    boolean Equal(double a, double b)
4848
+    {
4849
+        return Math.abs(a - b) < 0.001;
4850
+    }
4851
+    
46304852     void applySelf0(boolean name)
46314853     {
46324854         if (name)
....@@ -4676,29 +4898,52 @@
46764898                 {
46774899                     cMaterial mat = copy.material;
46784900                             
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));
4901
+                    if (!Equal(colorField.getFloat(), mat.color))
4902
+                        colorField.SetToolTipValue((mat.color));
4903
+                    if (!Equal(saturationField.getFloat(), mat.modulation))
4904
+                        saturationField.SetToolTipValue((mat.modulation));
4905
+                    if (!Equal(metalnessField.getFloat(), mat.metalness))
4906
+                        metalnessField.SetToolTipValue((mat.metalness));
4907
+                    if (!Equal(diffuseField.getFloat(), mat.diffuse))
4908
+                        diffuseField.SetToolTipValue((mat.diffuse));
4909
+                    if (!Equal(specularField.getFloat(), mat.specular))
4910
+                        specularField.SetToolTipValue((mat.specular));
4911
+                    if (!Equal(shininessField.getFloat(), mat.shininess))
4912
+                        shininessField.SetToolTipValue((mat.shininess));
4913
+                    if (!Equal(shiftField.getFloat(), mat.shift))
4914
+                        shiftField.SetToolTipValue((mat.shift));
4915
+                    if (!Equal(ambientField.getFloat(), mat.ambient))
4916
+                        ambientField.SetToolTipValue((mat.ambient));
4917
+                    if (!Equal(lightareaField.getFloat(), mat.lightarea))
4918
+                        lightareaField.SetToolTipValue((mat.lightarea));
4919
+                    if (!Equal(diffusenessField.getFloat(), mat.factor))
4920
+                        diffusenessField.SetToolTipValue((mat.factor));
4921
+                    if (!Equal(velvetField.getFloat(), mat.velvet))
4922
+                        velvetField.SetToolTipValue((mat.velvet));
4923
+                    if (!Equal(sheenField.getFloat(), mat.sheen))
4924
+                        sheenField.SetToolTipValue((mat.sheen));
4925
+                    if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4926
+                        subsurfaceField.SetToolTipValue((mat.subsurface));
4927
+                    if (!Equal(backlitField.getFloat(), mat.bump))
4928
+                        backlitField.SetToolTipValue((mat.bump));
4929
+                    if (!Equal(anisoField.getFloat(), mat.aniso))
4930
+                        anisoField.SetToolTipValue((mat.aniso));
4931
+                    if (!Equal(anisoVField.getFloat(), mat.anisoV))
4932
+                        anisoVField.SetToolTipValue((mat.anisoV));
4933
+                    if (!Equal(cameraField.getFloat(), mat.cameralight))
4934
+                        cameraField.SetToolTipValue((mat.cameralight));
4935
+                    if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4936
+                        selfshadowField.SetToolTipValue((mat.diffuseness));
4937
+                    if (!Equal(shadowField.getFloat(), mat.shadow))
4938
+                        shadowField.SetToolTipValue((mat.shadow));
4939
+                    if (!Equal(textureField.getFloat(), mat.texture))
4940
+                        textureField.SetToolTipValue((mat.texture));
4941
+                    if (!Equal(opacityField.getFloat(), mat.opacity))
4942
+                        opacityField.SetToolTipValue((mat.opacity));
4943
+                    if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4944
+                        fakedepthField.SetToolTipValue((mat.fakedepth));
4945
+                    if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4946
+                        shadowbiasField.SetToolTipValue((mat.shadowbias));
47024947                 }
47034948                 
47044949                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4733,15 +4978,17 @@
47334978     
47344979     public void stateChanged(ChangeEvent e)
47354980     {
4736
-        //    assert(false);
4981
+        // assert(false);
47374982         if (e.getSource() == versionSlider)
47384983         {
47394984             if (muteSlider)
47404985                 return;
47414986             
4987
+            Replace();
4988
+            
47424989             int version = versionSlider.getInteger();
47434990             
4744
-            if (copy.versionlist[version] != null)
4991
+            if (version != -1 && copy.versionlist[version] != null)
47454992             {
47464993                 copy.versionindex = version;
47474994                 CopyChanged();
....@@ -5100,7 +5347,9 @@
51005347         }
51015348         
51025349         if (previousVersionButton != null && copy.versionlist != null)
5103
-            SetUndoStates();
5350
+            SetVersionStates();
5351
+        
5352
+        cameraView.requestFocusInWindow();
51045353     }
51055354     
51065355     static TweenManager tweenManager = new TweenManager();
....@@ -5132,7 +5381,7 @@
51325381 //                group = (Composite) group.get(0);
51335382 //            }
51345383 
5135
-        System.out.println("makeSomething of " + thing);
5384
+        //System.out.println("makeSomething of " + thing);
51365385 
51375386         /*
51385387         if (deselect && jList != null)
....@@ -5486,11 +5735,15 @@
54865735 
54875736             copy.versionlist = readobj.versionlist;
54885737             copy.versionindex = readobj.versionindex;
5738
+            copy.versiontable = readobj.versiontable;
54895739             
54905740         if (copy.versionlist == null)
54915741         {
5742
+            // Backward compatibility
54925743             copy.versionlist = new Object3D[100];
54935744             copy.versionindex = -1;
5745
+            
5746
+            //Save(true);
54945747         }
54955748         
54965749             //? SetUndoStates();
....@@ -5582,6 +5835,8 @@
55825835 
55835836     void save()
55845837     {
5838
+        Replace();
5839
+        
55855840         if (lastname == null)
55865841         {
55875842             return;
....@@ -5836,6 +6091,7 @@
58366091     boolean materialFlushed;
58376092     Object3D latestObject;
58386093     
6094
+    cGridBag transformPanel;
58396095     cGridBag XYZPanel;
58406096     
58416097     JSplitPane gridPanel;