blame | history | patch | commit | commitdiff
Normand Briere
2019-08-20 7dc9a8879ed29a7693d617afcb48014504ddc4a9 
 ObjEditor.java
....@@ -72,6 +72,21 @@
7272         }
7373     }
7474 
75
+    public Composite CreateCameras()
76
+    {
77
+        Composite cams = new cTemplate();
78
+        cams.name = "Cameras";
79
+        copy.insertElementAt(cams, 0);
80
+
81
+        cams.addChild(new Camera());
82
+        cams.addChild(new Camera(1));
83
+        cams.addChild(new Camera(2));
84
+        cams.addChild(new Camera(3));
85
+        cams.addChild(new Camera(4));
86
+        
87
+        return cams;
88
+    }
89
+
7590     public cGridBag GetSeparator()
7691     {
7792         cGridBag separator = new cGridBag();
....@@ -83,7 +98,10 @@
8398     cButton GetButton(String name, boolean border)
8499     {
85100         ImageIcon icon = GetIcon(name);
86
-        return new cButton(icon, border);
101
+        if (icon != null || name.contains("/"))
102
+            return new cButton(icon, border);
103
+        else
104
+            return new cButton(name, border);
87105     }
88106 
89107     cLabel GetLabel(String name, boolean border)
....@@ -442,8 +460,11 @@
442460 		importOBJItem.addActionListener(this);
443461 		import3DSItem = menu.add(new MenuItem("3DS file..."));
444462 		import3DSItem.addActionListener(this);
463
+                if (Globals.ADVANCED)
464
+                {
445465 		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
446466 		importVRMLX3DItem.addActionListener(this);
467
+                }
447468 		menu.add("-");
448469 		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
449470 		importGFDItem.addActionListener(this);
....@@ -965,8 +986,13 @@
965986         object.versionlist = null;
966987         object.versiontable = null;
967988         
989
+        Object3D parent = object.parent;
990
+        object.parent = null;
991
+        
968992         //byte[] compress = Compress(copy);
969993         Object3D compress = (Object3D)Grafreed.clone(object);
994
+        
995
+        object.parent = parent;
970996         
971997         object.versionlist = versions;
972998         object.versiontable = versiontable; // if Grafreed.grafreed.universe
....@@ -1310,7 +1336,7 @@
13101336             
13111337         //if (copy.pinned)
13121338         {
1313
-            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1339
+            pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
13141340             pinButton.setSelected(copy.pinned);
13151341             cGridBag t = new cGridBag();
13161342             t.preferredWidth = 2;
....@@ -1542,23 +1568,9 @@
15421568 
15431569         if (cam == null || !(copy.get(0) instanceof cGroup))
15441570         {
1545
-        if (Globals.DEBUG)
1546
-            System.out.println("CREATE CAMERAS");
1547
-            cams = new cTemplate();
1548
-            cams.name = "Cameras";
1549
-            copy.insertElementAt(cams, 0);
1550
-            //cams.parent = copy;
1551
-
1552
-            cam = new Camera(); // LA.newVector(3, 2, 1));
1553
-            cams.addChild(cam);
1554
-            cam = new Camera(1);
1555
-            cams.addChild(cam);
1556
-            cam = new Camera(2);
1557
-            cams.addChild(cam);
1558
-            cam = new Camera(3);
1559
-            cams.addChild(cam);
1560
-            cam = new Camera(4); // Light
1561
-            cams.addChild(cam);
1571
+            if (Globals.DEBUG)
1572
+                System.out.println("CREATE CAMERAS");
1573
+            cams = CreateCameras();
15621574         } else
15631575         {
15641576             cams = (cGroup) copy.get(0);
....@@ -1624,6 +1636,45 @@
16241636         //frontView.object = copy;
16251637         //sideView.object = copy;
16261638 
1639
+        transformPanel = new cGridBag().setVertical(true);
1640
+        
1641
+        cGridBag resetTransformPanel = new cGridBag();
1642
+        
1643
+        resetTransformPanel.preferredHeight = 2;
1644
+        
1645
+        cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1646
+        resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1647
+        resetTransform.addMouseListener(new MouseAdapter()
1648
+        {
1649
+            public void mouseClicked(MouseEvent e)
1650
+            {
1651
+                ResetTransform();
1652
+            }
1653
+        });
1654
+        resetTransformPanel.add(resetTransform);
1655
+        
1656
+        resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1657
+        resetTransform.setToolTipText("Reset Translation only");
1658
+        resetTransform.addMouseListener(new MouseAdapter()
1659
+        {
1660
+            public void mouseClicked(MouseEvent e)
1661
+            {
1662
+                ResetTransform(1);
1663
+            }
1664
+        });
1665
+        resetTransformPanel.add(resetTransform);
1666
+        
1667
+        resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1668
+        resetTransform.setToolTipText("Reset Rotation and Scale only");
1669
+        resetTransform.addMouseListener(new MouseAdapter()
1670
+        {
1671
+            public void mouseClicked(MouseEvent e)
1672
+            {
1673
+                ResetTransform(2);
1674
+            }
1675
+        });
1676
+        resetTransformPanel.add(resetTransform);
1677
+        
16271678         XYZPanel = new cGridBag().setVertical(true);
16281679         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
16291680 
....@@ -1633,6 +1684,9 @@
16331684         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
16341685         //XYZPanel.setName("XYZ");
16351686 
1687
+        transformPanel.add(resetTransformPanel);
1688
+        transformPanel.add(XYZPanel);
1689
+        
16361690         /*
16371691         gridPanel = new JPanel(); //new BorderLayout());
16381692         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1640,12 +1694,12 @@
16401694         gridPanel.add(cameraView);
16411695         gridPanel.add(XYZPanel);
16421696          */
1643
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1644
-        gridPanel.setContinuousLayout(true);
1645
-        gridPanel.setOneTouchExpandable(true);
1646
-        gridPanel.setDividerLocation(1.0);
1647
-        gridPanel.setDividerSize(9);
1648
-        gridPanel.setResizeWeight(0.85);
1697
+//        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1698
+//        gridPanel.setContinuousLayout(true);
1699
+//        gridPanel.setOneTouchExpandable(true);
1700
+//        gridPanel.setDividerLocation(1.0);
1701
+//        gridPanel.setDividerSize(9);
1702
+//        gridPanel.setResizeWeight(0.85);
16491703 
16501704 //                aConstraints.weighty = 0;
16511705         //System.out.println("THIS = " + this);
....@@ -1668,33 +1722,33 @@
16681722 
16691723         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16701724         //tmp.setName("Edit");
1725
+        objectPanel.add(skyboxPanel);
1726
+        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1727
+        objectPanel.setToolTipTextAt(0, "Backgrounds");
1728
+        
16711729         objectPanel.add(toolboxPanel);
1672
-        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
-        objectPanel.setToolTipTextAt(0, "Objects & textures");
1730
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1731
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
16741732 
16751733         objectPanel.add(materialPanel);
1676
-        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
-        objectPanel.setToolTipTextAt(1, "Material");
1734
+        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1735
+        objectPanel.setToolTipTextAt(2, "Material");
16781736     
1679
-        objectPanel.add(skyboxPanel);
1680
-        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1681
-        objectPanel.setToolTipTextAt(2, "Backgrounds");
1682
-        
16831737 //        JPanel north = new JPanel(new BorderLayout());
16841738 //        north.setName("Edit");
16851739 //        north.add(ctrlPanel, BorderLayout.NORTH);
16861740 //        objectPanel.add(north);
16871741         objectPanel.add(editPanel);
1688
-        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1742
+        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
16891743         objectPanel.setToolTipTextAt(3, "Edit controls");
16901744         
1691
-        objectPanel.add(XYZPanel);
1745
+        objectPanel.add(transformPanel);
16921746         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1747
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16941748         
16951749         patchMaterial = true;
16961750         cameraView.patchMaterial = this;
1697
-        objectPanel.setSelectedIndex(1);
1751
+        objectPanel.setSelectedIndex(2);
16981752                 
16991753         /*
17001754         aConstraints.gridx = 0;
....@@ -1726,17 +1780,109 @@
17261780         
17271781         AddOptions(optionsPanel); //, aConstraints);
17281782         
1729
-        tabbedPane.add(optionsPanel);
1730
-        
17311783         tabbedPane.add(FSPane = new cFileSystemPane(this));
17321784 
1785
+        tabbedPane.add(optionsPanel);
1786
+        
17331787         scenePanel.add(tabbedPane);
17341788 
1735
-        //if (Globals.ADVANCED)
1736
-//            tabbedPane.add(infoPanel);
1737
-//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
-//        tabbedPane.setToolTipTextAt(3, "Information");
1789
+        cGridBag creditsPanel = new cGridBag().setVertical(true);
1790
+        creditsPanel.setName("Credits");
17391791         
1792
+        cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1793
+	creditsPanel.add(ogaLabel);
1794
+        
1795
+        cButton creditButton;
1796
+	creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1797
+        creditButton.setToolTipText("https://opengameart.org");
1798
+        
1799
+        creditButton.addMouseListener(new MouseAdapter()
1800
+        {
1801
+            public void mouseClicked(MouseEvent e)
1802
+            {
1803
+                try
1804
+                {
1805
+                    Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1806
+                } catch (Exception e1)
1807
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1808
+                {
1809
+                    e1.printStackTrace();
1810
+                }
1811
+            }
1812
+        });
1813
+        
1814
+        ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1815
+	creditsPanel.add(ogaLabel);
1816
+        
1817
+	creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1818
+        creditButton.setToolTipText("https://3delicious.net");
1819
+        
1820
+        creditButton.addMouseListener(new MouseAdapter()
1821
+        {
1822
+            public void mouseClicked(MouseEvent e)
1823
+            {
1824
+                try
1825
+                {
1826
+                    Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1827
+                } catch (Exception e1)
1828
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1829
+                {
1830
+                    e1.printStackTrace();
1831
+                }
1832
+            }
1833
+        });
1834
+        
1835
+	creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1836
+        creditButton.setToolTipText("https://archive3d.net");
1837
+        
1838
+        creditButton.addMouseListener(new MouseAdapter()
1839
+        {
1840
+            public void mouseClicked(MouseEvent e)
1841
+            {
1842
+                try
1843
+                {
1844
+                    Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1845
+                } catch (Exception e1)
1846
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1847
+                {
1848
+                    e1.printStackTrace();
1849
+                }
1850
+            }
1851
+        });
1852
+        
1853
+	creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1854
+        creditButton.setToolTipText("https://turbosquid.com");
1855
+        
1856
+        creditButton.addMouseListener(new MouseAdapter()
1857
+        {
1858
+            public void mouseClicked(MouseEvent e)
1859
+            {
1860
+                try
1861
+                {
1862
+                    Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1863
+                } catch (Exception e1)
1864
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1865
+                {
1866
+                    e1.printStackTrace();
1867
+                }
1868
+            }
1869
+        });
1870
+        
1871
+        for (int i=6; --i>=0;)
1872
+        {
1873
+            creditsPanel.add(new cGridBag());
1874
+        }
1875
+        
1876
+        tabbedPane.add(creditsPanel);
1877
+        tabbedPane.setToolTipTextAt(3, "Credits");
1878
+        
1879
+        if (Globals.ADVANCED)
1880
+        {
1881
+            tabbedPane.add(infoPanel);
1882
+            tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1883
+            tabbedPane.setToolTipTextAt(4, "Information");
1884
+        }
1885
+
17401886         /*
17411887         cTree jTree = new cTree(null);
17421888         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1757,13 +1903,13 @@
17571903         jtp.add(tree);
17581904          */
17591905 
1760
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1761
-        bigPanel.setContinuousLayout(true);
1762
-        bigPanel.setOneTouchExpandable(true);
1763
-        bigPanel.setDividerLocation(0.8);
1764
-        bigPanel.setDividerSize(15);
1765
-        bigPanel.setResizeWeight(0.15);
1766
-        bigPanel.setName("Scene");
1906
+//        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1907
+//        bigPanel.setContinuousLayout(true);
1908
+//        bigPanel.setOneTouchExpandable(true);
1909
+//        bigPanel.setDividerLocation(0.8);
1910
+//        bigPanel.setDividerSize(15);
1911
+//        bigPanel.setResizeWeight(0.15);
1912
+//        bigPanel.setName("Scene");
17671913 
17681914         //bigPanel.setLayout(new BorderLayout());
17691915         //bigPanel.setSize(new Dimension(10,10));
....@@ -1847,7 +1993,7 @@
18471993         
18481994                     cameraView.requestFocusInWindow();
18491995                     
1850
-        gridPanel.setDividerLocation(1.0);
1996
+//        gridPanel.setDividerLocation(1.0);
18511997         
18521998         frame.validate();
18531999 
....@@ -1882,7 +2028,7 @@
18822028     {
18832029         cGridBag presetpanel = new cGridBag().setVertical(true);
18842030         
1885
-        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
2031
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
18862032         skin.setToolTipText("Skin");
18872033         skin.addMouseListener(new MouseAdapter()
18882034         {
....@@ -1920,7 +2066,7 @@
19202066         });
19212067         presetpanel.add(skin);
19222068         
1923
-        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2069
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
19242070         lambert.setToolTipText("Diffuse");
19252071         lambert.addMouseListener(new MouseAdapter()
19262072         {
....@@ -1938,7 +2084,7 @@
19382084         });
19392085         presetpanel.add(lambert);
19402086         
1941
-        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2087
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
19422088         diffuse2.setToolTipText("Diffuse2");
19432089         diffuse2.addMouseListener(new MouseAdapter()
19442090         {
....@@ -1956,7 +2102,7 @@
19562102         });
19572103         presetpanel.add(diffuse2);
19582104         
1959
-        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2105
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
19602106         diffusemoon.setToolTipText("Moon");
19612107         diffusemoon.addMouseListener(new MouseAdapter()
19622108         {
....@@ -1974,7 +2120,7 @@
19742120         });
19752121         presetpanel.add(diffusemoon);
19762122         
1977
-        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2123
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
19782124         diffusemoon2.setToolTipText("Moon2");
19792125         diffusemoon2.addMouseListener(new MouseAdapter()
19802126         {
....@@ -1992,7 +2138,7 @@
19922138         });
19932139         presetpanel.add(diffusemoon2);
19942140         
1995
-        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2141
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
19962142         diffusemoon3.setToolTipText("Moon3");
19972143         diffusemoon3.addMouseListener(new MouseAdapter()
19982144         {
....@@ -2010,7 +2156,7 @@
20102156         });
20112157         presetpanel.add(diffusemoon3);
20122158         
2013
-        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2159
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
20142160         diffusesheen.setToolTipText("Sheen");
20152161         diffusesheen.addMouseListener(new MouseAdapter()
20162162         {
....@@ -2027,7 +2173,7 @@
20272173         });
20282174         presetpanel.add(diffusesheen);
20292175         
2030
-        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2176
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
20312177         rough.setToolTipText("Rough metal");
20322178         rough.addMouseListener(new MouseAdapter()
20332179         {
....@@ -2045,7 +2191,7 @@
20452191         });
20462192         presetpanel.add(rough);
20472193         
2048
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2194
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
20492195         rough2.setToolTipText("Medium metal");
20502196         rough2.addMouseListener(new MouseAdapter()
20512197         {
....@@ -2063,7 +2209,7 @@
20632209         });
20642210         presetpanel.add(rough2);
20652211         
2066
-        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2212
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
20672213         shini0.setToolTipText("Shiny");
20682214         shini0.addMouseListener(new MouseAdapter()
20692215         {
....@@ -2081,7 +2227,7 @@
20812227         });
20822228         presetpanel.add(shini0);
20832229         
2084
-        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2230
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
20852231         shini1.setToolTipText("Shiny2");
20862232         shini1.addMouseListener(new MouseAdapter()
20872233         {
....@@ -2099,7 +2245,7 @@
20992245         });
21002246         presetpanel.add(shini1);
21012247         
2102
-        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2248
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
21032249         shini2.setToolTipText("Shiny3");
21042250         shini2.addMouseListener(new MouseAdapter()
21052251         {
....@@ -2117,7 +2263,7 @@
21172263         });
21182264         presetpanel.add(shini2);
21192265         
2120
-        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2266
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
21212267         aniso.setToolTipText("AnisoU");
21222268         aniso.addMouseListener(new MouseAdapter()
21232269         {
....@@ -2135,7 +2281,7 @@
21352281         });
21362282         presetpanel.add(aniso);
21372283         
2138
-        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2284
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
21392285         aniso2.setToolTipText("AnisoV");
21402286         aniso2.addMouseListener(new MouseAdapter()
21412287         {
....@@ -2153,7 +2299,7 @@
21532299         });
21542300         presetpanel.add(aniso2);
21552301         
2156
-        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2302
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
21572303         aniso3.setToolTipText("AnisoUV");
21582304         aniso3.addMouseListener(new MouseAdapter()
21592305         {
....@@ -2171,7 +2317,7 @@
21712317         });
21722318         presetpanel.add(aniso3);
21732319         
2174
-        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2320
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
21752321         velvet0.setToolTipText("Velvet");
21762322         velvet0.addMouseListener(new MouseAdapter()
21772323         {
....@@ -2193,7 +2339,7 @@
21932339         });
21942340         presetpanel.add(velvet0);
21952341         
2196
-        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2342
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
21972343         bump0.setToolTipText("Bump texture");
21982344         bump0.addMouseListener(new MouseAdapter()
21992345         {
....@@ -2212,7 +2358,7 @@
22122358         });
22132359         presetpanel.add(bump0);
22142360         
2215
-        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2361
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
22162362         borderShader.setToolTipText("Border fade");
22172363         borderShader.addMouseListener(new MouseAdapter()
22182364         {
....@@ -2227,7 +2373,7 @@
22272373         });
22282374         presetpanel.add(borderShader);
22292375         
2230
-        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2376
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
22312377         halo.setToolTipText("Halo");
22322378         halo.addMouseListener(new MouseAdapter()
22332379         {
....@@ -2244,7 +2390,7 @@
22442390         });
22452391         presetpanel.add(halo);
22462392         
2247
-        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2393
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
22482394         candle.setToolTipText("Candle");
22492395         candle.addMouseListener(new MouseAdapter()
22502396         {
....@@ -2266,7 +2412,7 @@
22662412         });
22672413         presetpanel.add(candle);
22682414         
2269
-        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2415
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
22702416         shadowShader.setToolTipText("Shadow");
22712417         shadowShader.addMouseListener(new MouseAdapter()
22722418         {
....@@ -2301,19 +2447,19 @@
23012447 
23022448         cGridBag editBar = new cGridBag().setVertical(false);
23032449             
2304
-        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2450
+        editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
23052451                 createMaterialButton.setToolTipText("Create material");
23062452 
23072453         /*
23082454         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
23092455          */
23102456 
2311
-        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2457
+        editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
23122458                 clearMaterialButton.setToolTipText("Clear material");
23132459         
23142460         if (Globals.ADVANCED)
23152461         {
2316
-                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2462
+                editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
23172463                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
23182464                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
23192465         }
....@@ -4114,11 +4260,18 @@
41144260 
41154261     void New()
41164262     {
4117
-        while (copy.Size() > 1)
4263
+        while (copy.Size() > 0)
41184264         {
4119
-            copy.remove(1);
4265
+            copy.remove(0);
41204266         }
41214267         
4268
+        copy.selection.clear();
4269
+        
4270
+        if (copy == Grafreed.grafreed.universe)
4271
+        {
4272
+            CreateCameras();
4273
+            cameraView.SetCamera(GetCamera(copy, 0));
4274
+        }
41224275         ResetModel();
41234276         objEditor.refreshContents();
41244277     }
....@@ -4432,6 +4585,8 @@
44324585         return count;
44334586     }
44344587     
4588
+    public cGridBag versionSliderPane;
4589
+    
44354590     void SetVersionStates()
44364591     {
44374592         //if (true)
....@@ -4439,21 +4594,36 @@
44394594                     
44404595         //cRadio tab = GetCurrentTab();
44414596         
4442
-        restoreButton.setEnabled(copy.versionindex != -1);
4443
-        replaceButton.setEnabled(copy.versionindex != -1);
4444
-        
4445
-        previousVersionButton.setEnabled(copy.versionindex > 0);
4446
-        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4447
-        
4448
-        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
-                                        //copy.versionlist[copy.versionindex + 1] != null);
4450
-        
4451
-        muteSlider = true;
4452
-        versionSlider.setMinimum(0);
4453
-        versionSlider.setMaximum(VersionCount() - 1);
4454
-        versionSlider.setInteger(copy.versionindex);
4455
-        versionSlider.setEnabled(copy.versionindex != -1);
4456
-        muteSlider = false;
4597
+        if (copy.versionlist == null)
4598
+        {
4599
+            saveVersionButton.setEnabled(false);
4600
+            restoreButton.setEnabled(false);
4601
+            replaceButton.setEnabled(false);
4602
+            previousVersionButton.setEnabled(false);
4603
+            nextVersionButton.setEnabled(false);
4604
+            deleteVersionButton.setEnabled(false);
4605
+            versionSliderPane.setVisible(false);
4606
+        }
4607
+        else
4608
+        {
4609
+            restoreButton.setEnabled(copy.versionindex != -1);
4610
+            replaceButton.setEnabled(copy.versionindex != -1);
4611
+
4612
+            previousVersionButton.setEnabled(copy.versionindex > 0);
4613
+            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4614
+
4615
+            deleteVersionButton.setEnabled(copy.versionindex != -1);
4616
+                                            //copy.versionlist[copy.versionindex + 1] != null);
4617
+
4618
+            muteSlider = true;
4619
+            versionSlider.setMinimum(0);
4620
+            versionSlider.setMaximum(VersionCount() - 1);
4621
+            versionSlider.setInteger(copy.versionindex);
4622
+            versionSlider.setEnabled(copy.versionindex != -1);
4623
+            muteSlider = false;
4624
+            
4625
+            versionSliderPane.setVisible(true);
4626
+        }
44574627     }
44584628     
44594629     public boolean PreviousVersion()
....@@ -4873,7 +5043,7 @@
48735043     
48745044     public void stateChanged(ChangeEvent e)
48755045     {
4876
-        //    assert(false);
5046
+        // assert(false);
48775047         if (e.getSource() == versionSlider)
48785048         {
48795049             if (muteSlider)
....@@ -5986,6 +6156,7 @@
59866156     boolean materialFlushed;
59876157     Object3D latestObject;
59886158     
6159
+    cGridBag transformPanel;
59896160     cGridBag XYZPanel;
59906161     
59916162     JSplitPane gridPanel;