blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -74,8 +75,16 @@
7475         return new cCheckBox(icon, border);
7576     }
7677 
78
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79
+    
7780     ImageIcon GetIcon(String name)
7881     {
82
+        javax.swing.ImageIcon iconCache = icons.get(name);
83
+        if (iconCache != null)
84
+        {
85
+            return iconCache;
86
+        }
87
+        
7988         try
8089         {
8190             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +102,14 @@
93102 //            }
94103 
95104             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
105
+            
106
+            icons.put(name, icon);
107
+            
96108             return icon;
97109         }
98110         catch (Exception e)
99111         {
112
+            //icons.put(name, null);
100113             return null;
101114         }
102115     }
....@@ -296,11 +309,13 @@
296309         client = inClient;
297310         copy = client;
298311 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
312
+//        if (copy.versionlist == null)
313
+//        {
314
+//            copy.versionlist = new Object3D[100];
315
+//            copy.versionindex = -1;
316
+//            
317
+//            callee.Save(true);
318
+//        }
304319         
305320         // "this" is not called: SetupUI2(objEditor);
306321     }
....@@ -319,6 +334,8 @@
319334         {
320335             copy.versionlist = new Object3D[100];
321336             copy.versionindex = -1;
337
+            
338
+//            Save(true);
322339         }
323340         
324341         SetupUI2(callee.GetEditor());
....@@ -353,11 +370,13 @@
353370         copy = localCopy;
354371         copy.editWindow = this;
355372 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
373
+//        if (copy.versionlist == null)
374
+//        {
375
+//            copy.versionlist = new Object3D[100];
359376 //            copy.versionindex = -1;
360
-        }
377
+//            
378
+//            Save(true);
379
+//        }
361380         
362381         SetupMenu();
363382 
....@@ -426,6 +445,8 @@
426445         
427446         ChangeListener changeListener = new ChangeListener()
428447         {
448
+            //String name;
449
+            
429450             public void stateChanged(ChangeEvent changeEvent)
430451             {
431452 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +465,37 @@
444465 //                        EditSelection(false);
445466 //                }
446467 
447
-                refreshContents(false); // To refresh Info tab
468
+//                if (objectPanel.getSelectedIndex() == 4)
469
+//                {
470
+//                    name = copy.skyboxname;
471
+//                    
472
+//                    if (name == null)
473
+//                    {
474
+//                        name = "";
475
+//                    }
476
+//                    
477
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
478
+//                    copy.skyboxext = "jpg";
479
+//                }
480
+//                else
481
+//                {
482
+//                    if (name != null)
483
+//                    {
484
+//                        if (name.equals(""))
485
+//                        {
486
+//                            copy.skyboxname = null;
487
+//                            copy.skyboxext = null;
488
+//                        }
489
+//                        else
490
+//                        {
491
+//                            copy.skyboxname = name;
492
+//                        }
493
+//                    }
494
+//                }
495
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
496
+                
497
+//                refreshContents(false); // To refresh Info tab
498
+                cameraView.repaint();
448499             }
449500         };
450501         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +517,8 @@
466517                 
467518         toolboxPanel = new cGridBag().setVertical(true);
468519         //toolboxPanel.setName("Toolbox");
520
+        
521
+        skyboxPanel = new cGridBag().setVertical(true);
469522         
470523         materialPanel = new cGridBag().setVertical(false);
471524         //materialPanel.setName("Material");
....@@ -751,6 +804,7 @@
751804         boolean maximized;
752805     
753806         cButton fullscreenLayout;
807
+        cButton expandedLayout;
754808 
755809         void Minimize()
756810         {
....@@ -790,10 +844,12 @@
790844 	cButton minButton;
791845 	cButton maxButton;
792846 	cButton fullButton;
847
+	cButton collapseButton;
848
+        cButton maximize3DButton;
793849         
794850         void ToggleFullScreen()
795851         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
852
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797853 
798854                 cameraView.ToggleFullScreen();
799855                 
....@@ -814,13 +870,13 @@
814870 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815871 // X                   framePanel.add(bigThree);
816872 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
873
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818874                     
819875                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
876
+//                    radio.layout = keepButton;
821877                     //theFrame = null;
822878                     keepButton = null;
823
-                    radio.layout.doClick();
879
+//                    radio.layout.doClick();
824880                     
825881                 } else
826882                 {
....@@ -841,10 +897,10 @@
841897 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842898 // X                   framePanel.remove(bigThree);
843899 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
900
+//                    framePanel.setDividerLocation(0);
845901 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
902
+//                    radio.layout = fullscreenLayout;
903
+//                    radio.layout.doClick();
848904                     //frame.setVisible(true);
849905                 }
850906             frame.validate();
....@@ -852,23 +908,31 @@
852908             cameraView.requestFocusInWindow();
853909         }
854910 
855
-    private Object3D CompressCopy()
911
+        void CollapseToolbar()
912
+        {
913
+            framePanel.setDividerLocation(0);
914
+            //frame.validate();
915
+            
916
+            cameraView.requestFocusInWindow();
917
+        }
918
+        
919
+    private Object3D Duplicate(Object3D object)
856920     {
857921         boolean temp = CameraPane.SWITCH;
858922         CameraPane.SWITCH = false;
859923         
860
-        copy.ExtractBigData(versiontable);
924
+        object.ExtractBigData(versiontable);
861925         // if (copy == client)
862926         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
927
+        Object3D versions[] = object.versionlist;
928
+        object.versionlist = null;
865929         
866930         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
931
+        Object3D compress = (Object3D)Grafreed.clone(object);
868932         
869
-        copy.versionlist = versions;
933
+        object.versionlist = versions;
870934         
871
-        copy.RestoreBigData(versiontable);
935
+        object.RestoreBigData(versiontable);
872936         
873937         CameraPane.SWITCH = temp;
874938         
....@@ -1205,6 +1269,18 @@
12051269         
12061270             namePanel = new cGridBag();
12071271             
1272
+        //if (copy.pinned)
1273
+        {
1274
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1275
+            pinButton.setSelected(copy.pinned);
1276
+            cGridBag t = new cGridBag();
1277
+            t.preferredWidth = 2;
1278
+            t.add(pinButton);
1279
+            namePanel.add(t);
1280
+            
1281
+            pinButton.addItemListener(this);
1282
+        }
1283
+        
12081284         nameField = AddText(namePanel, copy.GetName());
12091285         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101286         oe.ctrlPanel.add(namePanel);
....@@ -1556,27 +1632,26 @@
15561632         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15571633         objectPanel.setToolTipTextAt(0, "Material");
15581634     
1635
+        objectPanel.add(toolboxPanel);
1636
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1638
+
1639
+        objectPanel.add(skyboxPanel);
1640
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1642
+        
15591643 //        JPanel north = new JPanel(new BorderLayout());
15601644 //        north.setName("Edit");
15611645 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621646 //        objectPanel.add(north);
15631647         objectPanel.add(editPanel);
1564
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1566
-        
1567
-        //if (Globals.ADVANCED)
1568
-            objectPanel.add(infoPanel);
1569
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
-        objectPanel.setToolTipTextAt(2, "Information");
1648
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1649
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711650         
15721651         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1652
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751654         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
15801655         /*
15811656         aConstraints.gridx = 0;
15821657         aConstraints.gridwidth = 1;
....@@ -1613,6 +1688,11 @@
16131688 
16141689         scenePanel.add(tabbedPane);
16151690 
1691
+        //if (Globals.ADVANCED)
1692
+//            tabbedPane.add(infoPanel);
1693
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
+//        tabbedPane.setToolTipTextAt(3, "Information");
1695
+        
16161696         /*
16171697         cTree jTree = new cTree(null);
16181698         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1763,23 @@
16831763 //		aConstraints.gridheight = 1;
16841764 
16851765         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1766
+        
1767
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1768
+                new java.beans.PropertyChangeListener()
1769
+                {
1770
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1771
+                    {
1772
+                        if ((Integer)pce.getOldValue() == 1)
1773
+                        {
1774
+                            if (radio.layout != expandedLayout)
1775
+                            {
1776
+                                radio.layout = expandedLayout;
1777
+                                radio.layout.doClick();
1778
+                            }
1779
+                        }
1780
+                    }
1781
+                });
1782
+
16861783         framePanel.setContinuousLayout(false);
16871784         framePanel.setOneTouchExpandable(false);
16881785         //.setDividerLocation(0.8);
....@@ -1692,7 +1789,7 @@
16921789 
16931790         frame.getContentPane().setLayout(new BorderLayout());
16941791         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1792
+        //JTabbedPane worldPane = new JTabbedPane();
16961793         //worldPane.add(bigPanel);
16971794         //worldPane.add(worldPanel);
16981795                 /**/
....@@ -1740,7 +1837,9 @@
17401837     void SetupMaterial(cGridBag materialpanel)
17411838     {
17421839         cGridBag presetpanel = new cGridBag().setVertical(true);
1840
+        
17431841         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1842
+        skin.setToolTipText("Skin");
17441843         skin.addMouseListener(new MouseAdapter()
17451844         {
17461845             public void mouseClicked(MouseEvent e)
....@@ -1769,8 +1868,116 @@
17691868         });
17701869         presetpanel.add(skin);
17711870         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
1871
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1872
+        lambert.setToolTipText("Diffuse");
1873
+        lambert.addMouseListener(new MouseAdapter()
1874
+        {
1875
+            public void mouseClicked(MouseEvent e)
1876
+            {
1877
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1878
+                cMaterial material = object.material;
1879
+                
1880
+                diffusenessField.setFloat(material.factor);
1881
+                selfshadowField.setFloat(material.diffuseness);
1882
+
1883
+                materialtouched = true;
1884
+                applySelf();
1885
+            }
1886
+        });
1887
+        presetpanel.add(lambert);
1888
+        
1889
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1890
+        diffuse2.setToolTipText("Diffuse2");
1891
+        diffuse2.addMouseListener(new MouseAdapter()
1892
+        {
1893
+            public void mouseClicked(MouseEvent e)
1894
+            {
1895
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1896
+                cMaterial material = object.material;
1897
+                
1898
+                diffusenessField.setFloat(material.factor);
1899
+                selfshadowField.setFloat(material.diffuseness);
1900
+
1901
+                materialtouched = true;
1902
+                applySelf();
1903
+            }
1904
+        });
1905
+        presetpanel.add(diffuse2);
1906
+        
1907
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1908
+        diffusemoon.setToolTipText("Moon");
1909
+        diffusemoon.addMouseListener(new MouseAdapter()
1910
+        {
1911
+            public void mouseClicked(MouseEvent e)
1912
+            {
1913
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1914
+                cMaterial material = object.material;
1915
+                
1916
+                diffusenessField.setFloat(material.factor);
1917
+                selfshadowField.setFloat(material.diffuseness);
1918
+
1919
+                materialtouched = true;
1920
+                applySelf();
1921
+            }
1922
+        });
1923
+        presetpanel.add(diffusemoon);
1924
+        
1925
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1926
+        diffusemoon2.setToolTipText("Moon2");
1927
+        diffusemoon2.addMouseListener(new MouseAdapter()
1928
+        {
1929
+            public void mouseClicked(MouseEvent e)
1930
+            {
1931
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1932
+                cMaterial material = object.material;
1933
+                
1934
+                diffusenessField.setFloat(material.factor);
1935
+                selfshadowField.setFloat(material.diffuseness);
1936
+
1937
+                materialtouched = true;
1938
+                applySelf();
1939
+            }
1940
+        });
1941
+        presetpanel.add(diffusemoon2);
1942
+        
1943
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1944
+        diffusemoon3.setToolTipText("Moon3");
1945
+        diffusemoon3.addMouseListener(new MouseAdapter()
1946
+        {
1947
+            public void mouseClicked(MouseEvent e)
1948
+            {
1949
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1950
+                cMaterial material = object.material;
1951
+                
1952
+                diffusenessField.setFloat(material.factor);
1953
+                selfshadowField.setFloat(material.diffuseness);
1954
+
1955
+                materialtouched = true;
1956
+                applySelf();
1957
+            }
1958
+        });
1959
+        presetpanel.add(diffusemoon3);
1960
+        
1961
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1962
+        diffusesheen.setToolTipText("Sheen");
1963
+        diffusesheen.addMouseListener(new MouseAdapter()
1964
+        {
1965
+            public void mouseClicked(MouseEvent e)
1966
+            {
1967
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
1968
+                cMaterial material = object.material;
1969
+                
1970
+                sheenField.setFloat(material.sheen);
1971
+
1972
+                materialtouched = true;
1973
+                applySelf();
1974
+            }
1975
+        });
1976
+        presetpanel.add(diffusesheen);
1977
+        
1978
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1979
+        rough.setToolTipText("Rough metal");
1980
+        rough.addMouseListener(new MouseAdapter()
17741981         {
17751982             public void mouseClicked(MouseEvent e)
17761983             {
....@@ -1784,31 +1991,239 @@
17841991                 applySelf();
17851992             }
17861993         });
1994
+        presetpanel.add(rough);
1995
+        
1996
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1997
+        rough2.setToolTipText("Medium metal");
1998
+        rough2.addMouseListener(new MouseAdapter()
1999
+        {
2000
+            public void mouseClicked(MouseEvent e)
2001
+            {
2002
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
2003
+                cMaterial material = object.material;
2004
+                
2005
+                shininessField.setFloat(material.shininess);
2006
+                lightareaField.setFloat(material.lightarea);
2007
+
2008
+                materialtouched = true;
2009
+                applySelf();
2010
+            }
2011
+        });
17872012         presetpanel.add(rough2);
17882013         
1789
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
2014
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2015
+        shini0.setToolTipText("Shiny");
2016
+        shini0.addMouseListener(new MouseAdapter()
2017
+        {
2018
+            public void mouseClicked(MouseEvent e)
2019
+            {
2020
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
2021
+                cMaterial material = object.material;
2022
+                
2023
+                shininessField.setFloat(material.shininess);
2024
+                lightareaField.setFloat(material.lightarea);
2025
+
2026
+                materialtouched = true;
2027
+                applySelf();
2028
+            }
2029
+        });
2030
+        presetpanel.add(shini0);
2031
+        
2032
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2033
+        shini1.setToolTipText("Shiny2");
2034
+        shini1.addMouseListener(new MouseAdapter()
2035
+        {
2036
+            public void mouseClicked(MouseEvent e)
2037
+            {
2038
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
2039
+                cMaterial material = object.material;
2040
+                
2041
+                shininessField.setFloat(material.shininess);
2042
+                lightareaField.setFloat(material.lightarea);
2043
+
2044
+                materialtouched = true;
2045
+                applySelf();
2046
+            }
2047
+        });
2048
+        presetpanel.add(shini1);
2049
+        
2050
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2051
+        shini2.setToolTipText("Shiny3");
2052
+        shini2.addMouseListener(new MouseAdapter()
2053
+        {
2054
+            public void mouseClicked(MouseEvent e)
2055
+            {
2056
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2057
+                cMaterial material = object.material;
2058
+                
2059
+                shininessField.setFloat(material.shininess);
2060
+                lightareaField.setFloat(material.lightarea);
2061
+
2062
+                materialtouched = true;
2063
+                applySelf();
2064
+            }
2065
+        });
2066
+        presetpanel.add(shini2);
2067
+        
2068
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2069
+        aniso.setToolTipText("AnisoU");
2070
+        aniso.addMouseListener(new MouseAdapter()
2071
+        {
2072
+            public void mouseClicked(MouseEvent e)
2073
+            {
2074
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2075
+                cMaterial material = object.material;
2076
+                
2077
+                anisoField.setFloat(material.aniso);
2078
+                anisoVField.setFloat(material.anisoV);
2079
+
2080
+                materialtouched = true;
2081
+                applySelf();
2082
+            }
2083
+        });
2084
+        presetpanel.add(aniso);
2085
+        
2086
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2087
+        aniso2.setToolTipText("AnisoV");
2088
+        aniso2.addMouseListener(new MouseAdapter()
2089
+        {
2090
+            public void mouseClicked(MouseEvent e)
2091
+            {
2092
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2093
+                cMaterial material = object.material;
2094
+                
2095
+                anisoField.setFloat(material.aniso);
2096
+                anisoVField.setFloat(material.anisoV);
2097
+
2098
+                materialtouched = true;
2099
+                applySelf();
2100
+            }
2101
+        });
2102
+        presetpanel.add(aniso2);
2103
+        
2104
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2105
+        aniso3.setToolTipText("AnisoUV");
2106
+        aniso3.addMouseListener(new MouseAdapter()
2107
+        {
2108
+            public void mouseClicked(MouseEvent e)
2109
+            {
2110
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2111
+                cMaterial material = object.material;
2112
+                
2113
+                anisoField.setFloat(material.aniso);
2114
+                anisoVField.setFloat(material.anisoV);
2115
+
2116
+                materialtouched = true;
2117
+                applySelf();
2118
+            }
2119
+        });
2120
+        presetpanel.add(aniso3);
2121
+        
2122
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2123
+        velvet0.setToolTipText("Velvet");
2124
+        velvet0.addMouseListener(new MouseAdapter()
2125
+        {
2126
+            public void mouseClicked(MouseEvent e)
2127
+            {
2128
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2129
+                cMaterial material = object.material;
2130
+                
2131
+                diffusenessField.setFloat(material.factor);
2132
+                selfshadowField.setFloat(material.diffuseness);
2133
+                sheenField.setFloat(material.sheen);
2134
+                shininessField.setFloat(material.shininess);
2135
+                velvetField.setFloat(material.velvet);
2136
+                shiftField.setFloat(material.shift);
2137
+
2138
+                materialtouched = true;
2139
+                applySelf();
2140
+            }
2141
+        });
2142
+        presetpanel.add(velvet0);
2143
+        
2144
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2145
+        bump0.setToolTipText("Bump texture");
2146
+        bump0.addMouseListener(new MouseAdapter()
2147
+        {
2148
+            public void mouseClicked(MouseEvent e)
2149
+            {
2150
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2151
+                cMaterial material = object.material;
2152
+                
2153
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2154
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2155
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2156
+
2157
+                materialtouched = true;
2158
+                applySelf();
2159
+            }
2160
+        });
2161
+        presetpanel.add(bump0);
2162
+        
2163
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2164
+        halo.setToolTipText("Halo");
2165
+        halo.addMouseListener(new MouseAdapter()
2166
+        {
2167
+            public void mouseClicked(MouseEvent e)
2168
+            {
2169
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2170
+                cMaterial material = object.material;
2171
+                
2172
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2173
+
2174
+                materialtouched = true;
2175
+                applySelf();
2176
+            }
2177
+        });
2178
+        presetpanel.add(halo);
2179
+        
2180
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2181
+        candle.setToolTipText("Candle");
2182
+        candle.addMouseListener(new MouseAdapter()
2183
+        {
2184
+            public void mouseClicked(MouseEvent e)
2185
+            {
2186
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2187
+                cMaterial material = object.material;
2188
+                
2189
+                subsurfaceField.setFloat(material.subsurface);
2190
+                shadowbiasField.setFloat(material.shadowbias);
2191
+                ambientField.setFloat(material.ambient);
2192
+                specularField.setFloat(material.specular);
2193
+                lightareaField.setFloat(material.lightarea);
2194
+                shininessField.setFloat(material.shininess);
2195
+
2196
+                materialtouched = true;
2197
+                applySelf();
2198
+            }
2199
+        });
2200
+        presetpanel.add(candle);
2201
+        
2202
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2203
+        shadowShader.setToolTipText("Shadow");
2204
+        shadowShader.addMouseListener(new MouseAdapter()
2205
+        {
2206
+            public void mouseClicked(MouseEvent e)
2207
+            {
2208
+                diffuseField.setFloat(0.001);
2209
+                ambientField.setFloat(0.001);
2210
+                cameraField.setFloat(0.001);
2211
+                specularField.setFloat(0.001);
2212
+                fakedepthField.setFloat(0.001);
2213
+                opacityField.setFloat(0.6);
2214
+
2215
+                materialtouched = true;
2216
+                applySelf();
2217
+            }
2218
+        });
2219
+        presetpanel.add(shadowShader);
18052220         
18062221         cGridBag panel = new cGridBag().setVertical(true);
18072222         
18082223         presetpanel.preferredWidth = 1;
18092224         
1810
-        materialpanel.add(panel);
18112225         materialpanel.add(presetpanel);
2226
+        materialpanel.add(panel);
18122227         
18132228         panel.preferredWidth = 8;
18142229         
....@@ -3275,6 +3690,17 @@
32753690     public void itemStateChanged(ItemEvent event)
32763691     {
32773692         //                   System.out.println("Propagate = " + propagate);
3693
+        if (event.getSource() == pinButton)
3694
+        {
3695
+            copy.pinned ^= true;
3696
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3697
+            {
3698
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3699
+                copy.CloseUI();
3700
+                //copy.editWindow.refreshContents();
3701
+            }
3702
+        }
3703
+        else
32783704         if (event.getSource() == propagateToggle)
32793705         {
32803706             propagate ^= true;
....@@ -3747,7 +4173,7 @@
37474173     {
37484174         //Save(true);
37494175         Replace();
3750
-        SetUndoStates();
4176
+        SetVersionStates();
37514177     }
37524178     
37534179     private boolean Equal(byte[] compress, byte[] name)
....@@ -3777,17 +4203,17 @@
37774203         
37784204         CopyChanged();
37794205         
3780
-        SetUndoStates();
4206
+        SetVersionStates();
37814207     }
37824208     
37834209     public boolean Save(boolean user)
37844210     {
37854211         System.err.println("Save");
3786
-        //Replace();
4212
+        Replace();
37874213         
3788
-        cRadio tab = GetCurrentTab();
4214
+        //cRadio tab = GetCurrentTab();
37894215         
3790
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4216
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37914217         
37924218         boolean thesame = false;
37934219         
....@@ -3823,7 +4249,7 @@
38234249 //            copy.versionlist[i] = null;
38244250 //        }
38254251 
3826
-        SetUndoStates();
4252
+        SetVersionStates();
38274253         
38284254         // test save
38294255         if (false)
....@@ -3881,9 +4307,9 @@
38814307 
38824308     void CopyChanged()
38834309     {
3884
-        Object3D obj = copy.versionlist[copy.versionindex];
4310
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
38854311         
3886
-        SetUndoStates();
4312
+        SetVersionStates();
38874313         
38884314         boolean temp = CameraPane.SWITCH;
38894315         CameraPane.SWITCH = false;
....@@ -3950,12 +4376,15 @@
39504376         return count;
39514377     }
39524378     
3953
-    void SetUndoStates()
4379
+    void SetVersionStates()
39544380     {
3955
-        cRadio tab = GetCurrentTab();
4381
+        //if (true)
4382
+        //    return;
4383
+                    
4384
+        //cRadio tab = GetCurrentTab();
39564385         
3957
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4386
+        restoreButton.setEnabled(copy.versionindex != -1);
4387
+        replaceButton.setEnabled(copy.versionindex != -1);
39594388         
39604389         previousVersionButton.setEnabled(copy.versionindex > 0);
39614390         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -3964,8 +4393,10 @@
39644393                                         copy.versionlist[copy.versionindex + 1] != null);
39654394         
39664395         muteSlider = true;
4396
+        versionSlider.setMinimum(0);
39674397         versionSlider.setMaximum(VersionCount() - 1);
39684398         versionSlider.setInteger(copy.versionindex);
4399
+        versionSlider.setEnabled(copy.versionindex != -1);
39694400         muteSlider = false;
39704401     }
39714402     
....@@ -3976,7 +4407,7 @@
39764407         
39774408         System.err.println("Undo");
39784409         
3979
-        cRadio tab = GetCurrentTab();
4410
+        //cRadio tab = GetCurrentTab();
39804411         
39814412         if (copy.versionindex == 0)
39824413         {
....@@ -4008,7 +4439,7 @@
40084439     {
40094440         System.err.println("Restore");
40104441         
4011
-        cRadio tab = GetCurrentTab();
4442
+        //cRadio tab = GetCurrentTab();
40124443         
40134444         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40144445         {
....@@ -4026,7 +4457,7 @@
40264457     {
40274458         System.err.println("Replace");
40284459         
4029
-        cRadio tab = GetCurrentTab();
4460
+        //cRadio tab = GetCurrentTab();
40304461         
40314462         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40324463         {
....@@ -4034,7 +4465,7 @@
40344465             return false;
40354466         }
40364467 
4037
-        copy.versionlist[copy.versionindex] = CompressCopy();
4468
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
40384469         
40394470         return true;
40404471     }
....@@ -4044,7 +4475,7 @@
40444475         // Option?
40454476         Replace();
40464477         
4047
-        cRadio tab = GetCurrentTab();
4478
+        //cRadio tab = GetCurrentTab();
40484479         
40494480         if (copy.versionlist[copy.versionindex + 1] == null)
40504481         {
....@@ -4363,9 +4794,11 @@
43634794             if (muteSlider)
43644795                 return;
43654796             
4797
+            Replace();
4798
+            
43664799             int version = versionSlider.getInteger();
43674800             
4368
-            if (copy.versionlist[version] != null)
4801
+            if (version != -1 && copy.versionlist[version] != null)
43694802             {
43704803                 copy.versionindex = version;
43714804                 CopyChanged();
....@@ -4409,7 +4842,7 @@
44094842             //System.out.println("stateChanged = " + this);
44104843             materialtouched = true;
44114844             
4412
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4845
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
44134846             {
44144847                 saturationField.setFloat(1);
44154848             }
....@@ -4724,7 +5157,7 @@
47245157         }
47255158         
47265159         if (previousVersionButton != null && copy.versionlist != null)
4727
-            SetUndoStates();
5160
+            SetVersionStates();
47285161     }
47295162     
47305163     static TweenManager tweenManager = new TweenManager();
....@@ -5113,8 +5546,11 @@
51135546             
51145547         if (copy.versionlist == null)
51155548         {
5549
+            // Backward compatibility
51165550             copy.versionlist = new Object3D[100];
51175551             copy.versionindex = -1;
5552
+            
5553
+            //Save(true);
51185554         }
51195555         
51205556             //? SetUndoStates();
....@@ -5206,6 +5642,8 @@
52065642 
52075643     void save()
52085644     {
5645
+        Replace();
5646
+        
52095647         if (lastname == null)
52105648         {
52115649             return;
....@@ -5448,6 +5886,7 @@
54485886     ButtonGroup buttonGroup;
54495887     
54505888     cGridBag toolboxPanel;
5889
+    cGridBag skyboxPanel;
54515890     cGridBag materialPanel;
54525891     cGridBag ctrlPanel;
54535892     
....@@ -5552,6 +5991,7 @@
55525991     cNumberSlider anisoField;
55535992     JLabel anisoVLabel;
55545993     cNumberSlider anisoVField;
5994
+    
55555995     JLabel cameraLabel;
55565996     cNumberSlider cameraField;
55575997     JLabel selfshadowLabel;
....@@ -5566,6 +6006,7 @@
55666006     cNumberSlider fakedepthField;
55676007     JLabel shadowbiasLabel;
55686008     cNumberSlider shadowbiasField;
6009
+    
55696010     JLabel bumpLabel;
55706011     cNumberSlider bumpField;
55716012     JLabel noiseLabel;