blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -41,6 +42,35 @@
4142     JFrame frame;
4243     
4344     static ObjEditor theFrame;
45
+
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
4474 
4575     public cGridBag GetSeparator()
4676     {
....@@ -74,8 +104,16 @@
74104         return new cCheckBox(icon, border);
75105     }
76106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
77109     ImageIcon GetIcon(String name)
78110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
79117         try
80118         {
81119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +131,14 @@
93131 //            }
94132 
95133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
96137             return icon;
97138         }
98139         catch (Exception e)
99140         {
141
+            //icons.put(name, null);
100142             return null;
101143         }
102144     }
....@@ -296,11 +338,13 @@
296338         client = inClient;
297339         copy = client;
298340 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
304348         
305349         // "this" is not called: SetupUI2(objEditor);
306350     }
....@@ -319,6 +363,8 @@
319363         {
320364             copy.versionlist = new Object3D[100];
321365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
322368         }
323369         
324370         SetupUI2(callee.GetEditor());
....@@ -342,7 +388,8 @@
342388         //parent = p;
343389 
344390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346393         //gd.setFullScreenWindow(this);
347394         //setResizable(false);
348395         //if (!isDisplayable())
....@@ -353,11 +400,13 @@
353400         copy = localCopy;
354401         copy.editWindow = this;
355402 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
359406 //            copy.versionindex = -1;
360
-        }
407
+//            
408
+//            Save(true);
409
+//        }
361410         
362411         SetupMenu();
363412 
....@@ -426,6 +475,8 @@
426475         
427476         ChangeListener changeListener = new ChangeListener()
428477         {
478
+            //String name;
479
+            
429480             public void stateChanged(ChangeEvent changeEvent)
430481             {
431482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +495,37 @@
444495 //                        EditSelection(false);
445496 //                }
446497 
447
-                refreshContents(false); // To refresh Info tab
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+                
527
+//                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
448529             }
449530         };
450531         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +547,8 @@
466547                 
467548         toolboxPanel = new cGridBag().setVertical(true);
468549         //toolboxPanel.setName("Toolbox");
550
+        
551
+        skyboxPanel = new cGridBag().setVertical(true);
469552         
470553         materialPanel = new cGridBag().setVertical(false);
471554         //materialPanel.setName("Material");
....@@ -751,6 +834,7 @@
751834         boolean maximized;
752835     
753836         cButton fullscreenLayout;
837
+        cButton expandedLayout;
754838 
755839         void Minimize()
756840         {
....@@ -790,10 +874,12 @@
790874 	cButton minButton;
791875 	cButton maxButton;
792876 	cButton fullButton;
877
+	cButton collapseButton;
878
+        cButton maximize3DButton;
793879         
794880         void ToggleFullScreen()
795881         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797883 
798884                 cameraView.ToggleFullScreen();
799885                 
....@@ -814,13 +900,13 @@
814900 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815901 // X                   framePanel.add(bigThree);
816902 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
903
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818904                     
819905                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
906
+//                    radio.layout = keepButton;
821907                     //theFrame = null;
822908                     keepButton = null;
823
-                    radio.layout.doClick();
909
+//                    radio.layout.doClick();
824910                     
825911                 } else
826912                 {
....@@ -841,10 +927,10 @@
841927 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842928 // X                   framePanel.remove(bigThree);
843929 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
930
+//                    framePanel.setDividerLocation(0);
845931 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
932
+//                    radio.layout = fullscreenLayout;
933
+//                    radio.layout.doClick();
848934                     //frame.setVisible(true);
849935                 }
850936             frame.validate();
....@@ -852,23 +938,31 @@
852938             cameraView.requestFocusInWindow();
853939         }
854940 
855
-    private Object3D CompressCopy()
941
+        void CollapseToolbar()
942
+        {
943
+            framePanel.setDividerLocation(0);
944
+            //frame.validate();
945
+            
946
+            cameraView.requestFocusInWindow();
947
+        }
948
+        
949
+    private Object3D Duplicate(Object3D object)
856950     {
857951         boolean temp = CameraPane.SWITCH;
858952         CameraPane.SWITCH = false;
859953         
860
-        copy.ExtractBigData(versiontable);
954
+        object.ExtractBigData(versiontable);
861955         // if (copy == client)
862956         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
957
+        Object3D versions[] = object.versionlist;
958
+        object.versionlist = null;
865959         
866960         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
961
+        Object3D compress = (Object3D)Grafreed.clone(object);
868962         
869
-        copy.versionlist = versions;
963
+        object.versionlist = versions;
870964         
871
-        copy.RestoreBigData(versiontable);
965
+        object.RestoreBigData(versiontable);
872966         
873967         CameraPane.SWITCH = temp;
874968         
....@@ -1205,6 +1299,18 @@
12051299         
12061300             namePanel = new cGridBag();
12071301             
1302
+        //if (copy.pinned)
1303
+        {
1304
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1305
+            pinButton.setSelected(copy.pinned);
1306
+            cGridBag t = new cGridBag();
1307
+            t.preferredWidth = 2;
1308
+            t.add(pinButton);
1309
+            namePanel.add(t);
1310
+            
1311
+            pinButton.addItemListener(this);
1312
+        }
1313
+        
12081314         nameField = AddText(namePanel, copy.GetName());
12091315         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101316         oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1324,14 @@
12181324             
12191325         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201326                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
12211329         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221330                 selectableCB.setToolTipText("Make object selectable");
12231331 //            Return();
12241332                 
12251333         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261334                 hideCB.setToolTipText("Hide object");
1227
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
-        markCB.setToolTipText("As animation target transform");
12291335         
12301336         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311337         
....@@ -1427,6 +1533,7 @@
14271533 
14281534         if (cam == null || !(copy.get(0) instanceof cGroup))
14291535         {
1536
+        if (Globals.DEBUG)
14301537             System.out.println("CREATE CAMERAS");
14311538             cams = new cTemplate();
14321539             cams.name = "Cameras";
....@@ -1556,27 +1663,26 @@
15561663         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15571664         objectPanel.setToolTipTextAt(0, "Material");
15581665     
1666
+        objectPanel.add(toolboxPanel);
1667
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+
1670
+        objectPanel.add(skyboxPanel);
1671
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1673
+        
15591674 //        JPanel north = new JPanel(new BorderLayout());
15601675 //        north.setName("Edit");
15611676 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621677 //        objectPanel.add(north);
15631678         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");
1679
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1680
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711681         
15721682         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1683
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751685         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
15801686         /*
15811687         aConstraints.gridx = 0;
15821688         aConstraints.gridwidth = 1;
....@@ -1613,6 +1719,11 @@
16131719 
16141720         scenePanel.add(tabbedPane);
16151721 
1722
+        //if (Globals.ADVANCED)
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
1726
+        
16161727         /*
16171728         cTree jTree = new cTree(null);
16181729         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1794,23 @@
16831794 //		aConstraints.gridheight = 1;
16841795 
16851796         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1797
+        
1798
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1799
+                new java.beans.PropertyChangeListener()
1800
+                {
1801
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1802
+                    {
1803
+                        if ((Integer)pce.getOldValue() == 1)
1804
+                        {
1805
+                            if (radio.layout != expandedLayout)
1806
+                            {
1807
+                                radio.layout = expandedLayout;
1808
+                                radio.layout.doClick();
1809
+                            }
1810
+                        }
1811
+                    }
1812
+                });
1813
+
16861814         framePanel.setContinuousLayout(false);
16871815         framePanel.setOneTouchExpandable(false);
16881816         //.setDividerLocation(0.8);
....@@ -1692,7 +1820,7 @@
16921820 
16931821         frame.getContentPane().setLayout(new BorderLayout());
16941822         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
16961824         //worldPane.add(bigPanel);
16971825         //worldPane.add(worldPanel);
16981826                 /**/
....@@ -1740,7 +1868,9 @@
17401868     void SetupMaterial(cGridBag materialpanel)
17411869     {
17421870         cGridBag presetpanel = new cGridBag().setVertical(true);
1871
+        
17431872         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1873
+        skin.setToolTipText("Skin");
17441874         skin.addMouseListener(new MouseAdapter()
17451875         {
17461876             public void mouseClicked(MouseEvent e)
....@@ -1769,8 +1899,116 @@
17691899         });
17701900         presetpanel.add(skin);
17711901         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
1902
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1903
+        lambert.setToolTipText("Diffuse");
1904
+        lambert.addMouseListener(new MouseAdapter()
1905
+        {
1906
+            public void mouseClicked(MouseEvent e)
1907
+            {
1908
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1909
+                cMaterial material = object.material;
1910
+                
1911
+                diffusenessField.setFloat(material.factor);
1912
+                selfshadowField.setFloat(material.diffuseness);
1913
+
1914
+                materialtouched = true;
1915
+                applySelf();
1916
+            }
1917
+        });
1918
+        presetpanel.add(lambert);
1919
+        
1920
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1921
+        diffuse2.setToolTipText("Diffuse2");
1922
+        diffuse2.addMouseListener(new MouseAdapter()
1923
+        {
1924
+            public void mouseClicked(MouseEvent e)
1925
+            {
1926
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1927
+                cMaterial material = object.material;
1928
+                
1929
+                diffusenessField.setFloat(material.factor);
1930
+                selfshadowField.setFloat(material.diffuseness);
1931
+
1932
+                materialtouched = true;
1933
+                applySelf();
1934
+            }
1935
+        });
1936
+        presetpanel.add(diffuse2);
1937
+        
1938
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1939
+        diffusemoon.setToolTipText("Moon");
1940
+        diffusemoon.addMouseListener(new MouseAdapter()
1941
+        {
1942
+            public void mouseClicked(MouseEvent e)
1943
+            {
1944
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1945
+                cMaterial material = object.material;
1946
+                
1947
+                diffusenessField.setFloat(material.factor);
1948
+                selfshadowField.setFloat(material.diffuseness);
1949
+
1950
+                materialtouched = true;
1951
+                applySelf();
1952
+            }
1953
+        });
1954
+        presetpanel.add(diffusemoon);
1955
+        
1956
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1957
+        diffusemoon2.setToolTipText("Moon2");
1958
+        diffusemoon2.addMouseListener(new MouseAdapter()
1959
+        {
1960
+            public void mouseClicked(MouseEvent e)
1961
+            {
1962
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1963
+                cMaterial material = object.material;
1964
+                
1965
+                diffusenessField.setFloat(material.factor);
1966
+                selfshadowField.setFloat(material.diffuseness);
1967
+
1968
+                materialtouched = true;
1969
+                applySelf();
1970
+            }
1971
+        });
1972
+        presetpanel.add(diffusemoon2);
1973
+        
1974
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1975
+        diffusemoon3.setToolTipText("Moon3");
1976
+        diffusemoon3.addMouseListener(new MouseAdapter()
1977
+        {
1978
+            public void mouseClicked(MouseEvent e)
1979
+            {
1980
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1981
+                cMaterial material = object.material;
1982
+                
1983
+                diffusenessField.setFloat(material.factor);
1984
+                selfshadowField.setFloat(material.diffuseness);
1985
+
1986
+                materialtouched = true;
1987
+                applySelf();
1988
+            }
1989
+        });
1990
+        presetpanel.add(diffusemoon3);
1991
+        
1992
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1993
+        diffusesheen.setToolTipText("Sheen");
1994
+        diffusesheen.addMouseListener(new MouseAdapter()
1995
+        {
1996
+            public void mouseClicked(MouseEvent e)
1997
+            {
1998
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
1999
+                cMaterial material = object.material;
2000
+                
2001
+                sheenField.setFloat(material.sheen);
2002
+
2003
+                materialtouched = true;
2004
+                applySelf();
2005
+            }
2006
+        });
2007
+        presetpanel.add(diffusesheen);
2008
+        
2009
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2010
+        rough.setToolTipText("Rough metal");
2011
+        rough.addMouseListener(new MouseAdapter()
17742012         {
17752013             public void mouseClicked(MouseEvent e)
17762014             {
....@@ -1784,31 +2022,254 @@
17842022                 applySelf();
17852023             }
17862024         });
2025
+        presetpanel.add(rough);
2026
+        
2027
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2028
+        rough2.setToolTipText("Medium metal");
2029
+        rough2.addMouseListener(new MouseAdapter()
2030
+        {
2031
+            public void mouseClicked(MouseEvent e)
2032
+            {
2033
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
2034
+                cMaterial material = object.material;
2035
+                
2036
+                shininessField.setFloat(material.shininess);
2037
+                lightareaField.setFloat(material.lightarea);
2038
+
2039
+                materialtouched = true;
2040
+                applySelf();
2041
+            }
2042
+        });
17872043         presetpanel.add(rough2);
17882044         
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));
2045
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2046
+        shini0.setToolTipText("Shiny");
2047
+        shini0.addMouseListener(new MouseAdapter()
2048
+        {
2049
+            public void mouseClicked(MouseEvent e)
2050
+            {
2051
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
2052
+                cMaterial material = object.material;
2053
+                
2054
+                shininessField.setFloat(material.shininess);
2055
+                lightareaField.setFloat(material.lightarea);
2056
+
2057
+                materialtouched = true;
2058
+                applySelf();
2059
+            }
2060
+        });
2061
+        presetpanel.add(shini0);
2062
+        
2063
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2064
+        shini1.setToolTipText("Shiny2");
2065
+        shini1.addMouseListener(new MouseAdapter()
2066
+        {
2067
+            public void mouseClicked(MouseEvent e)
2068
+            {
2069
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
2070
+                cMaterial material = object.material;
2071
+                
2072
+                shininessField.setFloat(material.shininess);
2073
+                lightareaField.setFloat(material.lightarea);
2074
+
2075
+                materialtouched = true;
2076
+                applySelf();
2077
+            }
2078
+        });
2079
+        presetpanel.add(shini1);
2080
+        
2081
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2082
+        shini2.setToolTipText("Shiny3");
2083
+        shini2.addMouseListener(new MouseAdapter()
2084
+        {
2085
+            public void mouseClicked(MouseEvent e)
2086
+            {
2087
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2088
+                cMaterial material = object.material;
2089
+                
2090
+                shininessField.setFloat(material.shininess);
2091
+                lightareaField.setFloat(material.lightarea);
2092
+
2093
+                materialtouched = true;
2094
+                applySelf();
2095
+            }
2096
+        });
2097
+        presetpanel.add(shini2);
2098
+        
2099
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2100
+        aniso.setToolTipText("AnisoU");
2101
+        aniso.addMouseListener(new MouseAdapter()
2102
+        {
2103
+            public void mouseClicked(MouseEvent e)
2104
+            {
2105
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2106
+                cMaterial material = object.material;
2107
+                
2108
+                anisoField.setFloat(material.aniso);
2109
+                anisoVField.setFloat(material.anisoV);
2110
+
2111
+                materialtouched = true;
2112
+                applySelf();
2113
+            }
2114
+        });
2115
+        presetpanel.add(aniso);
2116
+        
2117
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2118
+        aniso2.setToolTipText("AnisoV");
2119
+        aniso2.addMouseListener(new MouseAdapter()
2120
+        {
2121
+            public void mouseClicked(MouseEvent e)
2122
+            {
2123
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2124
+                cMaterial material = object.material;
2125
+                
2126
+                anisoField.setFloat(material.aniso);
2127
+                anisoVField.setFloat(material.anisoV);
2128
+
2129
+                materialtouched = true;
2130
+                applySelf();
2131
+            }
2132
+        });
2133
+        presetpanel.add(aniso2);
2134
+        
2135
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2136
+        aniso3.setToolTipText("AnisoUV");
2137
+        aniso3.addMouseListener(new MouseAdapter()
2138
+        {
2139
+            public void mouseClicked(MouseEvent e)
2140
+            {
2141
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2142
+                cMaterial material = object.material;
2143
+                
2144
+                anisoField.setFloat(material.aniso);
2145
+                anisoVField.setFloat(material.anisoV);
2146
+
2147
+                materialtouched = true;
2148
+                applySelf();
2149
+            }
2150
+        });
2151
+        presetpanel.add(aniso3);
2152
+        
2153
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2154
+        velvet0.setToolTipText("Velvet");
2155
+        velvet0.addMouseListener(new MouseAdapter()
2156
+        {
2157
+            public void mouseClicked(MouseEvent e)
2158
+            {
2159
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2160
+                cMaterial material = object.material;
2161
+                
2162
+                diffusenessField.setFloat(material.factor);
2163
+                selfshadowField.setFloat(material.diffuseness);
2164
+                sheenField.setFloat(material.sheen);
2165
+                shininessField.setFloat(material.shininess);
2166
+                velvetField.setFloat(material.velvet);
2167
+                shiftField.setFloat(material.shift);
2168
+
2169
+                materialtouched = true;
2170
+                applySelf();
2171
+            }
2172
+        });
2173
+        presetpanel.add(velvet0);
2174
+        
2175
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2176
+        bump0.setToolTipText("Bump texture");
2177
+        bump0.addMouseListener(new MouseAdapter()
2178
+        {
2179
+            public void mouseClicked(MouseEvent e)
2180
+            {
2181
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2182
+                cMaterial material = object.material;
2183
+                
2184
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2185
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2186
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2187
+
2188
+                materialtouched = true;
2189
+                applySelf();
2190
+            }
2191
+        });
2192
+        presetpanel.add(bump0);
2193
+        
2194
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+        borderShader.setToolTipText("Border fade");
2196
+        borderShader.addMouseListener(new MouseAdapter()
2197
+        {
2198
+            public void mouseClicked(MouseEvent e)
2199
+            {
2200
+                borderfadeField.setFloat(0.5);
2201
+                opacityField.setFloat(0.75);
2202
+
2203
+                materialtouched = true;
2204
+                applySelf();
2205
+            }
2206
+        });
2207
+        presetpanel.add(borderShader);
2208
+        
2209
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2210
+        halo.setToolTipText("Halo");
2211
+        halo.addMouseListener(new MouseAdapter()
2212
+        {
2213
+            public void mouseClicked(MouseEvent e)
2214
+            {
2215
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2216
+                cMaterial material = object.material;
2217
+                
2218
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2219
+
2220
+                materialtouched = true;
2221
+                applySelf();
2222
+            }
2223
+        });
2224
+        presetpanel.add(halo);
2225
+        
2226
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2227
+        candle.setToolTipText("Candle");
2228
+        candle.addMouseListener(new MouseAdapter()
2229
+        {
2230
+            public void mouseClicked(MouseEvent e)
2231
+            {
2232
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2233
+                cMaterial material = object.material;
2234
+                
2235
+                subsurfaceField.setFloat(material.subsurface);
2236
+                shadowbiasField.setFloat(material.shadowbias);
2237
+                ambientField.setFloat(material.ambient);
2238
+                specularField.setFloat(material.specular);
2239
+                lightareaField.setFloat(material.lightarea);
2240
+                shininessField.setFloat(material.shininess);
2241
+
2242
+                materialtouched = true;
2243
+                applySelf();
2244
+            }
2245
+        });
2246
+        presetpanel.add(candle);
2247
+        
2248
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2249
+        shadowShader.setToolTipText("Shadow");
2250
+        shadowShader.addMouseListener(new MouseAdapter()
2251
+        {
2252
+            public void mouseClicked(MouseEvent e)
2253
+            {
2254
+                diffuseField.setFloat(0.001);
2255
+                ambientField.setFloat(0.001);
2256
+                cameraField.setFloat(0.001);
2257
+                specularField.setFloat(0.001);
2258
+                fakedepthField.setFloat(0.001);
2259
+                opacityField.setFloat(0.6);
2260
+
2261
+                materialtouched = true;
2262
+                applySelf();
2263
+            }
2264
+        });
2265
+        presetpanel.add(shadowShader);
18052266         
18062267         cGridBag panel = new cGridBag().setVertical(true);
18072268         
18082269         presetpanel.preferredWidth = 1;
18092270         
1810
-        materialpanel.add(panel);
18112271         materialpanel.add(presetpanel);
2272
+        materialpanel.add(panel);
18122273         
18132274         panel.preferredWidth = 8;
18142275         
....@@ -1852,9 +2313,20 @@
18522313 
18532314         cGridBag huepanel = new cGridBag();
18542315             cGridBag huelabel = new cGridBag();
1855
-        skin = GetLabel("icons/hue.png", false);
1856
-        skin.fit = true;
1857
-            huelabel.add(skin);
2316
+        cLabel hue = GetLabel("icons/hue.png", false);
2317
+        hue.fit = true;
2318
+        
2319
+        hue.addMouseListener(new MouseAdapter()
2320
+        {
2321
+            public void mousePressed(MouseEvent e)
2322
+            {
2323
+                int x = e.getX();
2324
+                
2325
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+            }
2327
+        });
2328
+        
2329
+            huelabel.add(hue);
18582330             huelabel.preferredWidth = 20;
18592331             huepanel.add(new cGridBag()); // Label
18602332             huepanel.add(huelabel); // Field/slider
....@@ -3130,32 +3602,8 @@
31303602 
31313603         if (multiplyToggle != null)
31323604                 multiplyToggle.setSelected(mat.multiply);
3133
-
3134
-        assert (object.projectedVertices != null);
3135
-
3136
-        if (object.projectedVertices.length <= 2)
3137
-        {
3138
-            // Side effect...
3139
-            Object3D.cVector2[] keep = object.projectedVertices;
3140
-            object.projectedVertices = new Object3D.cVector2[3];
3141
-            for (int i = 0; i < 3; i++)
3142
-            {
3143
-                if (i < keep.length)
3144
-                {
3145
-                    object.projectedVertices[i] = keep[i];
3146
-                } else
3147
-                {
3148
-                    object.projectedVertices[i] = new Object3D.cVector2();
3149
-                }
3150
-                /*
3151
-                if(keep.length == 0)
3152
-                object.projectedVertices[0] = new Object3D.cVector2();
3153
-                else
3154
-                object.projectedVertices[0] = keep[0];
3155
-                object.projectedVertices[1] = new Object3D.cVector2();
3156
-                 */
3157
-            }
3158
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
31593607 
31603608         SetMaterial(mat, object.projectedVertices);
31613609     }
....@@ -3275,6 +3723,17 @@
32753723     public void itemStateChanged(ItemEvent event)
32763724     {
32773725         //                   System.out.println("Propagate = " + propagate);
3726
+        if (event.getSource() == pinButton)
3727
+        {
3728
+            copy.pinned ^= true;
3729
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3730
+            {
3731
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3732
+                copy.CloseUI();
3733
+                //copy.editWindow.refreshContents();
3734
+            }
3735
+        }
3736
+        else
32783737         if (event.getSource() == propagateToggle)
32793738         {
32803739             propagate ^= true;
....@@ -3747,7 +4206,7 @@
37474206     {
37484207         //Save(true);
37494208         Replace();
3750
-        SetUndoStates();
4209
+        SetVersionStates();
37514210     }
37524211     
37534212     private boolean Equal(byte[] compress, byte[] name)
....@@ -3777,17 +4236,17 @@
37774236         
37784237         CopyChanged();
37794238         
3780
-        SetUndoStates();
4239
+        SetVersionStates();
37814240     }
37824241     
37834242     public boolean Save(boolean user)
37844243     {
37854244         System.err.println("Save");
3786
-        //Replace();
4245
+        Replace();
37874246         
3788
-        cRadio tab = GetCurrentTab();
4247
+        //cRadio tab = GetCurrentTab();
37894248         
3790
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4249
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37914250         
37924251         boolean thesame = false;
37934252         
....@@ -3823,7 +4282,7 @@
38234282 //            copy.versionlist[i] = null;
38244283 //        }
38254284 
3826
-        SetUndoStates();
4285
+        SetVersionStates();
38274286         
38284287         // test save
38294288         if (false)
....@@ -3881,9 +4340,9 @@
38814340 
38824341     void CopyChanged()
38834342     {
3884
-        Object3D obj = copy.versionlist[copy.versionindex];
4343
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
38854344         
3886
-        SetUndoStates();
4345
+        SetVersionStates();
38874346         
38884347         boolean temp = CameraPane.SWITCH;
38894348         CameraPane.SWITCH = false;
....@@ -3950,12 +4409,15 @@
39504409         return count;
39514410     }
39524411     
3953
-    void SetUndoStates()
4412
+    void SetVersionStates()
39544413     {
3955
-        cRadio tab = GetCurrentTab();
4414
+        //if (true)
4415
+        //    return;
4416
+                    
4417
+        //cRadio tab = GetCurrentTab();
39564418         
3957
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4419
+        restoreButton.setEnabled(copy.versionindex != -1);
4420
+        replaceButton.setEnabled(copy.versionindex != -1);
39594421         
39604422         previousVersionButton.setEnabled(copy.versionindex > 0);
39614423         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -3964,8 +4426,10 @@
39644426                                         copy.versionlist[copy.versionindex + 1] != null);
39654427         
39664428         muteSlider = true;
4429
+        versionSlider.setMinimum(0);
39674430         versionSlider.setMaximum(VersionCount() - 1);
39684431         versionSlider.setInteger(copy.versionindex);
4432
+        versionSlider.setEnabled(copy.versionindex != -1);
39694433         muteSlider = false;
39704434     }
39714435     
....@@ -3976,7 +4440,7 @@
39764440         
39774441         System.err.println("Undo");
39784442         
3979
-        cRadio tab = GetCurrentTab();
4443
+        //cRadio tab = GetCurrentTab();
39804444         
39814445         if (copy.versionindex == 0)
39824446         {
....@@ -4008,7 +4472,7 @@
40084472     {
40094473         System.err.println("Restore");
40104474         
4011
-        cRadio tab = GetCurrentTab();
4475
+        //cRadio tab = GetCurrentTab();
40124476         
40134477         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40144478         {
....@@ -4026,7 +4490,7 @@
40264490     {
40274491         System.err.println("Replace");
40284492         
4029
-        cRadio tab = GetCurrentTab();
4493
+        //cRadio tab = GetCurrentTab();
40304494         
40314495         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40324496         {
....@@ -4034,7 +4498,7 @@
40344498             return false;
40354499         }
40364500 
4037
-        copy.versionlist[copy.versionindex] = CompressCopy();
4501
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
40384502         
40394503         return true;
40404504     }
....@@ -4044,7 +4508,7 @@
40444508         // Option?
40454509         Replace();
40464510         
4047
-        cRadio tab = GetCurrentTab();
4511
+        //cRadio tab = GetCurrentTab();
40484512         
40494513         if (copy.versionlist[copy.versionindex + 1] == null)
40504514         {
....@@ -4363,9 +4827,11 @@
43634827             if (muteSlider)
43644828                 return;
43654829             
4830
+            Replace();
4831
+            
43664832             int version = versionSlider.getInteger();
43674833             
4368
-            if (copy.versionlist[version] != null)
4834
+            if (version != -1 && copy.versionlist[version] != null)
43694835             {
43704836                 copy.versionindex = version;
43714837                 CopyChanged();
....@@ -4409,7 +4875,7 @@
44094875             //System.out.println("stateChanged = " + this);
44104876             materialtouched = true;
44114877             
4412
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4878
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
44134879             {
44144880                 saturationField.setFloat(1);
44154881             }
....@@ -4724,7 +5190,9 @@
47245190         }
47255191         
47265192         if (previousVersionButton != null && copy.versionlist != null)
4727
-            SetUndoStates();
5193
+            SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
47285196     }
47295197     
47305198     static TweenManager tweenManager = new TweenManager();
....@@ -4756,7 +5224,7 @@
47565224 //                group = (Composite) group.get(0);
47575225 //            }
47585226 
4759
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
47605228 
47615229         /*
47625230         if (deselect && jList != null)
....@@ -5113,8 +5581,11 @@
51135581             
51145582         if (copy.versionlist == null)
51155583         {
5584
+            // Backward compatibility
51165585             copy.versionlist = new Object3D[100];
51175586             copy.versionindex = -1;
5587
+            
5588
+            //Save(true);
51185589         }
51195590         
51205591             //? SetUndoStates();
....@@ -5206,6 +5677,8 @@
52065677 
52075678     void save()
52085679     {
5680
+        Replace();
5681
+        
52095682         if (lastname == null)
52105683         {
52115684             return;
....@@ -5448,6 +5921,7 @@
54485921     ButtonGroup buttonGroup;
54495922     
54505923     cGridBag toolboxPanel;
5924
+    cGridBag skyboxPanel;
54515925     cGridBag materialPanel;
54525926     cGridBag ctrlPanel;
54535927     
....@@ -5552,6 +6026,7 @@
55526026     cNumberSlider anisoField;
55536027     JLabel anisoVLabel;
55546028     cNumberSlider anisoVField;
6029
+    
55556030     JLabel cameraLabel;
55566031     cNumberSlider cameraField;
55576032     JLabel selfshadowLabel;
....@@ -5566,6 +6041,7 @@
55666041     cNumberSlider fakedepthField;
55676042     JLabel shadowbiasLabel;
55686043     cNumberSlider shadowbiasField;
6044
+    
55696045     JLabel bumpLabel;
55706046     cNumberSlider bumpField;
55716047     JLabel noiseLabel;