blame | history | patch | commit | commitdiff
Normand Briere
2019-08-13 0cdf3fb57ddea3226f094ba45c836c7e9b123e3a 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -296,11 +297,13 @@
296297         client = inClient;
297298         copy = client;
298299 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
300
+//        if (copy.versionlist == null)
301
+//        {
302
+//            copy.versionlist = new Object3D[100];
303
+//            copy.versionindex = -1;
304
+//            
305
+//            callee.Save(true);
306
+//        }
304307         
305308         // "this" is not called: SetupUI2(objEditor);
306309     }
....@@ -319,6 +322,8 @@
319322         {
320323             copy.versionlist = new Object3D[100];
321324             copy.versionindex = -1;
325
+            
326
+//            Save(true);
322327         }
323328         
324329         SetupUI2(callee.GetEditor());
....@@ -353,11 +358,13 @@
353358         copy = localCopy;
354359         copy.editWindow = this;
355360 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
361
+//        if (copy.versionlist == null)
362
+//        {
363
+//            copy.versionlist = new Object3D[100];
359364 //            copy.versionindex = -1;
360
-        }
365
+//            
366
+//            Save(true);
367
+//        }
361368         
362369         SetupMenu();
363370 
....@@ -444,7 +451,7 @@
444451 //                        EditSelection(false);
445452 //                }
446453 
447
-                refreshContents(false); // To refresh Info tab
454
+//                refreshContents(false); // To refresh Info tab
448455             }
449456         };
450457         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +473,8 @@
466473                 
467474         toolboxPanel = new cGridBag().setVertical(true);
468475         //toolboxPanel.setName("Toolbox");
476
+        
477
+        skyboxPanel = new cGridBag().setVertical(true);
469478         
470479         materialPanel = new cGridBag().setVertical(false);
471480         //materialPanel.setName("Material");
....@@ -751,6 +760,7 @@
751760         boolean maximized;
752761     
753762         cButton fullscreenLayout;
763
+        cButton expandedLayout;
754764 
755765         void Minimize()
756766         {
....@@ -790,10 +800,12 @@
790800 	cButton minButton;
791801 	cButton maxButton;
792802 	cButton fullButton;
803
+	cButton collapseButton;
804
+        cButton maximize3DButton;
793805         
794806         void ToggleFullScreen()
795807         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
808
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797809 
798810                 cameraView.ToggleFullScreen();
799811                 
....@@ -814,13 +826,13 @@
814826 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815827 // X                   framePanel.add(bigThree);
816828 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
829
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818830                     
819831                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
832
+//                    radio.layout = keepButton;
821833                     //theFrame = null;
822834                     keepButton = null;
823
-                    radio.layout.doClick();
835
+//                    radio.layout.doClick();
824836                     
825837                 } else
826838                 {
....@@ -841,32 +853,42 @@
841853 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842854 // X                   framePanel.remove(bigThree);
843855 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
856
+//                    framePanel.setDividerLocation(0);
845857 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
858
+//                    radio.layout = fullscreenLayout;
859
+//                    radio.layout.doClick();
848860                     //frame.setVisible(true);
849861                 }
850862             frame.validate();
863
+            
864
+            cameraView.requestFocusInWindow();
851865         }
852866 
853
-    private Object3D CompressCopy()
867
+        void CollapseToolbar()
868
+        {
869
+            framePanel.setDividerLocation(0);
870
+            //frame.validate();
871
+            
872
+            cameraView.requestFocusInWindow();
873
+        }
874
+        
875
+    private Object3D Duplicate(Object3D object)
854876     {
855877         boolean temp = CameraPane.SWITCH;
856878         CameraPane.SWITCH = false;
857879         
858
-        copy.ExtractBigData(versiontable);
880
+        object.ExtractBigData(versiontable);
859881         // if (copy == client)
860882         
861
-        Object3D versions[] = copy.versionlist;
862
-        copy.versionlist = null;
883
+        Object3D versions[] = object.versionlist;
884
+        object.versionlist = null;
863885         
864886         //byte[] compress = Compress(copy);
865
-        Object3D compress = (Object3D)Grafreed.clone(copy);
887
+        Object3D compress = (Object3D)Grafreed.clone(object);
866888         
867
-        copy.versionlist = versions;
889
+        object.versionlist = versions;
868890         
869
-        copy.RestoreBigData(versiontable);
891
+        object.RestoreBigData(versiontable);
870892         
871893         CameraPane.SWITCH = temp;
872894         
....@@ -1203,6 +1225,18 @@
12031225         
12041226             namePanel = new cGridBag();
12051227             
1228
+        //if (copy.pinned)
1229
+        {
1230
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1231
+            pinButton.setSelected(copy.pinned);
1232
+            cGridBag t = new cGridBag();
1233
+            t.preferredWidth = 2;
1234
+            t.add(pinButton);
1235
+            namePanel.add(t);
1236
+            
1237
+            pinButton.addItemListener(this);
1238
+        }
1239
+        
12061240         nameField = AddText(namePanel, copy.GetName());
12071241         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12081242         oe.ctrlPanel.add(namePanel);
....@@ -1554,27 +1588,26 @@
15541588         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15551589         objectPanel.setToolTipTextAt(0, "Material");
15561590     
1591
+        objectPanel.add(toolboxPanel);
1592
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1594
+
1595
+        objectPanel.add(skyboxPanel);
1596
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1597
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1598
+        
15571599 //        JPanel north = new JPanel(new BorderLayout());
15581600 //        north.setName("Edit");
15591601 //        north.add(ctrlPanel, BorderLayout.NORTH);
15601602 //        objectPanel.add(north);
15611603         objectPanel.add(editPanel);
1562
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1563
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1564
-        
1565
-        //if (Globals.ADVANCED)
1566
-            objectPanel.add(infoPanel);
1567
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1568
-        objectPanel.setToolTipTextAt(2, "Information");
1604
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1605
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15691606         
15701607         objectPanel.add(XYZPanel);
1571
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1572
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1608
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1609
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15731610         
1574
-        objectPanel.add(toolboxPanel);
1575
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1576
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1577
-
15781611         /*
15791612         aConstraints.gridx = 0;
15801613         aConstraints.gridwidth = 1;
....@@ -1611,6 +1644,11 @@
16111644 
16121645         scenePanel.add(tabbedPane);
16131646 
1647
+        //if (Globals.ADVANCED)
1648
+            tabbedPane.add(infoPanel);
1649
+        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
+        tabbedPane.setToolTipTextAt(3, "Information");
1651
+        
16141652         /*
16151653         cTree jTree = new cTree(null);
16161654         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1681,6 +1719,23 @@
16811719 //		aConstraints.gridheight = 1;
16821720 
16831721         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1722
+        
1723
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1724
+                new java.beans.PropertyChangeListener()
1725
+                {
1726
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1727
+                    {
1728
+                        if ((Integer)pce.getOldValue() == 1)
1729
+                        {
1730
+                            if (radio.layout != expandedLayout)
1731
+                            {
1732
+                                radio.layout = expandedLayout;
1733
+                                radio.layout.doClick();
1734
+                            }
1735
+                        }
1736
+                    }
1737
+                });
1738
+
16841739         framePanel.setContinuousLayout(false);
16851740         framePanel.setOneTouchExpandable(false);
16861741         //.setDividerLocation(0.8);
....@@ -1738,46 +1793,393 @@
17381793     void SetupMaterial(cGridBag materialpanel)
17391794     {
17401795         cGridBag presetpanel = new cGridBag().setVertical(true);
1741
-        cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1742
-        label.addMouseListener(new MouseAdapter()
1796
+        
1797
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1798
+        skin.setToolTipText("Skin");
1799
+        skin.addMouseListener(new MouseAdapter()
17431800         {
17441801             public void mouseClicked(MouseEvent e)
17451802             {
1746
-                colorField.setFloat(0);
1747
-                saturationField.setFloat(1);
1803
+                Object3D object = Grafreed.materials.versionlist[0].get(0);
1804
+                cMaterial material = object.material;
1805
+                
1806
+                // Skin
1807
+                colorField.setFloat(material.color);
1808
+                saturationField.setFloat(material.modulation);
1809
+                subsurfaceField.setFloat(material.subsurface);
1810
+                selfshadowField.setFloat(material.diffuseness);
1811
+                diffusenessField.setFloat(material.factor);
1812
+                shininessField.setFloat(material.shininess);
1813
+                shadowbiasField.setFloat(material.shadowbias);
1814
+                diffuseField.setFloat(material.diffuse);
1815
+                specularField.setFloat(material.specular);
1816
+                
1817
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1818
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1819
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1820
+
17481821                 materialtouched = true;
17491822                 applySelf();
17501823             }
17511824         });
1752
-        presetpanel.add(label);
1825
+        presetpanel.add(skin);
17531826         
1754
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
1755
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1756
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1757
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1758
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1759
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1760
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1761
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1762
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1763
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1764
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1765
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1766
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1767
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1768
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1769
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1770
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
1771
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
1772
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
1773
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
1827
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1828
+        lambert.setToolTipText("Diffuse");
1829
+        lambert.addMouseListener(new MouseAdapter()
1830
+        {
1831
+            public void mouseClicked(MouseEvent e)
1832
+            {
1833
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1834
+                cMaterial material = object.material;
1835
+                
1836
+                diffusenessField.setFloat(material.factor);
1837
+                selfshadowField.setFloat(material.diffuseness);
1838
+
1839
+                materialtouched = true;
1840
+                applySelf();
1841
+            }
1842
+        });
1843
+        presetpanel.add(lambert);
1844
+        
1845
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1846
+        diffuse2.setToolTipText("Diffuse2");
1847
+        diffuse2.addMouseListener(new MouseAdapter()
1848
+        {
1849
+            public void mouseClicked(MouseEvent e)
1850
+            {
1851
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1852
+                cMaterial material = object.material;
1853
+                
1854
+                diffusenessField.setFloat(material.factor);
1855
+                selfshadowField.setFloat(material.diffuseness);
1856
+
1857
+                materialtouched = true;
1858
+                applySelf();
1859
+            }
1860
+        });
1861
+        presetpanel.add(diffuse2);
1862
+        
1863
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1864
+        diffusemoon.setToolTipText("Moon");
1865
+        diffusemoon.addMouseListener(new MouseAdapter()
1866
+        {
1867
+            public void mouseClicked(MouseEvent e)
1868
+            {
1869
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1870
+                cMaterial material = object.material;
1871
+                
1872
+                diffusenessField.setFloat(material.factor);
1873
+                selfshadowField.setFloat(material.diffuseness);
1874
+
1875
+                materialtouched = true;
1876
+                applySelf();
1877
+            }
1878
+        });
1879
+        presetpanel.add(diffusemoon);
1880
+        
1881
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1882
+        diffusemoon2.setToolTipText("Moon2");
1883
+        diffusemoon2.addMouseListener(new MouseAdapter()
1884
+        {
1885
+            public void mouseClicked(MouseEvent e)
1886
+            {
1887
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1888
+                cMaterial material = object.material;
1889
+                
1890
+                diffusenessField.setFloat(material.factor);
1891
+                selfshadowField.setFloat(material.diffuseness);
1892
+
1893
+                materialtouched = true;
1894
+                applySelf();
1895
+            }
1896
+        });
1897
+        presetpanel.add(diffusemoon2);
1898
+        
1899
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1900
+        diffusemoon3.setToolTipText("Moon3");
1901
+        diffusemoon3.addMouseListener(new MouseAdapter()
1902
+        {
1903
+            public void mouseClicked(MouseEvent e)
1904
+            {
1905
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1906
+                cMaterial material = object.material;
1907
+                
1908
+                diffusenessField.setFloat(material.factor);
1909
+                selfshadowField.setFloat(material.diffuseness);
1910
+
1911
+                materialtouched = true;
1912
+                applySelf();
1913
+            }
1914
+        });
1915
+        presetpanel.add(diffusemoon3);
1916
+        
1917
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1918
+        diffusesheen.setToolTipText("Sheen");
1919
+        diffusesheen.addMouseListener(new MouseAdapter()
1920
+        {
1921
+            public void mouseClicked(MouseEvent e)
1922
+            {
1923
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
1924
+                cMaterial material = object.material;
1925
+                
1926
+                sheenField.setFloat(material.sheen);
1927
+
1928
+                materialtouched = true;
1929
+                applySelf();
1930
+            }
1931
+        });
1932
+        presetpanel.add(diffusesheen);
1933
+        
1934
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1935
+        rough.setToolTipText("Rough metal");
1936
+        rough.addMouseListener(new MouseAdapter()
1937
+        {
1938
+            public void mouseClicked(MouseEvent e)
1939
+            {
1940
+                Object3D object = Grafreed.materials.versionlist[1].get(0);
1941
+                cMaterial material = object.material;
1942
+                
1943
+                shininessField.setFloat(material.shininess);
1944
+                velvetField.setFloat(material.velvet);
1945
+
1946
+                materialtouched = true;
1947
+                applySelf();
1948
+            }
1949
+        });
1950
+        presetpanel.add(rough);
1951
+        
1952
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1953
+        rough2.setToolTipText("Medium metal");
1954
+        rough2.addMouseListener(new MouseAdapter()
1955
+        {
1956
+            public void mouseClicked(MouseEvent e)
1957
+            {
1958
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
1959
+                cMaterial material = object.material;
1960
+                
1961
+                shininessField.setFloat(material.shininess);
1962
+                lightareaField.setFloat(material.lightarea);
1963
+
1964
+                materialtouched = true;
1965
+                applySelf();
1966
+            }
1967
+        });
1968
+        presetpanel.add(rough2);
1969
+        
1970
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
1971
+        shini0.setToolTipText("Shiny");
1972
+        shini0.addMouseListener(new MouseAdapter()
1973
+        {
1974
+            public void mouseClicked(MouseEvent e)
1975
+            {
1976
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
1977
+                cMaterial material = object.material;
1978
+                
1979
+                shininessField.setFloat(material.shininess);
1980
+                lightareaField.setFloat(material.lightarea);
1981
+
1982
+                materialtouched = true;
1983
+                applySelf();
1984
+            }
1985
+        });
1986
+        presetpanel.add(shini0);
1987
+        
1988
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
1989
+        shini1.setToolTipText("Shiny2");
1990
+        shini1.addMouseListener(new MouseAdapter()
1991
+        {
1992
+            public void mouseClicked(MouseEvent e)
1993
+            {
1994
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
1995
+                cMaterial material = object.material;
1996
+                
1997
+                shininessField.setFloat(material.shininess);
1998
+                lightareaField.setFloat(material.lightarea);
1999
+
2000
+                materialtouched = true;
2001
+                applySelf();
2002
+            }
2003
+        });
2004
+        presetpanel.add(shini1);
2005
+        
2006
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2007
+        shini2.setToolTipText("Shiny3");
2008
+        shini2.addMouseListener(new MouseAdapter()
2009
+        {
2010
+            public void mouseClicked(MouseEvent e)
2011
+            {
2012
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2013
+                cMaterial material = object.material;
2014
+                
2015
+                shininessField.setFloat(material.shininess);
2016
+                lightareaField.setFloat(material.lightarea);
2017
+
2018
+                materialtouched = true;
2019
+                applySelf();
2020
+            }
2021
+        });
2022
+        presetpanel.add(shini2);
2023
+        
2024
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2025
+        aniso.setToolTipText("AnisoU");
2026
+        aniso.addMouseListener(new MouseAdapter()
2027
+        {
2028
+            public void mouseClicked(MouseEvent e)
2029
+            {
2030
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2031
+                cMaterial material = object.material;
2032
+                
2033
+                anisoField.setFloat(material.aniso);
2034
+                anisoVField.setFloat(material.anisoV);
2035
+
2036
+                materialtouched = true;
2037
+                applySelf();
2038
+            }
2039
+        });
2040
+        presetpanel.add(aniso);
2041
+        
2042
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2043
+        aniso2.setToolTipText("AnisoV");
2044
+        aniso2.addMouseListener(new MouseAdapter()
2045
+        {
2046
+            public void mouseClicked(MouseEvent e)
2047
+            {
2048
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2049
+                cMaterial material = object.material;
2050
+                
2051
+                anisoField.setFloat(material.aniso);
2052
+                anisoVField.setFloat(material.anisoV);
2053
+
2054
+                materialtouched = true;
2055
+                applySelf();
2056
+            }
2057
+        });
2058
+        presetpanel.add(aniso2);
2059
+        
2060
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2061
+        aniso3.setToolTipText("AnisoUV");
2062
+        aniso3.addMouseListener(new MouseAdapter()
2063
+        {
2064
+            public void mouseClicked(MouseEvent e)
2065
+            {
2066
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2067
+                cMaterial material = object.material;
2068
+                
2069
+                anisoField.setFloat(material.aniso);
2070
+                anisoVField.setFloat(material.anisoV);
2071
+
2072
+                materialtouched = true;
2073
+                applySelf();
2074
+            }
2075
+        });
2076
+        presetpanel.add(aniso3);
2077
+        
2078
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2079
+        velvet0.setToolTipText("Velvet");
2080
+        velvet0.addMouseListener(new MouseAdapter()
2081
+        {
2082
+            public void mouseClicked(MouseEvent e)
2083
+            {
2084
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2085
+                cMaterial material = object.material;
2086
+                
2087
+                diffusenessField.setFloat(material.factor);
2088
+                selfshadowField.setFloat(material.diffuseness);
2089
+                sheenField.setFloat(material.sheen);
2090
+                shininessField.setFloat(material.shininess);
2091
+                velvetField.setFloat(material.velvet);
2092
+                shiftField.setFloat(material.shift);
2093
+
2094
+                materialtouched = true;
2095
+                applySelf();
2096
+            }
2097
+        });
2098
+        presetpanel.add(velvet0);
2099
+        
2100
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2101
+        bump0.setToolTipText("Bump texture");
2102
+        bump0.addMouseListener(new MouseAdapter()
2103
+        {
2104
+            public void mouseClicked(MouseEvent e)
2105
+            {
2106
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2107
+                cMaterial material = object.material;
2108
+                
2109
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2110
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2111
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2112
+
2113
+                materialtouched = true;
2114
+                applySelf();
2115
+            }
2116
+        });
2117
+        presetpanel.add(bump0);
2118
+        
2119
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2120
+        halo.setToolTipText("Halo");
2121
+        halo.addMouseListener(new MouseAdapter()
2122
+        {
2123
+            public void mouseClicked(MouseEvent e)
2124
+            {
2125
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2126
+                cMaterial material = object.material;
2127
+                
2128
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2129
+
2130
+                materialtouched = true;
2131
+                applySelf();
2132
+            }
2133
+        });
2134
+        presetpanel.add(halo);
2135
+        
2136
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2137
+        candle.setToolTipText("Candle");
2138
+        candle.addMouseListener(new MouseAdapter()
2139
+        {
2140
+            public void mouseClicked(MouseEvent e)
2141
+            {
2142
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2143
+                cMaterial material = object.material;
2144
+                
2145
+                subsurfaceField.setFloat(material.subsurface);
2146
+                shadowbiasField.setFloat(material.shadowbias);
2147
+                ambientField.setFloat(material.ambient);
2148
+                specularField.setFloat(material.specular);
2149
+                lightareaField.setFloat(material.lightarea);
2150
+                shininessField.setFloat(material.shininess);
2151
+
2152
+                materialtouched = true;
2153
+                applySelf();
2154
+            }
2155
+        });
2156
+        presetpanel.add(candle);
2157
+        
2158
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2159
+        shadowShader.setToolTipText("Shadow");
2160
+        shadowShader.addMouseListener(new MouseAdapter()
2161
+        {
2162
+            public void mouseClicked(MouseEvent e)
2163
+            {
2164
+                diffuseField.setFloat(0.001);
2165
+                ambientField.setFloat(0.001);
2166
+                cameraField.setFloat(0.001);
2167
+                specularField.setFloat(0.001);
2168
+                fakedepthField.setFloat(0.001);
2169
+                opacityField.setFloat(0.6);
2170
+
2171
+                materialtouched = true;
2172
+                applySelf();
2173
+            }
2174
+        });
2175
+        presetpanel.add(shadowShader);
17742176         
17752177         cGridBag panel = new cGridBag().setVertical(true);
17762178         
17772179         presetpanel.preferredWidth = 1;
17782180         
1779
-        materialpanel.add(panel);
17802181         materialpanel.add(presetpanel);
2182
+        materialpanel.add(panel);
17812183         
17822184         panel.preferredWidth = 8;
17832185         
....@@ -1821,9 +2223,9 @@
18212223 
18222224         cGridBag huepanel = new cGridBag();
18232225             cGridBag huelabel = new cGridBag();
1824
-        label = GetLabel("icons/hue.png", false);
1825
-        label.fit = true;
1826
-            huelabel.add(label);
2226
+        skin = GetLabel("icons/hue.png", false);
2227
+        skin.fit = true;
2228
+            huelabel.add(skin);
18272229             huelabel.preferredWidth = 20;
18282230             huepanel.add(new cGridBag()); // Label
18292231             huepanel.add(huelabel); // Field/slider
....@@ -3244,6 +3646,17 @@
32443646     public void itemStateChanged(ItemEvent event)
32453647     {
32463648         //                   System.out.println("Propagate = " + propagate);
3649
+        if (event.getSource() == pinButton)
3650
+        {
3651
+            copy.pinned ^= true;
3652
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3653
+            {
3654
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3655
+                copy.CloseUI();
3656
+                //copy.editWindow.refreshContents();
3657
+            }
3658
+        }
3659
+        else
32473660         if (event.getSource() == propagateToggle)
32483661         {
32493662             propagate ^= true;
....@@ -3716,7 +4129,7 @@
37164129     {
37174130         //Save(true);
37184131         Replace();
3719
-        SetUndoStates();
4132
+        SetVersionStates();
37204133     }
37214134     
37224135     private boolean Equal(byte[] compress, byte[] name)
....@@ -3737,14 +4150,26 @@
37374150 
37384151     java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
37394152     
4153
+    void DeleteVersion()
4154
+    {
4155
+        for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4156
+        {
4157
+            copy.versionlist[i] = copy.versionlist[i+1];
4158
+        }
4159
+        
4160
+        CopyChanged();
4161
+        
4162
+        SetVersionStates();
4163
+    }
4164
+    
37404165     public boolean Save(boolean user)
37414166     {
37424167         System.err.println("Save");
37434168         Replace();
37444169         
3745
-        cRadio tab = GetCurrentTab();
4170
+        //cRadio tab = GetCurrentTab();
37464171         
3747
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
4172
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37484173         
37494174         boolean thesame = false;
37504175         
....@@ -3756,6 +4181,11 @@
37564181         //EditorFrame.m_MainFrame.requestFocusInWindow();
37574182         if (!thesame)
37584183         {
4184
+            for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4185
+            {
4186
+                copy.versionlist[i] = copy.versionlist[i-1];
4187
+            }
4188
+            
37594189             //tab.user[tab.versionindex] = user;
37604190             //boolean increment = true; // tab.graphs[tab.versionindex] == null;
37614191             
....@@ -3769,13 +4199,13 @@
37694199 
37704200         //assert(hashtable.isEmpty());
37714201         
3772
-        for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3773
-        {
3774
-            //tab.user[i] = false;
3775
-            copy.versionlist[i] = null;
3776
-        }
4202
+//        for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4203
+//        {
4204
+//            //tab.user[i] = false;
4205
+//            copy.versionlist[i] = null;
4206
+//        }
37774207 
3778
-        SetUndoStates();
4208
+        SetVersionStates();
37794209         
37804210         // test save
37814211         if (false)
....@@ -3828,12 +4258,14 @@
38284258             GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
38294259         flashIt = true;
38304260         
3831
-        refreshContents(false);
4261
+        //refreshContents(false);
38324262     }
38334263 
3834
-    void CopyChanged(Object3D obj)
4264
+    void CopyChanged()
38354265     {
3836
-        SetUndoStates();
4266
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4267
+        
4268
+        SetVersionStates();
38374269         
38384270         boolean temp = CameraPane.SWITCH;
38394271         CameraPane.SWITCH = false;
....@@ -3875,13 +4307,15 @@
38754307             }
38764308         }
38774309         
3878
-        refreshContents();
4310
+        refreshContents(true);
38794311     }
38804312     
3881
-    cButton undoButton;
4313
+    cButton previousVersionButton;
38824314     cButton restoreButton;
38834315     cButton replaceButton;
3884
-    cButton redoButton;
4316
+    cButton nextVersionButton;
4317
+    cButton saveVersionButton;
4318
+    cButton deleteVersionButton;
38854319         
38864320     boolean muteSlider;
38874321     
....@@ -3898,30 +4332,38 @@
38984332         return count;
38994333     }
39004334     
3901
-    void SetUndoStates()
4335
+    void SetVersionStates()
39024336     {
3903
-        cRadio tab = GetCurrentTab();
4337
+        //if (true)
4338
+        //    return;
4339
+                    
4340
+        //cRadio tab = GetCurrentTab();
39044341         
39054342         restoreButton.setEnabled(copy.versionindex != -1);
39064343         replaceButton.setEnabled(copy.versionindex != -1);
39074344         
3908
-        undoButton.setEnabled(copy.versionindex > 0);
3909
-        redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4345
+        previousVersionButton.setEnabled(copy.versionindex > 0);
4346
+        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4347
+        
4348
+        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4349
+                                        copy.versionlist[copy.versionindex + 1] != null);
39104350         
39114351         muteSlider = true;
4352
+        versionSlider.setMinimum(0);
39124353         versionSlider.setMaximum(VersionCount() - 1);
39134354         versionSlider.setInteger(copy.versionindex);
4355
+        versionSlider.setEnabled(copy.versionindex != -1);
39144356         muteSlider = false;
39154357     }
39164358     
3917
-    public boolean Undo()
4359
+    public boolean PreviousVersion()
39184360     {
39194361         // Option?
39204362         Replace();
39214363         
39224364         System.err.println("Undo");
39234365         
3924
-        cRadio tab = GetCurrentTab();
4366
+        //cRadio tab = GetCurrentTab();
39254367         
39264368         if (copy.versionindex == 0)
39274369         {
....@@ -3944,7 +4386,7 @@
39444386 
39454387         copy.versionindex -= 1;
39464388 
3947
-        CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
4389
+        CopyChanged();
39484390         
39494391         return true;
39504392     }
....@@ -3953,7 +4395,7 @@
39534395     {
39544396         System.err.println("Restore");
39554397         
3956
-        cRadio tab = GetCurrentTab();
4398
+        //cRadio tab = GetCurrentTab();
39574399         
39584400         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
39594401         {
....@@ -3962,7 +4404,7 @@
39624404         }
39634405 
39644406         //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3965
-        CopyChanged(copy.versionlist[copy.versionindex]);
4407
+        CopyChanged();
39664408         
39674409         return true;
39684410     }
....@@ -3971,7 +4413,7 @@
39714413     {
39724414         System.err.println("Replace");
39734415         
3974
-        cRadio tab = GetCurrentTab();
4416
+        //cRadio tab = GetCurrentTab();
39754417         
39764418         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
39774419         {
....@@ -3979,17 +4421,17 @@
39794421             return false;
39804422         }
39814423 
3982
-        copy.versionlist[copy.versionindex] = CompressCopy();
4424
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
39834425         
39844426         return true;
39854427     }
39864428 
3987
-    public void Redo()
4429
+    public void NextVersion()
39884430     {
39894431         // Option?
39904432         Replace();
39914433         
3992
-        cRadio tab = GetCurrentTab();
4434
+        //cRadio tab = GetCurrentTab();
39934435         
39944436         if (copy.versionlist[copy.versionindex + 1] == null)
39954437         {
....@@ -3999,7 +4441,7 @@
39994441 
40004442         copy.versionindex += 1;
40014443 
4002
-        CopyChanged(copy.versionlist[copy.versionindex]);
4444
+        CopyChanged();
40034445         
40044446         //if (!tab.user[tab.versionindex])
40054447         //    tab.graphs[tab.versionindex] = null;
....@@ -4310,9 +4752,10 @@
43104752             
43114753             int version = versionSlider.getInteger();
43124754             
4313
-            if (copy.versionlist[version] != null)
4755
+            if (version != -1 && copy.versionlist[version] != null)
43144756             {
4315
-                CopyChanged(copy.versionlist[copy.versionindex = version]);
4757
+                copy.versionindex = version;
4758
+                CopyChanged();
43164759             }
43174760             
43184761             return;
....@@ -4353,7 +4796,7 @@
43534796             //System.out.println("stateChanged = " + this);
43544797             materialtouched = true;
43554798             
4356
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4799
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
43574800             {
43584801                 saturationField.setFloat(1);
43594802             }
....@@ -4666,6 +5109,9 @@
46665109             ctrlPanel.validate(); // ? new
46675110             ctrlPanel.repaint();
46685111         }
5112
+        
5113
+        if (previousVersionButton != null && copy.versionlist != null)
5114
+            SetVersionStates();
46695115     }
46705116     
46715117     static TweenManager tweenManager = new TweenManager();
....@@ -5054,8 +5500,11 @@
50545500             
50555501         if (copy.versionlist == null)
50565502         {
5503
+            // Backward compatibility
50575504             copy.versionlist = new Object3D[100];
50585505             copy.versionindex = -1;
5506
+            
5507
+            Save(true);
50595508         }
50605509         
50615510             //? SetUndoStates();
....@@ -5070,7 +5519,7 @@
50705519     {
50715520         if (Grafreed.standAlone)
50725521         {
5073
-            FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5522
+            FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
50745523             browser.show();
50755524             String filename = browser.getFile();
50765525             if (filename != null && filename.length() > 0)
....@@ -5147,6 +5596,8 @@
51475596 
51485597     void save()
51495598     {
5599
+        Replace();
5600
+        
51505601         if (lastname == null)
51515602         {
51525603             return;
....@@ -5389,6 +5840,7 @@
53895840     ButtonGroup buttonGroup;
53905841     
53915842     cGridBag toolboxPanel;
5843
+    cGridBag skyboxPanel;
53925844     cGridBag materialPanel;
53935845     cGridBag ctrlPanel;
53945846     
....@@ -5493,6 +5945,7 @@
54935945     cNumberSlider anisoField;
54945946     JLabel anisoVLabel;
54955947     cNumberSlider anisoVField;
5948
+    
54965949     JLabel cameraLabel;
54975950     cNumberSlider cameraField;
54985951     JLabel selfshadowLabel;
....@@ -5507,6 +5960,7 @@
55075960     cNumberSlider fakedepthField;
55085961     JLabel shadowbiasLabel;
55095962     cNumberSlider shadowbiasField;
5963
+    
55105964     JLabel bumpLabel;
55115965     cNumberSlider bumpField;
55125966     JLabel noiseLabel;