blame | history | patch | commit | commitdiff
Normand Briere
2019-08-12 b1d79b74514041a059b454a9f6fc3970773c0cb8 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -467,6 +468,8 @@
467468         toolboxPanel = new cGridBag().setVertical(true);
468469         //toolboxPanel.setName("Toolbox");
469470         
471
+        skyboxPanel = new cGridBag().setVertical(true);
472
+        
470473         materialPanel = new cGridBag().setVertical(false);
471474         //materialPanel.setName("Material");
472475         
....@@ -751,6 +754,7 @@
751754         boolean maximized;
752755     
753756         cButton fullscreenLayout;
757
+        cButton expandedLayout;
754758 
755759         void Minimize()
756760         {
....@@ -790,10 +794,12 @@
790794 	cButton minButton;
791795 	cButton maxButton;
792796 	cButton fullButton;
797
+	cButton collapseButton;
798
+        cButton maximize3DButton;
793799         
794800         void ToggleFullScreen()
795801         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
802
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797803 
798804                 cameraView.ToggleFullScreen();
799805                 
....@@ -814,13 +820,13 @@
814820 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815821 // X                   framePanel.add(bigThree);
816822 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
823
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818824                     
819825                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
826
+//                    radio.layout = keepButton;
821827                     //theFrame = null;
822828                     keepButton = null;
823
-                    radio.layout.doClick();
829
+//                    radio.layout.doClick();
824830                     
825831                 } else
826832                 {
....@@ -841,32 +847,42 @@
841847 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842848 // X                   framePanel.remove(bigThree);
843849 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
850
+//                    framePanel.setDividerLocation(0);
845851 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
852
+//                    radio.layout = fullscreenLayout;
853
+//                    radio.layout.doClick();
848854                     //frame.setVisible(true);
849855                 }
850856             frame.validate();
857
+            
858
+            cameraView.requestFocusInWindow();
851859         }
852860 
853
-    private Object3D CompressCopy()
861
+        void CollapseToolbar()
862
+        {
863
+            framePanel.setDividerLocation(0);
864
+            //frame.validate();
865
+            
866
+            cameraView.requestFocusInWindow();
867
+        }
868
+        
869
+    private Object3D Duplicate(Object3D object)
854870     {
855871         boolean temp = CameraPane.SWITCH;
856872         CameraPane.SWITCH = false;
857873         
858
-        copy.ExtractBigData(versiontable);
874
+        object.ExtractBigData(versiontable);
859875         // if (copy == client)
860876         
861
-        Object3D versions[] = copy.versionlist;
862
-        copy.versionlist = null;
877
+        Object3D versions[] = object.versionlist;
878
+        object.versionlist = null;
863879         
864880         //byte[] compress = Compress(copy);
865
-        Object3D compress = (Object3D)Grafreed.clone(copy);
881
+        Object3D compress = (Object3D)Grafreed.clone(object);
866882         
867
-        copy.versionlist = versions;
883
+        object.versionlist = versions;
868884         
869
-        copy.RestoreBigData(versiontable);
885
+        object.RestoreBigData(versiontable);
870886         
871887         CameraPane.SWITCH = temp;
872888         
....@@ -1203,6 +1219,18 @@
12031219         
12041220             namePanel = new cGridBag();
12051221             
1222
+        //if (copy.pinned)
1223
+        {
1224
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1225
+            pinButton.setSelected(copy.pinned);
1226
+            cGridBag t = new cGridBag();
1227
+            t.preferredWidth = 2;
1228
+            t.add(pinButton);
1229
+            namePanel.add(t);
1230
+            
1231
+            pinButton.addItemListener(this);
1232
+        }
1233
+        
12061234         nameField = AddText(namePanel, copy.GetName());
12071235         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12081236         oe.ctrlPanel.add(namePanel);
....@@ -1554,27 +1582,26 @@
15541582         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15551583         objectPanel.setToolTipTextAt(0, "Material");
15561584     
1585
+        objectPanel.add(toolboxPanel);
1586
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1588
+
1589
+        objectPanel.add(skyboxPanel);
1590
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1591
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1592
+        
15571593 //        JPanel north = new JPanel(new BorderLayout());
15581594 //        north.setName("Edit");
15591595 //        north.add(ctrlPanel, BorderLayout.NORTH);
15601596 //        objectPanel.add(north);
15611597         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");
1598
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1599
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15691600         
15701601         objectPanel.add(XYZPanel);
1571
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1572
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1602
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15731604         
1574
-        objectPanel.add(toolboxPanel);
1575
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1576
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1577
-
15781605         /*
15791606         aConstraints.gridx = 0;
15801607         aConstraints.gridwidth = 1;
....@@ -1611,6 +1638,11 @@
16111638 
16121639         scenePanel.add(tabbedPane);
16131640 
1641
+        //if (Globals.ADVANCED)
1642
+            tabbedPane.add(infoPanel);
1643
+        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
+        tabbedPane.setToolTipTextAt(3, "Information");
1645
+        
16141646         /*
16151647         cTree jTree = new cTree(null);
16161648         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1681,6 +1713,23 @@
16811713 //		aConstraints.gridheight = 1;
16821714 
16831715         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1716
+        
1717
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1718
+                new java.beans.PropertyChangeListener()
1719
+                {
1720
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1721
+                    {
1722
+                        if ((Integer)pce.getOldValue() == 1)
1723
+                        {
1724
+                            if (radio.layout != expandedLayout)
1725
+                            {
1726
+                                radio.layout = expandedLayout;
1727
+                                radio.layout.doClick();
1728
+                            }
1729
+                        }
1730
+                    }
1731
+                });
1732
+
16841733         framePanel.setContinuousLayout(false);
16851734         framePanel.setOneTouchExpandable(false);
16861735         //.setDividerLocation(0.8);
....@@ -1738,46 +1787,393 @@
17381787     void SetupMaterial(cGridBag materialpanel)
17391788     {
17401789         cGridBag presetpanel = new cGridBag().setVertical(true);
1741
-        cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1742
-        label.addMouseListener(new MouseAdapter()
1790
+        
1791
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1792
+        skin.setToolTipText("Skin");
1793
+        skin.addMouseListener(new MouseAdapter()
17431794         {
17441795             public void mouseClicked(MouseEvent e)
17451796             {
1746
-                colorField.setFloat(0);
1747
-                saturationField.setFloat(1);
1797
+                Object3D object = Grafreed.materials.versionlist[0].get(0);
1798
+                cMaterial material = object.material;
1799
+                
1800
+                // Skin
1801
+                colorField.setFloat(material.color);
1802
+                saturationField.setFloat(material.modulation);
1803
+                subsurfaceField.setFloat(material.subsurface);
1804
+                selfshadowField.setFloat(material.diffuseness);
1805
+                diffusenessField.setFloat(material.factor);
1806
+                shininessField.setFloat(material.shininess);
1807
+                shadowbiasField.setFloat(material.shadowbias);
1808
+                diffuseField.setFloat(material.diffuse);
1809
+                specularField.setFloat(material.specular);
1810
+                
1811
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1812
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1813
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1814
+
17481815                 materialtouched = true;
17491816                 applySelf();
17501817             }
17511818         });
1752
-        presetpanel.add(label);
1819
+        presetpanel.add(skin);
17531820         
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));
1821
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1822
+        lambert.setToolTipText("Diffuse");
1823
+        lambert.addMouseListener(new MouseAdapter()
1824
+        {
1825
+            public void mouseClicked(MouseEvent e)
1826
+            {
1827
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1828
+                cMaterial material = object.material;
1829
+                
1830
+                diffusenessField.setFloat(material.factor);
1831
+                selfshadowField.setFloat(material.diffuseness);
1832
+
1833
+                materialtouched = true;
1834
+                applySelf();
1835
+            }
1836
+        });
1837
+        presetpanel.add(lambert);
1838
+        
1839
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1840
+        diffuse2.setToolTipText("Diffuse2");
1841
+        diffuse2.addMouseListener(new MouseAdapter()
1842
+        {
1843
+            public void mouseClicked(MouseEvent e)
1844
+            {
1845
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1846
+                cMaterial material = object.material;
1847
+                
1848
+                diffusenessField.setFloat(material.factor);
1849
+                selfshadowField.setFloat(material.diffuseness);
1850
+
1851
+                materialtouched = true;
1852
+                applySelf();
1853
+            }
1854
+        });
1855
+        presetpanel.add(diffuse2);
1856
+        
1857
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1858
+        diffusemoon.setToolTipText("Moon");
1859
+        diffusemoon.addMouseListener(new MouseAdapter()
1860
+        {
1861
+            public void mouseClicked(MouseEvent e)
1862
+            {
1863
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1864
+                cMaterial material = object.material;
1865
+                
1866
+                diffusenessField.setFloat(material.factor);
1867
+                selfshadowField.setFloat(material.diffuseness);
1868
+
1869
+                materialtouched = true;
1870
+                applySelf();
1871
+            }
1872
+        });
1873
+        presetpanel.add(diffusemoon);
1874
+        
1875
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1876
+        diffusemoon2.setToolTipText("Moon2");
1877
+        diffusemoon2.addMouseListener(new MouseAdapter()
1878
+        {
1879
+            public void mouseClicked(MouseEvent e)
1880
+            {
1881
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1882
+                cMaterial material = object.material;
1883
+                
1884
+                diffusenessField.setFloat(material.factor);
1885
+                selfshadowField.setFloat(material.diffuseness);
1886
+
1887
+                materialtouched = true;
1888
+                applySelf();
1889
+            }
1890
+        });
1891
+        presetpanel.add(diffusemoon2);
1892
+        
1893
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1894
+        diffusemoon3.setToolTipText("Moon3");
1895
+        diffusemoon3.addMouseListener(new MouseAdapter()
1896
+        {
1897
+            public void mouseClicked(MouseEvent e)
1898
+            {
1899
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1900
+                cMaterial material = object.material;
1901
+                
1902
+                diffusenessField.setFloat(material.factor);
1903
+                selfshadowField.setFloat(material.diffuseness);
1904
+
1905
+                materialtouched = true;
1906
+                applySelf();
1907
+            }
1908
+        });
1909
+        presetpanel.add(diffusemoon3);
1910
+        
1911
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1912
+        diffusesheen.setToolTipText("Sheen");
1913
+        diffusesheen.addMouseListener(new MouseAdapter()
1914
+        {
1915
+            public void mouseClicked(MouseEvent e)
1916
+            {
1917
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
1918
+                cMaterial material = object.material;
1919
+                
1920
+                sheenField.setFloat(material.sheen);
1921
+
1922
+                materialtouched = true;
1923
+                applySelf();
1924
+            }
1925
+        });
1926
+        presetpanel.add(diffusesheen);
1927
+        
1928
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1929
+        rough.setToolTipText("Rough metal");
1930
+        rough.addMouseListener(new MouseAdapter()
1931
+        {
1932
+            public void mouseClicked(MouseEvent e)
1933
+            {
1934
+                Object3D object = Grafreed.materials.versionlist[1].get(0);
1935
+                cMaterial material = object.material;
1936
+                
1937
+                shininessField.setFloat(material.shininess);
1938
+                velvetField.setFloat(material.velvet);
1939
+
1940
+                materialtouched = true;
1941
+                applySelf();
1942
+            }
1943
+        });
1944
+        presetpanel.add(rough);
1945
+        
1946
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1947
+        rough2.setToolTipText("Medium metal");
1948
+        rough2.addMouseListener(new MouseAdapter()
1949
+        {
1950
+            public void mouseClicked(MouseEvent e)
1951
+            {
1952
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
1953
+                cMaterial material = object.material;
1954
+                
1955
+                shininessField.setFloat(material.shininess);
1956
+                lightareaField.setFloat(material.lightarea);
1957
+
1958
+                materialtouched = true;
1959
+                applySelf();
1960
+            }
1961
+        });
1962
+        presetpanel.add(rough2);
1963
+        
1964
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
1965
+        shini0.setToolTipText("Shiny");
1966
+        shini0.addMouseListener(new MouseAdapter()
1967
+        {
1968
+            public void mouseClicked(MouseEvent e)
1969
+            {
1970
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
1971
+                cMaterial material = object.material;
1972
+                
1973
+                shininessField.setFloat(material.shininess);
1974
+                lightareaField.setFloat(material.lightarea);
1975
+
1976
+                materialtouched = true;
1977
+                applySelf();
1978
+            }
1979
+        });
1980
+        presetpanel.add(shini0);
1981
+        
1982
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
1983
+        shini1.setToolTipText("Shiny2");
1984
+        shini1.addMouseListener(new MouseAdapter()
1985
+        {
1986
+            public void mouseClicked(MouseEvent e)
1987
+            {
1988
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
1989
+                cMaterial material = object.material;
1990
+                
1991
+                shininessField.setFloat(material.shininess);
1992
+                lightareaField.setFloat(material.lightarea);
1993
+
1994
+                materialtouched = true;
1995
+                applySelf();
1996
+            }
1997
+        });
1998
+        presetpanel.add(shini1);
1999
+        
2000
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2001
+        shini2.setToolTipText("Shiny3");
2002
+        shini2.addMouseListener(new MouseAdapter()
2003
+        {
2004
+            public void mouseClicked(MouseEvent e)
2005
+            {
2006
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2007
+                cMaterial material = object.material;
2008
+                
2009
+                shininessField.setFloat(material.shininess);
2010
+                lightareaField.setFloat(material.lightarea);
2011
+
2012
+                materialtouched = true;
2013
+                applySelf();
2014
+            }
2015
+        });
2016
+        presetpanel.add(shini2);
2017
+        
2018
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2019
+        aniso.setToolTipText("AnisoU");
2020
+        aniso.addMouseListener(new MouseAdapter()
2021
+        {
2022
+            public void mouseClicked(MouseEvent e)
2023
+            {
2024
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2025
+                cMaterial material = object.material;
2026
+                
2027
+                anisoField.setFloat(material.aniso);
2028
+                anisoVField.setFloat(material.anisoV);
2029
+
2030
+                materialtouched = true;
2031
+                applySelf();
2032
+            }
2033
+        });
2034
+        presetpanel.add(aniso);
2035
+        
2036
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2037
+        aniso2.setToolTipText("AnisoV");
2038
+        aniso2.addMouseListener(new MouseAdapter()
2039
+        {
2040
+            public void mouseClicked(MouseEvent e)
2041
+            {
2042
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2043
+                cMaterial material = object.material;
2044
+                
2045
+                anisoField.setFloat(material.aniso);
2046
+                anisoVField.setFloat(material.anisoV);
2047
+
2048
+                materialtouched = true;
2049
+                applySelf();
2050
+            }
2051
+        });
2052
+        presetpanel.add(aniso2);
2053
+        
2054
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2055
+        aniso3.setToolTipText("AnisoUV");
2056
+        aniso3.addMouseListener(new MouseAdapter()
2057
+        {
2058
+            public void mouseClicked(MouseEvent e)
2059
+            {
2060
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2061
+                cMaterial material = object.material;
2062
+                
2063
+                anisoField.setFloat(material.aniso);
2064
+                anisoVField.setFloat(material.anisoV);
2065
+
2066
+                materialtouched = true;
2067
+                applySelf();
2068
+            }
2069
+        });
2070
+        presetpanel.add(aniso3);
2071
+        
2072
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2073
+        velvet0.setToolTipText("Velvet");
2074
+        velvet0.addMouseListener(new MouseAdapter()
2075
+        {
2076
+            public void mouseClicked(MouseEvent e)
2077
+            {
2078
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2079
+                cMaterial material = object.material;
2080
+                
2081
+                diffusenessField.setFloat(material.factor);
2082
+                selfshadowField.setFloat(material.diffuseness);
2083
+                sheenField.setFloat(material.sheen);
2084
+                shininessField.setFloat(material.shininess);
2085
+                velvetField.setFloat(material.velvet);
2086
+                shiftField.setFloat(material.shift);
2087
+
2088
+                materialtouched = true;
2089
+                applySelf();
2090
+            }
2091
+        });
2092
+        presetpanel.add(velvet0);
2093
+        
2094
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2095
+        bump0.setToolTipText("Bump texture");
2096
+        bump0.addMouseListener(new MouseAdapter()
2097
+        {
2098
+            public void mouseClicked(MouseEvent e)
2099
+            {
2100
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2101
+                cMaterial material = object.material;
2102
+                
2103
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2104
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2105
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2106
+
2107
+                materialtouched = true;
2108
+                applySelf();
2109
+            }
2110
+        });
2111
+        presetpanel.add(bump0);
2112
+        
2113
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2114
+        halo.setToolTipText("Halo");
2115
+        halo.addMouseListener(new MouseAdapter()
2116
+        {
2117
+            public void mouseClicked(MouseEvent e)
2118
+            {
2119
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2120
+                cMaterial material = object.material;
2121
+                
2122
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2123
+
2124
+                materialtouched = true;
2125
+                applySelf();
2126
+            }
2127
+        });
2128
+        presetpanel.add(halo);
2129
+        
2130
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2131
+        candle.setToolTipText("Candle");
2132
+        candle.addMouseListener(new MouseAdapter()
2133
+        {
2134
+            public void mouseClicked(MouseEvent e)
2135
+            {
2136
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2137
+                cMaterial material = object.material;
2138
+                
2139
+                subsurfaceField.setFloat(material.subsurface);
2140
+                shadowbiasField.setFloat(material.shadowbias);
2141
+                ambientField.setFloat(material.ambient);
2142
+                specularField.setFloat(material.specular);
2143
+                lightareaField.setFloat(material.lightarea);
2144
+                shininessField.setFloat(material.shininess);
2145
+
2146
+                materialtouched = true;
2147
+                applySelf();
2148
+            }
2149
+        });
2150
+        presetpanel.add(candle);
2151
+        
2152
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2153
+        shadowShader.setToolTipText("Shadow");
2154
+        shadowShader.addMouseListener(new MouseAdapter()
2155
+        {
2156
+            public void mouseClicked(MouseEvent e)
2157
+            {
2158
+                diffuseField.setFloat(0.001);
2159
+                ambientField.setFloat(0.001);
2160
+                cameraField.setFloat(0.001);
2161
+                specularField.setFloat(0.001);
2162
+                fakedepthField.setFloat(0.001);
2163
+                opacityField.setFloat(0.6);
2164
+
2165
+                materialtouched = true;
2166
+                applySelf();
2167
+            }
2168
+        });
2169
+        presetpanel.add(shadowShader);
17742170         
17752171         cGridBag panel = new cGridBag().setVertical(true);
17762172         
17772173         presetpanel.preferredWidth = 1;
17782174         
1779
-        materialpanel.add(panel);
17802175         materialpanel.add(presetpanel);
2176
+        materialpanel.add(panel);
17812177         
17822178         panel.preferredWidth = 8;
17832179         
....@@ -1821,9 +2217,9 @@
18212217 
18222218         cGridBag huepanel = new cGridBag();
18232219             cGridBag huelabel = new cGridBag();
1824
-        label = GetLabel("icons/hue.png", false);
1825
-        label.fit = true;
1826
-            huelabel.add(label);
2220
+        skin = GetLabel("icons/hue.png", false);
2221
+        skin.fit = true;
2222
+            huelabel.add(skin);
18272223             huelabel.preferredWidth = 20;
18282224             huepanel.add(new cGridBag()); // Label
18292225             huepanel.add(huelabel); // Field/slider
....@@ -3244,6 +3640,17 @@
32443640     public void itemStateChanged(ItemEvent event)
32453641     {
32463642         //                   System.out.println("Propagate = " + propagate);
3643
+        if (event.getSource() == pinButton)
3644
+        {
3645
+            copy.pinned ^= true;
3646
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3647
+            {
3648
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3649
+                copy.CloseUI();
3650
+                //copy.editWindow.refreshContents();
3651
+            }
3652
+        }
3653
+        else
32473654         if (event.getSource() == propagateToggle)
32483655         {
32493656             propagate ^= true;
....@@ -3737,6 +4144,18 @@
37374144 
37384145     java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
37394146     
4147
+    void DeleteVersion()
4148
+    {
4149
+        for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4150
+        {
4151
+            copy.versionlist[i] = copy.versionlist[i+1];
4152
+        }
4153
+        
4154
+        CopyChanged();
4155
+        
4156
+        SetUndoStates();
4157
+    }
4158
+    
37404159     public boolean Save(boolean user)
37414160     {
37424161         System.err.println("Save");
....@@ -3744,7 +4163,7 @@
37444163         
37454164         cRadio tab = GetCurrentTab();
37464165         
3747
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
4166
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37484167         
37494168         boolean thesame = false;
37504169         
....@@ -3756,6 +4175,11 @@
37564175         //EditorFrame.m_MainFrame.requestFocusInWindow();
37574176         if (!thesame)
37584177         {
4178
+            for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4179
+            {
4180
+                copy.versionlist[i] = copy.versionlist[i-1];
4181
+            }
4182
+            
37594183             //tab.user[tab.versionindex] = user;
37604184             //boolean increment = true; // tab.graphs[tab.versionindex] == null;
37614185             
....@@ -3769,11 +4193,11 @@
37694193 
37704194         //assert(hashtable.isEmpty());
37714195         
3772
-        for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3773
-        {
3774
-            //tab.user[i] = false;
3775
-            copy.versionlist[i] = null;
3776
-        }
4196
+//        for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4197
+//        {
4198
+//            //tab.user[i] = false;
4199
+//            copy.versionlist[i] = null;
4200
+//        }
37774201 
37784202         SetUndoStates();
37794203         
....@@ -3828,11 +4252,13 @@
38284252             GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
38294253         flashIt = true;
38304254         
3831
-        refreshContents(false);
4255
+        //refreshContents(false);
38324256     }
38334257 
3834
-    void CopyChanged(Object3D obj)
4258
+    void CopyChanged()
38354259     {
4260
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4261
+        
38364262         SetUndoStates();
38374263         
38384264         boolean temp = CameraPane.SWITCH;
....@@ -3875,13 +4301,15 @@
38754301             }
38764302         }
38774303         
3878
-        refreshContents();
4304
+        refreshContents(true);
38794305     }
38804306     
3881
-    cButton undoButton;
4307
+    cButton previousVersionButton;
38824308     cButton restoreButton;
38834309     cButton replaceButton;
3884
-    cButton redoButton;
4310
+    cButton nextVersionButton;
4311
+    cButton saveVersionButton;
4312
+    cButton deleteVersionButton;
38854313         
38864314     boolean muteSlider;
38874315     
....@@ -3902,11 +4330,14 @@
39024330     {
39034331         cRadio tab = GetCurrentTab();
39044332         
3905
-        restoreButton.setEnabled(copy.versionindex != -1);
3906
-        replaceButton.setEnabled(copy.versionindex != -1);
4333
+        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
+        replaceButton.setEnabled(true); // copy.versionindex != -1);
39074335         
3908
-        undoButton.setEnabled(copy.versionindex > 0);
3909
-        redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4336
+        previousVersionButton.setEnabled(copy.versionindex > 0);
4337
+        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4338
+        
4339
+        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340
+                                        copy.versionlist[copy.versionindex + 1] != null);
39104341         
39114342         muteSlider = true;
39124343         versionSlider.setMaximum(VersionCount() - 1);
....@@ -3914,7 +4345,7 @@
39144345         muteSlider = false;
39154346     }
39164347     
3917
-    public boolean Undo()
4348
+    public boolean PreviousVersion()
39184349     {
39194350         // Option?
39204351         Replace();
....@@ -3944,7 +4375,7 @@
39444375 
39454376         copy.versionindex -= 1;
39464377 
3947
-        CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
4378
+        CopyChanged();
39484379         
39494380         return true;
39504381     }
....@@ -3962,7 +4393,7 @@
39624393         }
39634394 
39644395         //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3965
-        CopyChanged(copy.versionlist[copy.versionindex]);
4396
+        CopyChanged();
39664397         
39674398         return true;
39684399     }
....@@ -3979,12 +4410,12 @@
39794410             return false;
39804411         }
39814412 
3982
-        copy.versionlist[copy.versionindex] = CompressCopy();
4413
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
39834414         
39844415         return true;
39854416     }
39864417 
3987
-    public void Redo()
4418
+    public void NextVersion()
39884419     {
39894420         // Option?
39904421         Replace();
....@@ -3999,7 +4430,7 @@
39994430 
40004431         copy.versionindex += 1;
40014432 
4002
-        CopyChanged(copy.versionlist[copy.versionindex]);
4433
+        CopyChanged();
40034434         
40044435         //if (!tab.user[tab.versionindex])
40054436         //    tab.graphs[tab.versionindex] = null;
....@@ -4312,7 +4743,8 @@
43124743             
43134744             if (copy.versionlist[version] != null)
43144745             {
4315
-                CopyChanged(copy.versionlist[copy.versionindex = version]);
4746
+                copy.versionindex = version;
4747
+                CopyChanged();
43164748             }
43174749             
43184750             return;
....@@ -4353,7 +4785,7 @@
43534785             //System.out.println("stateChanged = " + this);
43544786             materialtouched = true;
43554787             
4356
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4788
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
43574789             {
43584790                 saturationField.setFloat(1);
43594791             }
....@@ -4666,6 +5098,9 @@
46665098             ctrlPanel.validate(); // ? new
46675099             ctrlPanel.repaint();
46685100         }
5101
+        
5102
+        if (previousVersionButton != null && copy.versionlist != null)
5103
+            SetUndoStates();
46695104     }
46705105     
46715106     static TweenManager tweenManager = new TweenManager();
....@@ -5070,7 +5505,7 @@
50705505     {
50715506         if (Grafreed.standAlone)
50725507         {
5073
-            FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5508
+            FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
50745509             browser.show();
50755510             String filename = browser.getFile();
50765511             if (filename != null && filename.length() > 0)
....@@ -5389,6 +5824,7 @@
53895824     ButtonGroup buttonGroup;
53905825     
53915826     cGridBag toolboxPanel;
5827
+    cGridBag skyboxPanel;
53925828     cGridBag materialPanel;
53935829     cGridBag ctrlPanel;
53945830     
....@@ -5493,6 +5929,7 @@
54935929     cNumberSlider anisoField;
54945930     JLabel anisoVLabel;
54955931     cNumberSlider anisoVField;
5932
+    
54965933     JLabel cameraLabel;
54975934     cNumberSlider cameraField;
54985935     JLabel selfshadowLabel;
....@@ -5507,6 +5944,7 @@
55075944     cNumberSlider fakedepthField;
55085945     JLabel shadowbiasLabel;
55095946     cNumberSlider shadowbiasField;
5947
+    
55105948     JLabel bumpLabel;
55115949     cNumberSlider bumpField;
55125950     JLabel noiseLabel;