blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 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,37 @@
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
+        if (Grafreed.grafreed.universe.versiontable == null)
955
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+         
957
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
861958         // if (copy == client)
862959         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
960
+        Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
962
+        object.versionlist = null;
963
+        object.versiontable = null;
865964         
866965         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
966
+        Object3D compress = (Object3D)Grafreed.clone(object);
868967         
869
-        copy.versionlist = versions;
968
+        object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
870970         
871
-        copy.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872972         
873973         CameraPane.SWITCH = temp;
874974         
....@@ -1205,6 +1305,18 @@
12051305         
12061306             namePanel = new cGridBag();
12071307             
1308
+        //if (copy.pinned)
1309
+        {
1310
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1311
+            pinButton.setSelected(copy.pinned);
1312
+            cGridBag t = new cGridBag();
1313
+            t.preferredWidth = 2;
1314
+            t.add(pinButton);
1315
+            namePanel.add(t);
1316
+            
1317
+            pinButton.addItemListener(this);
1318
+        }
1319
+        
12081320         nameField = AddText(namePanel, copy.GetName());
12091321         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101322         oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1330,14 @@
12181330             
12191331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
12211335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221336                 selectableCB.setToolTipText("Make object selectable");
12231337 //            Return();
12241338                 
12251339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261340                 hideCB.setToolTipText("Hide object");
1227
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
-        markCB.setToolTipText("As animation target transform");
12291341         
12301342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311343         
....@@ -1427,6 +1539,7 @@
14271539 
14281540         if (cam == null || !(copy.get(0) instanceof cGroup))
14291541         {
1542
+        if (Globals.DEBUG)
14301543             System.out.println("CREATE CAMERAS");
14311544             cams = new cTemplate();
14321545             cams.name = "Cameras";
....@@ -1552,31 +1665,30 @@
15521665 
15531666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15541667         //tmp.setName("Edit");
1668
+        objectPanel.add(toolboxPanel);
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
1671
+
15551672         objectPanel.add(materialPanel);
1556
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
-        objectPanel.setToolTipTextAt(0, "Material");
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
15581675     
1676
+        objectPanel.add(skyboxPanel);
1677
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1679
+        
15591680 //        JPanel north = new JPanel(new BorderLayout());
15601681 //        north.setName("Edit");
15611682 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621683 //        objectPanel.add(north);
15631684         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");
1685
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1686
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711687         
15721688         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1689
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751691         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
15801692         /*
15811693         aConstraints.gridx = 0;
15821694         aConstraints.gridwidth = 1;
....@@ -1613,6 +1725,11 @@
16131725 
16141726         scenePanel.add(tabbedPane);
16151727 
1728
+        //if (Globals.ADVANCED)
1729
+//            tabbedPane.add(infoPanel);
1730
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731
+//        tabbedPane.setToolTipTextAt(3, "Information");
1732
+        
16161733         /*
16171734         cTree jTree = new cTree(null);
16181735         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1800,23 @@
16831800 //		aConstraints.gridheight = 1;
16841801 
16851802         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1803
+        
1804
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1805
+                new java.beans.PropertyChangeListener()
1806
+                {
1807
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1808
+                    {
1809
+                        if ((Integer)pce.getOldValue() == 1)
1810
+                        {
1811
+                            if (radio.layout != expandedLayout)
1812
+                            {
1813
+                                radio.layout = expandedLayout;
1814
+                                radio.layout.doClick();
1815
+                            }
1816
+                        }
1817
+                    }
1818
+                });
1819
+
16861820         framePanel.setContinuousLayout(false);
16871821         framePanel.setOneTouchExpandable(false);
16881822         //.setDividerLocation(0.8);
....@@ -1692,7 +1826,7 @@
16921826 
16931827         frame.getContentPane().setLayout(new BorderLayout());
16941828         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1829
+        //JTabbedPane worldPane = new JTabbedPane();
16961830         //worldPane.add(bigPanel);
16971831         //worldPane.add(worldPanel);
16981832                 /**/
....@@ -1740,7 +1874,9 @@
17401874     void SetupMaterial(cGridBag materialpanel)
17411875     {
17421876         cGridBag presetpanel = new cGridBag().setVertical(true);
1877
+        
17431878         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1879
+        skin.setToolTipText("Skin");
17441880         skin.addMouseListener(new MouseAdapter()
17451881         {
17461882             public void mouseClicked(MouseEvent e)
....@@ -1769,8 +1905,116 @@
17691905         });
17701906         presetpanel.add(skin);
17711907         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
1908
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1909
+        lambert.setToolTipText("Diffuse");
1910
+        lambert.addMouseListener(new MouseAdapter()
1911
+        {
1912
+            public void mouseClicked(MouseEvent e)
1913
+            {
1914
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1915
+                cMaterial material = object.material;
1916
+                
1917
+                diffusenessField.setFloat(material.factor);
1918
+                selfshadowField.setFloat(material.diffuseness);
1919
+
1920
+                materialtouched = true;
1921
+                applySelf();
1922
+            }
1923
+        });
1924
+        presetpanel.add(lambert);
1925
+        
1926
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1927
+        diffuse2.setToolTipText("Diffuse2");
1928
+        diffuse2.addMouseListener(new MouseAdapter()
1929
+        {
1930
+            public void mouseClicked(MouseEvent e)
1931
+            {
1932
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1933
+                cMaterial material = object.material;
1934
+                
1935
+                diffusenessField.setFloat(material.factor);
1936
+                selfshadowField.setFloat(material.diffuseness);
1937
+
1938
+                materialtouched = true;
1939
+                applySelf();
1940
+            }
1941
+        });
1942
+        presetpanel.add(diffuse2);
1943
+        
1944
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1945
+        diffusemoon.setToolTipText("Moon");
1946
+        diffusemoon.addMouseListener(new MouseAdapter()
1947
+        {
1948
+            public void mouseClicked(MouseEvent e)
1949
+            {
1950
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1951
+                cMaterial material = object.material;
1952
+                
1953
+                diffusenessField.setFloat(material.factor);
1954
+                selfshadowField.setFloat(material.diffuseness);
1955
+
1956
+                materialtouched = true;
1957
+                applySelf();
1958
+            }
1959
+        });
1960
+        presetpanel.add(diffusemoon);
1961
+        
1962
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1963
+        diffusemoon2.setToolTipText("Moon2");
1964
+        diffusemoon2.addMouseListener(new MouseAdapter()
1965
+        {
1966
+            public void mouseClicked(MouseEvent e)
1967
+            {
1968
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1969
+                cMaterial material = object.material;
1970
+                
1971
+                diffusenessField.setFloat(material.factor);
1972
+                selfshadowField.setFloat(material.diffuseness);
1973
+
1974
+                materialtouched = true;
1975
+                applySelf();
1976
+            }
1977
+        });
1978
+        presetpanel.add(diffusemoon2);
1979
+        
1980
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1981
+        diffusemoon3.setToolTipText("Moon3");
1982
+        diffusemoon3.addMouseListener(new MouseAdapter()
1983
+        {
1984
+            public void mouseClicked(MouseEvent e)
1985
+            {
1986
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1987
+                cMaterial material = object.material;
1988
+                
1989
+                diffusenessField.setFloat(material.factor);
1990
+                selfshadowField.setFloat(material.diffuseness);
1991
+
1992
+                materialtouched = true;
1993
+                applySelf();
1994
+            }
1995
+        });
1996
+        presetpanel.add(diffusemoon3);
1997
+        
1998
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1999
+        diffusesheen.setToolTipText("Sheen");
2000
+        diffusesheen.addMouseListener(new MouseAdapter()
2001
+        {
2002
+            public void mouseClicked(MouseEvent e)
2003
+            {
2004
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
2005
+                cMaterial material = object.material;
2006
+                
2007
+                sheenField.setFloat(material.sheen);
2008
+
2009
+                materialtouched = true;
2010
+                applySelf();
2011
+            }
2012
+        });
2013
+        presetpanel.add(diffusesheen);
2014
+        
2015
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2016
+        rough.setToolTipText("Rough metal");
2017
+        rough.addMouseListener(new MouseAdapter()
17742018         {
17752019             public void mouseClicked(MouseEvent e)
17762020             {
....@@ -1784,31 +2028,254 @@
17842028                 applySelf();
17852029             }
17862030         });
2031
+        presetpanel.add(rough);
2032
+        
2033
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2034
+        rough2.setToolTipText("Medium metal");
2035
+        rough2.addMouseListener(new MouseAdapter()
2036
+        {
2037
+            public void mouseClicked(MouseEvent e)
2038
+            {
2039
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
2040
+                cMaterial material = object.material;
2041
+                
2042
+                shininessField.setFloat(material.shininess);
2043
+                lightareaField.setFloat(material.lightarea);
2044
+
2045
+                materialtouched = true;
2046
+                applySelf();
2047
+            }
2048
+        });
17872049         presetpanel.add(rough2);
17882050         
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));
2051
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2052
+        shini0.setToolTipText("Shiny");
2053
+        shini0.addMouseListener(new MouseAdapter()
2054
+        {
2055
+            public void mouseClicked(MouseEvent e)
2056
+            {
2057
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
2058
+                cMaterial material = object.material;
2059
+                
2060
+                shininessField.setFloat(material.shininess);
2061
+                lightareaField.setFloat(material.lightarea);
2062
+
2063
+                materialtouched = true;
2064
+                applySelf();
2065
+            }
2066
+        });
2067
+        presetpanel.add(shini0);
2068
+        
2069
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2070
+        shini1.setToolTipText("Shiny2");
2071
+        shini1.addMouseListener(new MouseAdapter()
2072
+        {
2073
+            public void mouseClicked(MouseEvent e)
2074
+            {
2075
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
2076
+                cMaterial material = object.material;
2077
+                
2078
+                shininessField.setFloat(material.shininess);
2079
+                lightareaField.setFloat(material.lightarea);
2080
+
2081
+                materialtouched = true;
2082
+                applySelf();
2083
+            }
2084
+        });
2085
+        presetpanel.add(shini1);
2086
+        
2087
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2088
+        shini2.setToolTipText("Shiny3");
2089
+        shini2.addMouseListener(new MouseAdapter()
2090
+        {
2091
+            public void mouseClicked(MouseEvent e)
2092
+            {
2093
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2094
+                cMaterial material = object.material;
2095
+                
2096
+                shininessField.setFloat(material.shininess);
2097
+                lightareaField.setFloat(material.lightarea);
2098
+
2099
+                materialtouched = true;
2100
+                applySelf();
2101
+            }
2102
+        });
2103
+        presetpanel.add(shini2);
2104
+        
2105
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2106
+        aniso.setToolTipText("AnisoU");
2107
+        aniso.addMouseListener(new MouseAdapter()
2108
+        {
2109
+            public void mouseClicked(MouseEvent e)
2110
+            {
2111
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2112
+                cMaterial material = object.material;
2113
+                
2114
+                anisoField.setFloat(material.aniso);
2115
+                anisoVField.setFloat(material.anisoV);
2116
+
2117
+                materialtouched = true;
2118
+                applySelf();
2119
+            }
2120
+        });
2121
+        presetpanel.add(aniso);
2122
+        
2123
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2124
+        aniso2.setToolTipText("AnisoV");
2125
+        aniso2.addMouseListener(new MouseAdapter()
2126
+        {
2127
+            public void mouseClicked(MouseEvent e)
2128
+            {
2129
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2130
+                cMaterial material = object.material;
2131
+                
2132
+                anisoField.setFloat(material.aniso);
2133
+                anisoVField.setFloat(material.anisoV);
2134
+
2135
+                materialtouched = true;
2136
+                applySelf();
2137
+            }
2138
+        });
2139
+        presetpanel.add(aniso2);
2140
+        
2141
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2142
+        aniso3.setToolTipText("AnisoUV");
2143
+        aniso3.addMouseListener(new MouseAdapter()
2144
+        {
2145
+            public void mouseClicked(MouseEvent e)
2146
+            {
2147
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2148
+                cMaterial material = object.material;
2149
+                
2150
+                anisoField.setFloat(material.aniso);
2151
+                anisoVField.setFloat(material.anisoV);
2152
+
2153
+                materialtouched = true;
2154
+                applySelf();
2155
+            }
2156
+        });
2157
+        presetpanel.add(aniso3);
2158
+        
2159
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2160
+        velvet0.setToolTipText("Velvet");
2161
+        velvet0.addMouseListener(new MouseAdapter()
2162
+        {
2163
+            public void mouseClicked(MouseEvent e)
2164
+            {
2165
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2166
+                cMaterial material = object.material;
2167
+                
2168
+                diffusenessField.setFloat(material.factor);
2169
+                selfshadowField.setFloat(material.diffuseness);
2170
+                sheenField.setFloat(material.sheen);
2171
+                shininessField.setFloat(material.shininess);
2172
+                velvetField.setFloat(material.velvet);
2173
+                shiftField.setFloat(material.shift);
2174
+
2175
+                materialtouched = true;
2176
+                applySelf();
2177
+            }
2178
+        });
2179
+        presetpanel.add(velvet0);
2180
+        
2181
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2182
+        bump0.setToolTipText("Bump texture");
2183
+        bump0.addMouseListener(new MouseAdapter()
2184
+        {
2185
+            public void mouseClicked(MouseEvent e)
2186
+            {
2187
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2188
+                cMaterial material = object.material;
2189
+                
2190
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2191
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2192
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2193
+
2194
+                materialtouched = true;
2195
+                applySelf();
2196
+            }
2197
+        });
2198
+        presetpanel.add(bump0);
2199
+        
2200
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2201
+        borderShader.setToolTipText("Border fade");
2202
+        borderShader.addMouseListener(new MouseAdapter()
2203
+        {
2204
+            public void mouseClicked(MouseEvent e)
2205
+            {
2206
+                borderfadeField.setFloat(0.5);
2207
+                opacityField.setFloat(0.75);
2208
+
2209
+                materialtouched = true;
2210
+                applySelf();
2211
+            }
2212
+        });
2213
+        presetpanel.add(borderShader);
2214
+        
2215
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2216
+        halo.setToolTipText("Halo");
2217
+        halo.addMouseListener(new MouseAdapter()
2218
+        {
2219
+            public void mouseClicked(MouseEvent e)
2220
+            {
2221
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2222
+                cMaterial material = object.material;
2223
+                
2224
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2225
+
2226
+                materialtouched = true;
2227
+                applySelf();
2228
+            }
2229
+        });
2230
+        presetpanel.add(halo);
2231
+        
2232
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2233
+        candle.setToolTipText("Candle");
2234
+        candle.addMouseListener(new MouseAdapter()
2235
+        {
2236
+            public void mouseClicked(MouseEvent e)
2237
+            {
2238
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2239
+                cMaterial material = object.material;
2240
+                
2241
+                subsurfaceField.setFloat(material.subsurface);
2242
+                shadowbiasField.setFloat(material.shadowbias);
2243
+                ambientField.setFloat(material.ambient);
2244
+                specularField.setFloat(material.specular);
2245
+                lightareaField.setFloat(material.lightarea);
2246
+                shininessField.setFloat(material.shininess);
2247
+
2248
+                materialtouched = true;
2249
+                applySelf();
2250
+            }
2251
+        });
2252
+        presetpanel.add(candle);
2253
+        
2254
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2255
+        shadowShader.setToolTipText("Shadow");
2256
+        shadowShader.addMouseListener(new MouseAdapter()
2257
+        {
2258
+            public void mouseClicked(MouseEvent e)
2259
+            {
2260
+                diffuseField.setFloat(0.001);
2261
+                ambientField.setFloat(0.001);
2262
+                cameraField.setFloat(0.001);
2263
+                specularField.setFloat(0.001);
2264
+                fakedepthField.setFloat(0.001);
2265
+                opacityField.setFloat(0.6);
2266
+
2267
+                materialtouched = true;
2268
+                applySelf();
2269
+            }
2270
+        });
2271
+        presetpanel.add(shadowShader);
18052272         
18062273         cGridBag panel = new cGridBag().setVertical(true);
18072274         
18082275         presetpanel.preferredWidth = 1;
18092276         
1810
-        materialpanel.add(panel);
18112277         materialpanel.add(presetpanel);
2278
+        materialpanel.add(panel);
18122279         
18132280         panel.preferredWidth = 8;
18142281         
....@@ -1852,9 +2319,20 @@
18522319 
18532320         cGridBag huepanel = new cGridBag();
18542321             cGridBag huelabel = new cGridBag();
1855
-        skin = GetLabel("icons/hue.png", false);
1856
-        skin.fit = true;
1857
-            huelabel.add(skin);
2322
+        cLabel hue = GetLabel("icons/hue.png", false);
2323
+        hue.fit = true;
2324
+        
2325
+        hue.addMouseListener(new MouseAdapter()
2326
+        {
2327
+            public void mousePressed(MouseEvent e)
2328
+            {
2329
+                int x = e.getX();
2330
+                
2331
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2332
+            }
2333
+        });
2334
+        
2335
+            huelabel.add(hue);
18582336             huelabel.preferredWidth = 20;
18592337             huepanel.add(new cGridBag()); // Label
18602338             huepanel.add(huelabel); // Field/slider
....@@ -3130,32 +3608,8 @@
31303608 
31313609         if (multiplyToggle != null)
31323610                 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
-        }
3611
+        
3612
+        AllocProjectedVertices(object);
31593613 
31603614         SetMaterial(mat, object.projectedVertices);
31613615     }
....@@ -3275,6 +3729,17 @@
32753729     public void itemStateChanged(ItemEvent event)
32763730     {
32773731         //                   System.out.println("Propagate = " + propagate);
3732
+        if (event.getSource() == pinButton)
3733
+        {
3734
+            copy.pinned ^= true;
3735
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3736
+            {
3737
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3738
+                copy.CloseUI();
3739
+                //copy.editWindow.refreshContents();
3740
+            }
3741
+        }
3742
+        else
32783743         if (event.getSource() == propagateToggle)
32793744         {
32803745             propagate ^= true;
....@@ -3454,7 +3919,7 @@
34543919             //System.out.println("ObjEditor " + event);
34553920             applySelf0(true);
34563921             //parent.applySelf();
3457
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
34583923         } else if (source == resetButton)
34593924         {
34603925             CameraPane.fullreset = true;
....@@ -3747,7 +4212,7 @@
37474212     {
37484213         //Save(true);
37494214         Replace();
3750
-        SetUndoStates();
4215
+        SetVersionStates();
37514216     }
37524217     
37534218     private boolean Equal(byte[] compress, byte[] name)
....@@ -3766,8 +4231,6 @@
37664231         return true;
37674232     }
37684233 
3769
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770
-    
37714234     void DeleteVersion()
37724235     {
37734236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -3775,19 +4238,23 @@
37754238             copy.versionlist[i] = copy.versionlist[i+1];
37764239         }
37774240         
3778
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
37794243         
3780
-        SetUndoStates();
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
4246
+        
4247
+        SetVersionStates();
37814248     }
37824249     
37834250     public boolean Save(boolean user)
37844251     {
37854252         System.err.println("Save");
3786
-        //Replace();
4253
+        Replace();
37874254         
3788
-        cRadio tab = GetCurrentTab();
4255
+        //cRadio tab = GetCurrentTab();
37894256         
3790
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4257
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37914258         
37924259         boolean thesame = false;
37934260         
....@@ -3823,7 +4290,7 @@
38234290 //            copy.versionlist[i] = null;
38244291 //        }
38254292 
3826
-        SetUndoStates();
4293
+        SetVersionStates();
38274294         
38284295         // test save
38294296         if (false)
....@@ -3881,14 +4348,14 @@
38814348 
38824349     void CopyChanged()
38834350     {
3884
-        Object3D obj = copy.versionlist[copy.versionindex];
4351
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
38854352         
3886
-        SetUndoStates();
4353
+        SetVersionStates();
38874354         
38884355         boolean temp = CameraPane.SWITCH;
38894356         CameraPane.SWITCH = false;
38904357         
3891
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
38924359         
38934360         copy.clear();
38944361         
....@@ -3900,7 +4367,7 @@
39004367             copy.add(obj.get(i));
39014368         }
39024369         
3903
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
39044371         
39054372         CameraPane.SWITCH = temp;
39064373         
....@@ -3950,22 +4417,27 @@
39504417         return count;
39514418     }
39524419     
3953
-    void SetUndoStates()
4420
+    void SetVersionStates()
39544421     {
3955
-        cRadio tab = GetCurrentTab();
4422
+        //if (true)
4423
+        //    return;
4424
+                    
4425
+        //cRadio tab = GetCurrentTab();
39564426         
3957
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4427
+        restoreButton.setEnabled(copy.versionindex != -1);
4428
+        replaceButton.setEnabled(copy.versionindex != -1);
39594429         
39604430         previousVersionButton.setEnabled(copy.versionindex > 0);
39614431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
39624432         
3963
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
39654435         
39664436         muteSlider = true;
4437
+        versionSlider.setMinimum(0);
39674438         versionSlider.setMaximum(VersionCount() - 1);
39684439         versionSlider.setInteger(copy.versionindex);
4440
+        versionSlider.setEnabled(copy.versionindex != -1);
39694441         muteSlider = false;
39704442     }
39714443     
....@@ -3976,7 +4448,7 @@
39764448         
39774449         System.err.println("Undo");
39784450         
3979
-        cRadio tab = GetCurrentTab();
4451
+        //cRadio tab = GetCurrentTab();
39804452         
39814453         if (copy.versionindex == 0)
39824454         {
....@@ -4008,7 +4480,7 @@
40084480     {
40094481         System.err.println("Restore");
40104482         
4011
-        cRadio tab = GetCurrentTab();
4483
+        //cRadio tab = GetCurrentTab();
40124484         
40134485         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40144486         {
....@@ -4024,9 +4496,9 @@
40244496 
40254497     public boolean Replace()
40264498     {
4027
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
40284500         
4029
-        cRadio tab = GetCurrentTab();
4501
+        //cRadio tab = GetCurrentTab();
40304502         
40314503         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40324504         {
....@@ -4034,7 +4506,7 @@
40344506             return false;
40354507         }
40364508 
4037
-        copy.versionlist[copy.versionindex] = CompressCopy();
4509
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
40384510         
40394511         return true;
40404512     }
....@@ -4044,7 +4516,7 @@
40444516         // Option?
40454517         Replace();
40464518         
4047
-        cRadio tab = GetCurrentTab();
4519
+        //cRadio tab = GetCurrentTab();
40484520         
40494521         if (copy.versionlist[copy.versionindex + 1] == null)
40504522         {
....@@ -4363,9 +4835,11 @@
43634835             if (muteSlider)
43644836                 return;
43654837             
4838
+            Replace();
4839
+            
43664840             int version = versionSlider.getInteger();
43674841             
4368
-            if (copy.versionlist[version] != null)
4842
+            if (version != -1 && copy.versionlist[version] != null)
43694843             {
43704844                 copy.versionindex = version;
43714845                 CopyChanged();
....@@ -4409,7 +4883,7 @@
44094883             //System.out.println("stateChanged = " + this);
44104884             materialtouched = true;
44114885             
4412
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4886
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
44134887             {
44144888                 saturationField.setFloat(1);
44154889             }
....@@ -4724,7 +5198,9 @@
47245198         }
47255199         
47265200         if (previousVersionButton != null && copy.versionlist != null)
4727
-            SetUndoStates();
5201
+            SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
47285204     }
47295205     
47305206     static TweenManager tweenManager = new TweenManager();
....@@ -4756,7 +5232,7 @@
47565232 //                group = (Composite) group.get(0);
47575233 //            }
47585234 
4759
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
47605236 
47615237         /*
47625238         if (deselect && jList != null)
....@@ -5110,11 +5586,15 @@
51105586 
51115587             copy.versionlist = readobj.versionlist;
51125588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
51135590             
51145591         if (copy.versionlist == null)
51155592         {
5593
+            // Backward compatibility
51165594             copy.versionlist = new Object3D[100];
51175595             copy.versionindex = -1;
5596
+            
5597
+            //Save(true);
51185598         }
51195599         
51205600             //? SetUndoStates();
....@@ -5206,6 +5686,8 @@
52065686 
52075687     void save()
52085688     {
5689
+        Replace();
5690
+        
52095691         if (lastname == null)
52105692         {
52115693             return;
....@@ -5448,6 +5930,7 @@
54485930     ButtonGroup buttonGroup;
54495931     
54505932     cGridBag toolboxPanel;
5933
+    cGridBag skyboxPanel;
54515934     cGridBag materialPanel;
54525935     cGridBag ctrlPanel;
54535936     
....@@ -5552,6 +6035,7 @@
55526035     cNumberSlider anisoField;
55536036     JLabel anisoVLabel;
55546037     cNumberSlider anisoVField;
6038
+    
55556039     JLabel cameraLabel;
55566040     cNumberSlider cameraField;
55576041     JLabel selfshadowLabel;
....@@ -5566,6 +6050,7 @@
55666050     cNumberSlider fakedepthField;
55676051     JLabel shadowbiasLabel;
55686052     cNumberSlider shadowbiasField;
6053
+    
55696054     JLabel bumpLabel;
55706055     cNumberSlider bumpField;
55716056     JLabel noiseLabel;