blame | history | patch | commit | commitdiff
Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314 
 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,7 @@
8398     cButton GetButton(String name, boolean border)
8499     {
85100         ImageIcon icon = GetIcon(name);
86
-        if (icon != null)
101
+        if (icon != null || name.contains("/"))
87102             return new cButton(icon, border);
88103         else
89104             return new cButton(name, border);
....@@ -119,8 +134,14 @@
119134         
120135         try
121136         {
122
-            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
123
-
137
+            BufferedImage image;
138
+            
139
+            if (name.endsWith("jpg"))
140
+                // Much faster!
141
+                image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
142
+            else
143
+                image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
144
+  
124145 //            if (image.getWidth() > 48 && image.getHeight() > 48)
125146 //            {
126147 //                BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -362,14 +383,6 @@
362383         client = inClient;
363384         copy = client;
364385 
365
-        if (copy.versionlist == null)
366
-        {
367
-            copy.versionlist = new Object3D[100];
368
-            copy.versionindex = -1;
369
-            
370
-//            Save(true);
371
-        }
372
-        
373386         SetupUI2(callee.GetEditor());
374387     }
375388 
....@@ -445,8 +458,11 @@
445458 		importOBJItem.addActionListener(this);
446459 		import3DSItem = menu.add(new MenuItem("3DS file..."));
447460 		import3DSItem.addActionListener(this);
461
+                if (Globals.ADVANCED)
462
+                {
448463 		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449464 		importVRMLX3DItem.addActionListener(this);
465
+                }
450466 		menu.add("-");
451467 		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
452468 		importGFDItem.addActionListener(this);
....@@ -1318,7 +1334,7 @@
13181334             
13191335         //if (copy.pinned)
13201336         {
1321
-            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1337
+            pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
13221338             pinButton.setSelected(copy.pinned);
13231339             cGridBag t = new cGridBag();
13241340             t.preferredWidth = 2;
....@@ -1550,23 +1566,9 @@
15501566 
15511567         if (cam == null || !(copy.get(0) instanceof cGroup))
15521568         {
1553
-        if (Globals.DEBUG)
1554
-            System.out.println("CREATE CAMERAS");
1555
-            cams = new cTemplate();
1556
-            cams.name = "Cameras";
1557
-            copy.insertElementAt(cams, 0);
1558
-            //cams.parent = copy;
1559
-
1560
-            cam = new Camera(); // LA.newVector(3, 2, 1));
1561
-            cams.addChild(cam);
1562
-            cam = new Camera(1);
1563
-            cams.addChild(cam);
1564
-            cam = new Camera(2);
1565
-            cams.addChild(cam);
1566
-            cam = new Camera(3);
1567
-            cams.addChild(cam);
1568
-            cam = new Camera(4); // Light
1569
-            cams.addChild(cam);
1569
+            if (Globals.DEBUG)
1570
+                System.out.println("CREATE CAMERAS");
1571
+            cams = CreateCameras();
15701572         } else
15711573         {
15721574             cams = (cGroup) copy.get(0);
....@@ -1638,7 +1640,8 @@
16381640         
16391641         resetTransformPanel.preferredHeight = 2;
16401642         
1641
-        cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
1643
+        cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1644
+        resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
16421645         resetTransform.addMouseListener(new MouseAdapter()
16431646         {
16441647             public void mouseClicked(MouseEvent e)
....@@ -1648,7 +1651,8 @@
16481651         });
16491652         resetTransformPanel.add(resetTransform);
16501653         
1651
-        resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
1654
+        resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1655
+        resetTransform.setToolTipText("Reset Translation only");
16521656         resetTransform.addMouseListener(new MouseAdapter()
16531657         {
16541658             public void mouseClicked(MouseEvent e)
....@@ -1658,7 +1662,8 @@
16581662         });
16591663         resetTransformPanel.add(resetTransform);
16601664         
1661
-        resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
1665
+        resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1666
+        resetTransform.setToolTipText("Reset Rotation and Scale only");
16621667         resetTransform.addMouseListener(new MouseAdapter()
16631668         {
16641669             public void mouseClicked(MouseEvent e)
....@@ -1715,24 +1720,24 @@
17151720 
17161721         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
17171722         //tmp.setName("Edit");
1723
+        objectPanel.add(skyboxPanel);
1724
+        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1725
+        objectPanel.setToolTipTextAt(0, "Backgrounds");
1726
+        
17181727         objectPanel.add(toolboxPanel);
1719
-        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1720
-        objectPanel.setToolTipTextAt(0, "Objects & textures");
1728
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1729
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
17211730 
17221731         objectPanel.add(materialPanel);
1723
-        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1724
-        objectPanel.setToolTipTextAt(1, "Material");
1732
+        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1733
+        objectPanel.setToolTipTextAt(2, "Material");
17251734     
1726
-        objectPanel.add(skyboxPanel);
1727
-        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1728
-        objectPanel.setToolTipTextAt(2, "Backgrounds");
1729
-        
17301735 //        JPanel north = new JPanel(new BorderLayout());
17311736 //        north.setName("Edit");
17321737 //        north.add(ctrlPanel, BorderLayout.NORTH);
17331738 //        objectPanel.add(north);
17341739         objectPanel.add(editPanel);
1735
-        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1740
+        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
17361741         objectPanel.setToolTipTextAt(3, "Edit controls");
17371742         
17381743         objectPanel.add(transformPanel);
....@@ -1741,7 +1746,7 @@
17411746         
17421747         patchMaterial = true;
17431748         cameraView.patchMaterial = this;
1744
-        objectPanel.setSelectedIndex(1);
1749
+        objectPanel.setSelectedIndex(2);
17451750                 
17461751         /*
17471752         aConstraints.gridx = 0;
....@@ -1762,7 +1767,7 @@
17621767         scrollpane.addMouseWheelListener(this); // Default not fast enough
17631768 
17641769         /*JTabbedPane*/ scenePanel = new cGridBag();
1765
-        scenePanel.preferredWidth = 6;
1770
+        scenePanel.preferredWidth = 5;
17661771         
17671772         JTabbedPane tabbedPane = new JTabbedPane();
17681773         tabbedPane.add(scrollpane);
....@@ -1773,17 +1778,109 @@
17731778         
17741779         AddOptions(optionsPanel); //, aConstraints);
17751780         
1776
-        tabbedPane.add(optionsPanel);
1777
-        
17781781         tabbedPane.add(FSPane = new cFileSystemPane(this));
17791782 
1783
+        tabbedPane.add(optionsPanel);
1784
+        
17801785         scenePanel.add(tabbedPane);
17811786 
1782
-        //if (Globals.ADVANCED)
1783
-//            tabbedPane.add(infoPanel);
1784
-//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1785
-//        tabbedPane.setToolTipTextAt(3, "Information");
1787
+        cGridBag creditsPanel = new cGridBag().setVertical(true);
1788
+        creditsPanel.setName("Credits");
17861789         
1790
+        cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1791
+	creditsPanel.add(ogaLabel);
1792
+        
1793
+        cButton creditButton;
1794
+	creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1795
+        creditButton.setToolTipText("https://opengameart.org");
1796
+        
1797
+        creditButton.addMouseListener(new MouseAdapter()
1798
+        {
1799
+            public void mouseClicked(MouseEvent e)
1800
+            {
1801
+                try
1802
+                {
1803
+                    Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1804
+                } catch (Exception e1)
1805
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1806
+                {
1807
+                    e1.printStackTrace();
1808
+                }
1809
+            }
1810
+        });
1811
+        
1812
+        ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1813
+	creditsPanel.add(ogaLabel);
1814
+        
1815
+	creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1816
+        creditButton.setToolTipText("https://3delicious.net");
1817
+        
1818
+        creditButton.addMouseListener(new MouseAdapter()
1819
+        {
1820
+            public void mouseClicked(MouseEvent e)
1821
+            {
1822
+                try
1823
+                {
1824
+                    Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1825
+                } catch (Exception e1)
1826
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1827
+                {
1828
+                    e1.printStackTrace();
1829
+                }
1830
+            }
1831
+        });
1832
+        
1833
+	creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1834
+        creditButton.setToolTipText("https://archive3d.net");
1835
+        
1836
+        creditButton.addMouseListener(new MouseAdapter()
1837
+        {
1838
+            public void mouseClicked(MouseEvent e)
1839
+            {
1840
+                try
1841
+                {
1842
+                    Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1843
+                } catch (Exception e1)
1844
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1845
+                {
1846
+                    e1.printStackTrace();
1847
+                }
1848
+            }
1849
+        });
1850
+        
1851
+	creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1852
+        creditButton.setToolTipText("https://turbosquid.com");
1853
+        
1854
+        creditButton.addMouseListener(new MouseAdapter()
1855
+        {
1856
+            public void mouseClicked(MouseEvent e)
1857
+            {
1858
+                try
1859
+                {
1860
+                    Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1861
+                } catch (Exception e1)
1862
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1863
+                {
1864
+                    e1.printStackTrace();
1865
+                }
1866
+            }
1867
+        });
1868
+        
1869
+        for (int i=6; --i>=0;)
1870
+        {
1871
+            creditsPanel.add(new cGridBag());
1872
+        }
1873
+        
1874
+        tabbedPane.add(creditsPanel);
1875
+        tabbedPane.setToolTipTextAt(3, "Credits");
1876
+        
1877
+        if (Globals.ADVANCED)
1878
+        {
1879
+            objectPanel.add(infoPanel);
1880
+            objectPanel.setIconAt(5, GetIcon("icons/info.png"));
1881
+            objectPanel.setToolTipTextAt(4, "Information");
1882
+        }
1883
+
17871884         /*
17881885         cTree jTree = new cTree(null);
17891886         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1929,7 +2026,7 @@
19292026     {
19302027         cGridBag presetpanel = new cGridBag().setVertical(true);
19312028         
1932
-        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
2029
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
19332030         skin.setToolTipText("Skin");
19342031         skin.addMouseListener(new MouseAdapter()
19352032         {
....@@ -1967,7 +2064,7 @@
19672064         });
19682065         presetpanel.add(skin);
19692066         
1970
-        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2067
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
19712068         lambert.setToolTipText("Diffuse");
19722069         lambert.addMouseListener(new MouseAdapter()
19732070         {
....@@ -1985,7 +2082,7 @@
19852082         });
19862083         presetpanel.add(lambert);
19872084         
1988
-        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2085
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
19892086         diffuse2.setToolTipText("Diffuse2");
19902087         diffuse2.addMouseListener(new MouseAdapter()
19912088         {
....@@ -2003,7 +2100,7 @@
20032100         });
20042101         presetpanel.add(diffuse2);
20052102         
2006
-        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2103
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
20072104         diffusemoon.setToolTipText("Moon");
20082105         diffusemoon.addMouseListener(new MouseAdapter()
20092106         {
....@@ -2021,7 +2118,7 @@
20212118         });
20222119         presetpanel.add(diffusemoon);
20232120         
2024
-        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2121
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
20252122         diffusemoon2.setToolTipText("Moon2");
20262123         diffusemoon2.addMouseListener(new MouseAdapter()
20272124         {
....@@ -2039,7 +2136,7 @@
20392136         });
20402137         presetpanel.add(diffusemoon2);
20412138         
2042
-        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2139
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
20432140         diffusemoon3.setToolTipText("Moon3");
20442141         diffusemoon3.addMouseListener(new MouseAdapter()
20452142         {
....@@ -2057,7 +2154,7 @@
20572154         });
20582155         presetpanel.add(diffusemoon3);
20592156         
2060
-        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2157
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
20612158         diffusesheen.setToolTipText("Sheen");
20622159         diffusesheen.addMouseListener(new MouseAdapter()
20632160         {
....@@ -2074,7 +2171,7 @@
20742171         });
20752172         presetpanel.add(diffusesheen);
20762173         
2077
-        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2174
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
20782175         rough.setToolTipText("Rough metal");
20792176         rough.addMouseListener(new MouseAdapter()
20802177         {
....@@ -2092,7 +2189,7 @@
20922189         });
20932190         presetpanel.add(rough);
20942191         
2095
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2192
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
20962193         rough2.setToolTipText("Medium metal");
20972194         rough2.addMouseListener(new MouseAdapter()
20982195         {
....@@ -2110,7 +2207,7 @@
21102207         });
21112208         presetpanel.add(rough2);
21122209         
2113
-        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2210
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
21142211         shini0.setToolTipText("Shiny");
21152212         shini0.addMouseListener(new MouseAdapter()
21162213         {
....@@ -2128,7 +2225,7 @@
21282225         });
21292226         presetpanel.add(shini0);
21302227         
2131
-        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2228
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
21322229         shini1.setToolTipText("Shiny2");
21332230         shini1.addMouseListener(new MouseAdapter()
21342231         {
....@@ -2146,7 +2243,7 @@
21462243         });
21472244         presetpanel.add(shini1);
21482245         
2149
-        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2246
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
21502247         shini2.setToolTipText("Shiny3");
21512248         shini2.addMouseListener(new MouseAdapter()
21522249         {
....@@ -2164,7 +2261,7 @@
21642261         });
21652262         presetpanel.add(shini2);
21662263         
2167
-        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2264
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
21682265         aniso.setToolTipText("AnisoU");
21692266         aniso.addMouseListener(new MouseAdapter()
21702267         {
....@@ -2182,7 +2279,7 @@
21822279         });
21832280         presetpanel.add(aniso);
21842281         
2185
-        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2282
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
21862283         aniso2.setToolTipText("AnisoV");
21872284         aniso2.addMouseListener(new MouseAdapter()
21882285         {
....@@ -2200,7 +2297,7 @@
22002297         });
22012298         presetpanel.add(aniso2);
22022299         
2203
-        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2300
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
22042301         aniso3.setToolTipText("AnisoUV");
22052302         aniso3.addMouseListener(new MouseAdapter()
22062303         {
....@@ -2218,7 +2315,7 @@
22182315         });
22192316         presetpanel.add(aniso3);
22202317         
2221
-        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2318
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
22222319         velvet0.setToolTipText("Velvet");
22232320         velvet0.addMouseListener(new MouseAdapter()
22242321         {
....@@ -2240,7 +2337,7 @@
22402337         });
22412338         presetpanel.add(velvet0);
22422339         
2243
-        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2340
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
22442341         bump0.setToolTipText("Bump texture");
22452342         bump0.addMouseListener(new MouseAdapter()
22462343         {
....@@ -2259,13 +2356,13 @@
22592356         });
22602357         presetpanel.add(bump0);
22612358         
2262
-        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2359
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
22632360         borderShader.setToolTipText("Border fade");
22642361         borderShader.addMouseListener(new MouseAdapter()
22652362         {
22662363             public void mouseClicked(MouseEvent e)
22672364             {
2268
-                borderfadeField.setFloat(0.5);
2365
+                borderfadeField.setFloat(0.4);
22692366                 opacityField.setFloat(0.75);
22702367 
22712368                 materialtouched = true;
....@@ -2274,7 +2371,7 @@
22742371         });
22752372         presetpanel.add(borderShader);
22762373         
2277
-        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2374
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
22782375         halo.setToolTipText("Halo");
22792376         halo.addMouseListener(new MouseAdapter()
22802377         {
....@@ -2291,7 +2388,7 @@
22912388         });
22922389         presetpanel.add(halo);
22932390         
2294
-        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2391
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
22952392         candle.setToolTipText("Candle");
22962393         candle.addMouseListener(new MouseAdapter()
22972394         {
....@@ -2313,7 +2410,7 @@
23132410         });
23142411         presetpanel.add(candle);
23152412         
2316
-        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2413
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
23172414         shadowShader.setToolTipText("Shadow");
23182415         shadowShader.addMouseListener(new MouseAdapter()
23192416         {
....@@ -2332,6 +2429,48 @@
23322429         });
23332430         presetpanel.add(shadowShader);
23342431         
2432
+        cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
2433
+        para0.setToolTipText("No parallax");
2434
+        para0.addMouseListener(new MouseAdapter()
2435
+        {
2436
+            public void mouseClicked(MouseEvent e)
2437
+            {
2438
+                parallaxField.setFloat(0.125);
2439
+
2440
+                materialtouched = true;
2441
+                applySelf();
2442
+            }
2443
+        });
2444
+        presetpanel.add(para0);
2445
+        
2446
+        cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
2447
+        para1.setToolTipText("With parallax");
2448
+        para1.addMouseListener(new MouseAdapter()
2449
+        {
2450
+            public void mouseClicked(MouseEvent e)
2451
+            {
2452
+                parallaxField.setFloat(0.13);
2453
+
2454
+                materialtouched = true;
2455
+                applySelf();
2456
+            }
2457
+        });
2458
+        presetpanel.add(para1);
2459
+        
2460
+        cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
2461
+        para2.setToolTipText("Reset parallax");
2462
+        para2.addMouseListener(new MouseAdapter()
2463
+        {
2464
+            public void mouseClicked(MouseEvent e)
2465
+            {
2466
+                parallaxField.setFloat(0.14);
2467
+
2468
+                materialtouched = true;
2469
+                applySelf();
2470
+            }
2471
+        });
2472
+        presetpanel.add(para2);
2473
+        
23352474         cGridBag panel = new cGridBag().setVertical(true);
23362475         
23372476         presetpanel.preferredWidth = 1;
....@@ -2348,19 +2487,19 @@
23482487 
23492488         cGridBag editBar = new cGridBag().setVertical(false);
23502489             
2351
-        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2490
+        editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
23522491                 createMaterialButton.setToolTipText("Create material");
23532492 
23542493         /*
23552494         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
23562495          */
23572496 
2358
-        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2497
+        editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
23592498                 clearMaterialButton.setToolTipText("Clear material");
23602499         
23612500         if (Globals.ADVANCED)
23622501         {
2363
-                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2502
+                editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
23642503                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
23652504                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
23662505         }
....@@ -2577,6 +2716,12 @@
25772716                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
25782717         colorSection.add(backlit);
25792718 
2719
+        cGridBag parallax = new cGridBag();
2720
+                parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2721
+                parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2722
+                parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
2723
+        colorSection.add(parallax);
2724
+        
25802725         //panel.add(new JSeparator());
25812726         
25822727         //panel.add(globalSection);
....@@ -3628,6 +3773,7 @@
36283773         shadowField.setFloat(mat.shadow);
36293774         textureField.setFloat(mat.texture);
36303775         opacityField.setFloat(mat.opacity);
3776
+        parallaxField.setFloat(mat.parallax + 0.125f);
36313777         fakedepthField.setFloat(mat.fakedepth);
36323778         shadowbiasField.setFloat(mat.shadowbias);
36333779         bumpField.setInteger(1); // dec 2013
....@@ -4161,11 +4307,18 @@
41614307 
41624308     void New()
41634309     {
4164
-        while (copy.Size() > 1)
4310
+        while (copy.Size() > 0)
41654311         {
4166
-            copy.remove(1);
4312
+            copy.remove(0);
41674313         }
41684314         
4315
+        copy.selection.clear();
4316
+        
4317
+        if (copy == Grafreed.grafreed.universe)
4318
+        {
4319
+            CreateCameras();
4320
+            cameraView.SetCamera(GetCamera(copy, 0));
4321
+        }
41694322         ResetModel();
41704323         objEditor.refreshContents();
41714324     }
....@@ -4314,7 +4467,11 @@
43144467         System.err.println("Save");
43154468         Replace();
43164469         
4317
-        //cRadio tab = GetCurrentTab();
4470
+        if (copy.versionlist == null)
4471
+        {
4472
+            copy.versionlist = new Object3D[100];
4473
+            copy.versionindex = -1;
4474
+        }
43184475         
43194476         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
43204477         
....@@ -4488,7 +4645,7 @@
44884645                     
44894646         //cRadio tab = GetCurrentTab();
44904647         
4491
-        if (copy.versionlist == null)
4648
+        if (copy.versionindex == -2)
44924649         {
44934650             saveVersionButton.setEnabled(false);
44944651             restoreButton.setEnabled(false);
....@@ -4845,6 +5002,7 @@
48455002             current.shadow = (float) shadowField.getFloat();
48465003             current.texture = (float) textureField.getFloat();
48475004             current.opacity = (float) opacityField.getFloat();
5005
+            current.parallax = (float) parallaxField.getFloat() - 0.125f;
48485006             current.fakedepth = (float) fakedepthField.getFloat();
48495007             current.shadowbias = (float) shadowbiasField.getFloat();
48505008 
....@@ -4899,6 +5057,8 @@
48995057                         textureField.SetToolTipValue((mat.texture));
49005058                     if (!Equal(opacityField.getFloat(), mat.opacity))
49015059                         opacityField.SetToolTipValue((mat.opacity));
5060
+                    //if (!Equal(parallaxField.getFloat(), mat.parallax))
5061
+                        parallaxField.SetToolTipValue((mat.parallax));
49025062                     if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
49035063                         fakedepthField.SetToolTipValue((mat.fakedepth));
49045064                     if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
....@@ -6155,6 +6315,8 @@
61556315     cNumberSlider textureField;
61566316     JLabel opacityLabel;
61576317     cNumberSlider opacityField;
6318
+    JLabel parallaxLabel;
6319
+    cNumberSlider parallaxField;
61586320     JLabel fakedepthLabel;
61596321     cNumberSlider fakedepthField;
61606322     JLabel shadowbiasLabel;