blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 ecc1309a04b527c62ffe97e814daf050dbd025cd 
 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 
....@@ -377,6 +426,9 @@
377426 
378427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
380432     void SetupMenu()
381433     {
382434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -426,6 +478,8 @@
426478         
427479         ChangeListener changeListener = new ChangeListener()
428480         {
481
+            //String name;
482
+            
429483             public void stateChanged(ChangeEvent changeEvent)
430484             {
431485 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +498,37 @@
444498 //                        EditSelection(false);
445499 //                }
446500 
447
-                refreshContents(false); // To refresh Info tab
501
+//                if (objectPanel.getSelectedIndex() == 4)
502
+//                {
503
+//                    name = copy.skyboxname;
504
+//                    
505
+//                    if (name == null)
506
+//                    {
507
+//                        name = "";
508
+//                    }
509
+//                    
510
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
511
+//                    copy.skyboxext = "jpg";
512
+//                }
513
+//                else
514
+//                {
515
+//                    if (name != null)
516
+//                    {
517
+//                        if (name.equals(""))
518
+//                        {
519
+//                            copy.skyboxname = null;
520
+//                            copy.skyboxext = null;
521
+//                        }
522
+//                        else
523
+//                        {
524
+//                            copy.skyboxname = name;
525
+//                        }
526
+//                    }
527
+//                }
528
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
529
+                
530
+//                refreshContents(false); // To refresh Info tab
531
+                cameraView.repaint();
448532             }
449533         };
450534         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +550,8 @@
466550                 
467551         toolboxPanel = new cGridBag().setVertical(true);
468552         //toolboxPanel.setName("Toolbox");
553
+        
554
+        skyboxPanel = new cGridBag().setVertical(true);
469555         
470556         materialPanel = new cGridBag().setVertical(false);
471557         //materialPanel.setName("Material");
....@@ -751,6 +837,7 @@
751837         boolean maximized;
752838     
753839         cButton fullscreenLayout;
840
+        cButton expandedLayout;
754841 
755842         void Minimize()
756843         {
....@@ -790,10 +877,12 @@
790877 	cButton minButton;
791878 	cButton maxButton;
792879 	cButton fullButton;
880
+	cButton collapseButton;
881
+        cButton maximize3DButton;
793882         
794883         void ToggleFullScreen()
795884         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
885
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797886 
798887                 cameraView.ToggleFullScreen();
799888                 
....@@ -814,13 +903,13 @@
814903 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815904 // X                   framePanel.add(bigThree);
816905 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
906
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818907                     
819908                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
909
+//                    radio.layout = keepButton;
821910                     //theFrame = null;
822911                     keepButton = null;
823
-                    radio.layout.doClick();
912
+//                    radio.layout.doClick();
824913                     
825914                 } else
826915                 {
....@@ -841,10 +930,10 @@
841930 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842931 // X                   framePanel.remove(bigThree);
843932 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
933
+//                    framePanel.setDividerLocation(0);
845934 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
935
+//                    radio.layout = fullscreenLayout;
936
+//                    radio.layout.doClick();
848937                     //frame.setVisible(true);
849938                 }
850939             frame.validate();
....@@ -852,23 +941,37 @@
852941             cameraView.requestFocusInWindow();
853942         }
854943 
855
-    private Object3D CompressCopy()
944
+        void CollapseToolbar()
945
+        {
946
+            framePanel.setDividerLocation(0);
947
+            //frame.validate();
948
+            
949
+            cameraView.requestFocusInWindow();
950
+        }
951
+        
952
+    private Object3D Duplicate(Object3D object)
856953     {
857954         boolean temp = CameraPane.SWITCH;
858955         CameraPane.SWITCH = false;
859956         
860
-        copy.ExtractBigData(versiontable);
957
+        if (Grafreed.grafreed.universe.versiontable == null)
958
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
959
+         
960
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
861961         // if (copy == client)
862962         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
963
+        Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
965
+        object.versionlist = null;
966
+        object.versiontable = null;
865967         
866968         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
969
+        Object3D compress = (Object3D)Grafreed.clone(object);
868970         
869
-        copy.versionlist = versions;
971
+        object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
870973         
871
-        copy.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872975         
873976         CameraPane.SWITCH = temp;
874977         
....@@ -1205,6 +1308,18 @@
12051308         
12061309             namePanel = new cGridBag();
12071310             
1311
+        //if (copy.pinned)
1312
+        {
1313
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1314
+            pinButton.setSelected(copy.pinned);
1315
+            cGridBag t = new cGridBag();
1316
+            t.preferredWidth = 2;
1317
+            t.add(pinButton);
1318
+            namePanel.add(t);
1319
+            
1320
+            pinButton.addItemListener(this);
1321
+        }
1322
+        
12081323         nameField = AddText(namePanel, copy.GetName());
12091324         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101325         oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1333,14 @@
12181333             
12191334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12211338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221339                 selectableCB.setToolTipText("Make object selectable");
12231340 //            Return();
12241341                 
12251342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261343                 hideCB.setToolTipText("Hide object");
1227
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
-        markCB.setToolTipText("As animation target transform");
12291344         
12301345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311346         
....@@ -1427,6 +1542,7 @@
14271542 
14281543         if (cam == null || !(copy.get(0) instanceof cGroup))
14291544         {
1545
+        if (Globals.DEBUG)
14301546             System.out.println("CREATE CAMERAS");
14311547             cams = new cTemplate();
14321548             cams.name = "Cameras";
....@@ -1552,31 +1668,34 @@
15521668 
15531669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15541670         //tmp.setName("Edit");
1671
+        objectPanel.add(toolboxPanel);
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
1674
+
15551675         objectPanel.add(materialPanel);
1556
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
-        objectPanel.setToolTipTextAt(0, "Material");
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
15581678     
1679
+        objectPanel.add(skyboxPanel);
1680
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1681
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1682
+        
15591683 //        JPanel north = new JPanel(new BorderLayout());
15601684 //        north.setName("Edit");
15611685 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621686 //        objectPanel.add(north);
15631687         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");
1688
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1689
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711690         
15721691         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1692
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751694         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
15801699         /*
15811700         aConstraints.gridx = 0;
15821701         aConstraints.gridwidth = 1;
....@@ -1613,6 +1732,11 @@
16131732 
16141733         scenePanel.add(tabbedPane);
16151734 
1735
+        //if (Globals.ADVANCED)
1736
+//            tabbedPane.add(infoPanel);
1737
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
+//        tabbedPane.setToolTipTextAt(3, "Information");
1739
+        
16161740         /*
16171741         cTree jTree = new cTree(null);
16181742         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1807,23 @@
16831807 //		aConstraints.gridheight = 1;
16841808 
16851809         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1810
+        
1811
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1812
+                new java.beans.PropertyChangeListener()
1813
+                {
1814
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1815
+                    {
1816
+                        if ((Integer)pce.getOldValue() == 1)
1817
+                        {
1818
+                            if (radio.layout != expandedLayout)
1819
+                            {
1820
+                                radio.layout = expandedLayout;
1821
+                                radio.layout.doClick();
1822
+                            }
1823
+                        }
1824
+                    }
1825
+                });
1826
+
16861827         framePanel.setContinuousLayout(false);
16871828         framePanel.setOneTouchExpandable(false);
16881829         //.setDividerLocation(0.8);
....@@ -1692,7 +1833,7 @@
16921833 
16931834         frame.getContentPane().setLayout(new BorderLayout());
16941835         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
16961837         //worldPane.add(bigPanel);
16971838         //worldPane.add(worldPanel);
16981839                 /**/
....@@ -1740,7 +1881,9 @@
17401881     void SetupMaterial(cGridBag materialpanel)
17411882     {
17421883         cGridBag presetpanel = new cGridBag().setVertical(true);
1884
+        
17431885         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1886
+        skin.setToolTipText("Skin");
17441887         skin.addMouseListener(new MouseAdapter()
17451888         {
17461889             public void mouseClicked(MouseEvent e)
....@@ -1750,7 +1893,15 @@
17501893                 
17511894                 // Skin
17521895                 colorField.setFloat(material.color);
1753
-                saturationField.setFloat(material.modulation);
1896
+                float saturation = material.modulation;
1897
+                
1898
+                if (!cameraView.Skinshader)
1899
+                {
1900
+                    saturation /= 1.5;
1901
+                }
1902
+                
1903
+                saturationField.setFloat(saturation);
1904
+                
17541905                 subsurfaceField.setFloat(material.subsurface);
17551906                 selfshadowField.setFloat(material.diffuseness);
17561907                 diffusenessField.setFloat(material.factor);
....@@ -1769,8 +1920,116 @@
17691920         });
17701921         presetpanel.add(skin);
17711922         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
1923
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1924
+        lambert.setToolTipText("Diffuse");
1925
+        lambert.addMouseListener(new MouseAdapter()
1926
+        {
1927
+            public void mouseClicked(MouseEvent e)
1928
+            {
1929
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1930
+                cMaterial material = object.material;
1931
+                
1932
+                diffusenessField.setFloat(material.factor);
1933
+                selfshadowField.setFloat(material.diffuseness);
1934
+
1935
+                materialtouched = true;
1936
+                applySelf();
1937
+            }
1938
+        });
1939
+        presetpanel.add(lambert);
1940
+        
1941
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1942
+        diffuse2.setToolTipText("Diffuse2");
1943
+        diffuse2.addMouseListener(new MouseAdapter()
1944
+        {
1945
+            public void mouseClicked(MouseEvent e)
1946
+            {
1947
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1948
+                cMaterial material = object.material;
1949
+                
1950
+                diffusenessField.setFloat(material.factor);
1951
+                selfshadowField.setFloat(material.diffuseness);
1952
+
1953
+                materialtouched = true;
1954
+                applySelf();
1955
+            }
1956
+        });
1957
+        presetpanel.add(diffuse2);
1958
+        
1959
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1960
+        diffusemoon.setToolTipText("Moon");
1961
+        diffusemoon.addMouseListener(new MouseAdapter()
1962
+        {
1963
+            public void mouseClicked(MouseEvent e)
1964
+            {
1965
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1966
+                cMaterial material = object.material;
1967
+                
1968
+                diffusenessField.setFloat(material.factor);
1969
+                selfshadowField.setFloat(material.diffuseness);
1970
+
1971
+                materialtouched = true;
1972
+                applySelf();
1973
+            }
1974
+        });
1975
+        presetpanel.add(diffusemoon);
1976
+        
1977
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1978
+        diffusemoon2.setToolTipText("Moon2");
1979
+        diffusemoon2.addMouseListener(new MouseAdapter()
1980
+        {
1981
+            public void mouseClicked(MouseEvent e)
1982
+            {
1983
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1984
+                cMaterial material = object.material;
1985
+                
1986
+                diffusenessField.setFloat(material.factor);
1987
+                selfshadowField.setFloat(material.diffuseness);
1988
+
1989
+                materialtouched = true;
1990
+                applySelf();
1991
+            }
1992
+        });
1993
+        presetpanel.add(diffusemoon2);
1994
+        
1995
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1996
+        diffusemoon3.setToolTipText("Moon3");
1997
+        diffusemoon3.addMouseListener(new MouseAdapter()
1998
+        {
1999
+            public void mouseClicked(MouseEvent e)
2000
+            {
2001
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
2002
+                cMaterial material = object.material;
2003
+                
2004
+                diffusenessField.setFloat(material.factor);
2005
+                selfshadowField.setFloat(material.diffuseness);
2006
+
2007
+                materialtouched = true;
2008
+                applySelf();
2009
+            }
2010
+        });
2011
+        presetpanel.add(diffusemoon3);
2012
+        
2013
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2014
+        diffusesheen.setToolTipText("Sheen");
2015
+        diffusesheen.addMouseListener(new MouseAdapter()
2016
+        {
2017
+            public void mouseClicked(MouseEvent e)
2018
+            {
2019
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
2020
+                cMaterial material = object.material;
2021
+                
2022
+                sheenField.setFloat(material.sheen);
2023
+
2024
+                materialtouched = true;
2025
+                applySelf();
2026
+            }
2027
+        });
2028
+        presetpanel.add(diffusesheen);
2029
+        
2030
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2031
+        rough.setToolTipText("Rough metal");
2032
+        rough.addMouseListener(new MouseAdapter()
17742033         {
17752034             public void mouseClicked(MouseEvent e)
17762035             {
....@@ -1784,31 +2043,254 @@
17842043                 applySelf();
17852044             }
17862045         });
2046
+        presetpanel.add(rough);
2047
+        
2048
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2049
+        rough2.setToolTipText("Medium metal");
2050
+        rough2.addMouseListener(new MouseAdapter()
2051
+        {
2052
+            public void mouseClicked(MouseEvent e)
2053
+            {
2054
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
2055
+                cMaterial material = object.material;
2056
+                
2057
+                shininessField.setFloat(material.shininess);
2058
+                lightareaField.setFloat(material.lightarea);
2059
+
2060
+                materialtouched = true;
2061
+                applySelf();
2062
+            }
2063
+        });
17872064         presetpanel.add(rough2);
17882065         
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));
2066
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2067
+        shini0.setToolTipText("Shiny");
2068
+        shini0.addMouseListener(new MouseAdapter()
2069
+        {
2070
+            public void mouseClicked(MouseEvent e)
2071
+            {
2072
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
2073
+                cMaterial material = object.material;
2074
+                
2075
+                shininessField.setFloat(material.shininess);
2076
+                lightareaField.setFloat(material.lightarea);
2077
+
2078
+                materialtouched = true;
2079
+                applySelf();
2080
+            }
2081
+        });
2082
+        presetpanel.add(shini0);
2083
+        
2084
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2085
+        shini1.setToolTipText("Shiny2");
2086
+        shini1.addMouseListener(new MouseAdapter()
2087
+        {
2088
+            public void mouseClicked(MouseEvent e)
2089
+            {
2090
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
2091
+                cMaterial material = object.material;
2092
+                
2093
+                shininessField.setFloat(material.shininess);
2094
+                lightareaField.setFloat(material.lightarea);
2095
+
2096
+                materialtouched = true;
2097
+                applySelf();
2098
+            }
2099
+        });
2100
+        presetpanel.add(shini1);
2101
+        
2102
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2103
+        shini2.setToolTipText("Shiny3");
2104
+        shini2.addMouseListener(new MouseAdapter()
2105
+        {
2106
+            public void mouseClicked(MouseEvent e)
2107
+            {
2108
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
2109
+                cMaterial material = object.material;
2110
+                
2111
+                shininessField.setFloat(material.shininess);
2112
+                lightareaField.setFloat(material.lightarea);
2113
+
2114
+                materialtouched = true;
2115
+                applySelf();
2116
+            }
2117
+        });
2118
+        presetpanel.add(shini2);
2119
+        
2120
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2121
+        aniso.setToolTipText("AnisoU");
2122
+        aniso.addMouseListener(new MouseAdapter()
2123
+        {
2124
+            public void mouseClicked(MouseEvent e)
2125
+            {
2126
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
2127
+                cMaterial material = object.material;
2128
+                
2129
+                anisoField.setFloat(material.aniso);
2130
+                anisoVField.setFloat(material.anisoV);
2131
+
2132
+                materialtouched = true;
2133
+                applySelf();
2134
+            }
2135
+        });
2136
+        presetpanel.add(aniso);
2137
+        
2138
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2139
+        aniso2.setToolTipText("AnisoV");
2140
+        aniso2.addMouseListener(new MouseAdapter()
2141
+        {
2142
+            public void mouseClicked(MouseEvent e)
2143
+            {
2144
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
2145
+                cMaterial material = object.material;
2146
+                
2147
+                anisoField.setFloat(material.aniso);
2148
+                anisoVField.setFloat(material.anisoV);
2149
+
2150
+                materialtouched = true;
2151
+                applySelf();
2152
+            }
2153
+        });
2154
+        presetpanel.add(aniso2);
2155
+        
2156
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2157
+        aniso3.setToolTipText("AnisoUV");
2158
+        aniso3.addMouseListener(new MouseAdapter()
2159
+        {
2160
+            public void mouseClicked(MouseEvent e)
2161
+            {
2162
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2163
+                cMaterial material = object.material;
2164
+                
2165
+                anisoField.setFloat(material.aniso);
2166
+                anisoVField.setFloat(material.anisoV);
2167
+
2168
+                materialtouched = true;
2169
+                applySelf();
2170
+            }
2171
+        });
2172
+        presetpanel.add(aniso3);
2173
+        
2174
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2175
+        velvet0.setToolTipText("Velvet");
2176
+        velvet0.addMouseListener(new MouseAdapter()
2177
+        {
2178
+            public void mouseClicked(MouseEvent e)
2179
+            {
2180
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2181
+                cMaterial material = object.material;
2182
+                
2183
+                diffusenessField.setFloat(material.factor);
2184
+                selfshadowField.setFloat(material.diffuseness);
2185
+                sheenField.setFloat(material.sheen);
2186
+                shininessField.setFloat(material.shininess);
2187
+                velvetField.setFloat(material.velvet);
2188
+                shiftField.setFloat(material.shift);
2189
+
2190
+                materialtouched = true;
2191
+                applySelf();
2192
+            }
2193
+        });
2194
+        presetpanel.add(velvet0);
2195
+        
2196
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2197
+        bump0.setToolTipText("Bump texture");
2198
+        bump0.addMouseListener(new MouseAdapter()
2199
+        {
2200
+            public void mouseClicked(MouseEvent e)
2201
+            {
2202
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2203
+                cMaterial material = object.material;
2204
+                
2205
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2206
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2207
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2208
+
2209
+                materialtouched = true;
2210
+                applySelf();
2211
+            }
2212
+        });
2213
+        presetpanel.add(bump0);
2214
+        
2215
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2216
+        borderShader.setToolTipText("Border fade");
2217
+        borderShader.addMouseListener(new MouseAdapter()
2218
+        {
2219
+            public void mouseClicked(MouseEvent e)
2220
+            {
2221
+                borderfadeField.setFloat(0.5);
2222
+                opacityField.setFloat(0.75);
2223
+
2224
+                materialtouched = true;
2225
+                applySelf();
2226
+            }
2227
+        });
2228
+        presetpanel.add(borderShader);
2229
+        
2230
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2231
+        halo.setToolTipText("Halo");
2232
+        halo.addMouseListener(new MouseAdapter()
2233
+        {
2234
+            public void mouseClicked(MouseEvent e)
2235
+            {
2236
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2237
+                cMaterial material = object.material;
2238
+                
2239
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2240
+
2241
+                materialtouched = true;
2242
+                applySelf();
2243
+            }
2244
+        });
2245
+        presetpanel.add(halo);
2246
+        
2247
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2248
+        candle.setToolTipText("Candle");
2249
+        candle.addMouseListener(new MouseAdapter()
2250
+        {
2251
+            public void mouseClicked(MouseEvent e)
2252
+            {
2253
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2254
+                cMaterial material = object.material;
2255
+                
2256
+                subsurfaceField.setFloat(material.subsurface);
2257
+                shadowbiasField.setFloat(material.shadowbias);
2258
+                ambientField.setFloat(material.ambient);
2259
+                specularField.setFloat(material.specular);
2260
+                lightareaField.setFloat(material.lightarea);
2261
+                shininessField.setFloat(material.shininess);
2262
+
2263
+                materialtouched = true;
2264
+                applySelf();
2265
+            }
2266
+        });
2267
+        presetpanel.add(candle);
2268
+        
2269
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2270
+        shadowShader.setToolTipText("Shadow");
2271
+        shadowShader.addMouseListener(new MouseAdapter()
2272
+        {
2273
+            public void mouseClicked(MouseEvent e)
2274
+            {
2275
+                diffuseField.setFloat(0.001);
2276
+                ambientField.setFloat(0.001);
2277
+                cameraField.setFloat(0.001);
2278
+                specularField.setFloat(0.001);
2279
+                fakedepthField.setFloat(0.001);
2280
+                opacityField.setFloat(0.6);
2281
+
2282
+                materialtouched = true;
2283
+                applySelf();
2284
+            }
2285
+        });
2286
+        presetpanel.add(shadowShader);
18052287         
18062288         cGridBag panel = new cGridBag().setVertical(true);
18072289         
18082290         presetpanel.preferredWidth = 1;
18092291         
1810
-        materialpanel.add(panel);
18112292         materialpanel.add(presetpanel);
2293
+        materialpanel.add(panel);
18122294         
18132295         panel.preferredWidth = 8;
18142296         
....@@ -1852,9 +2334,20 @@
18522334 
18532335         cGridBag huepanel = new cGridBag();
18542336             cGridBag huelabel = new cGridBag();
1855
-        skin = GetLabel("icons/hue.png", false);
1856
-        skin.fit = true;
1857
-            huelabel.add(skin);
2337
+        cLabel hue = GetLabel("icons/hue.png", false);
2338
+        hue.fit = true;
2339
+        
2340
+        hue.addMouseListener(new MouseAdapter()
2341
+        {
2342
+            public void mousePressed(MouseEvent e)
2343
+            {
2344
+                int x = e.getX();
2345
+                
2346
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2347
+            }
2348
+        });
2349
+        
2350
+            huelabel.add(hue);
18582351             huelabel.preferredWidth = 20;
18592352             huepanel.add(new cGridBag()); // Label
18602353             huepanel.add(huelabel); // Field/slider
....@@ -3130,32 +3623,8 @@
31303623 
31313624         if (multiplyToggle != null)
31323625                 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
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
31593628 
31603629         SetMaterial(mat, object.projectedVertices);
31613630     }
....@@ -3275,6 +3744,17 @@
32753744     public void itemStateChanged(ItemEvent event)
32763745     {
32773746         //                   System.out.println("Propagate = " + propagate);
3747
+        if (event.getSource() == pinButton)
3748
+        {
3749
+            copy.pinned ^= true;
3750
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3751
+            {
3752
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3753
+                copy.CloseUI();
3754
+                //copy.editWindow.refreshContents();
3755
+            }
3756
+        }
3757
+        else
32783758         if (event.getSource() == propagateToggle)
32793759         {
32803760             propagate ^= true;
....@@ -3454,7 +3934,7 @@
34543934             //System.out.println("ObjEditor " + event);
34553935             applySelf0(true);
34563936             //parent.applySelf();
3457
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
34583938         } else if (source == resetButton)
34593939         {
34603940             CameraPane.fullreset = true;
....@@ -3747,7 +4227,7 @@
37474227     {
37484228         //Save(true);
37494229         Replace();
3750
-        SetUndoStates();
4230
+        SetVersionStates();
37514231     }
37524232     
37534233     private boolean Equal(byte[] compress, byte[] name)
....@@ -3766,8 +4246,6 @@
37664246         return true;
37674247     }
37684248 
3769
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770
-    
37714249     void DeleteVersion()
37724250     {
37734251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -3775,19 +4253,23 @@
37754253             copy.versionlist[i] = copy.versionlist[i+1];
37764254         }
37774255         
3778
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
37794258         
3780
-        SetUndoStates();
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
4261
+        
4262
+        SetVersionStates();
37814263     }
37824264     
37834265     public boolean Save(boolean user)
37844266     {
37854267         System.err.println("Save");
3786
-        //Replace();
4268
+        Replace();
37874269         
3788
-        cRadio tab = GetCurrentTab();
4270
+        //cRadio tab = GetCurrentTab();
37894271         
3790
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4272
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37914273         
37924274         boolean thesame = false;
37934275         
....@@ -3823,7 +4305,7 @@
38234305 //            copy.versionlist[i] = null;
38244306 //        }
38254307 
3826
-        SetUndoStates();
4308
+        SetVersionStates();
38274309         
38284310         // test save
38294311         if (false)
....@@ -3881,14 +4363,14 @@
38814363 
38824364     void CopyChanged()
38834365     {
3884
-        Object3D obj = copy.versionlist[copy.versionindex];
4366
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
38854367         
3886
-        SetUndoStates();
4368
+        SetVersionStates();
38874369         
38884370         boolean temp = CameraPane.SWITCH;
38894371         CameraPane.SWITCH = false;
38904372         
3891
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
38924374         
38934375         copy.clear();
38944376         
....@@ -3900,7 +4382,7 @@
39004382             copy.add(obj.get(i));
39014383         }
39024384         
3903
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
39044386         
39054387         CameraPane.SWITCH = temp;
39064388         
....@@ -3950,22 +4432,27 @@
39504432         return count;
39514433     }
39524434     
3953
-    void SetUndoStates()
4435
+    void SetVersionStates()
39544436     {
3955
-        cRadio tab = GetCurrentTab();
4437
+        //if (true)
4438
+        //    return;
4439
+                    
4440
+        //cRadio tab = GetCurrentTab();
39564441         
3957
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4442
+        restoreButton.setEnabled(copy.versionindex != -1);
4443
+        replaceButton.setEnabled(copy.versionindex != -1);
39594444         
39604445         previousVersionButton.setEnabled(copy.versionindex > 0);
39614446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
39624447         
3963
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
39654450         
39664451         muteSlider = true;
4452
+        versionSlider.setMinimum(0);
39674453         versionSlider.setMaximum(VersionCount() - 1);
39684454         versionSlider.setInteger(copy.versionindex);
4455
+        versionSlider.setEnabled(copy.versionindex != -1);
39694456         muteSlider = false;
39704457     }
39714458     
....@@ -3976,7 +4463,7 @@
39764463         
39774464         System.err.println("Undo");
39784465         
3979
-        cRadio tab = GetCurrentTab();
4466
+        //cRadio tab = GetCurrentTab();
39804467         
39814468         if (copy.versionindex == 0)
39824469         {
....@@ -4008,7 +4495,7 @@
40084495     {
40094496         System.err.println("Restore");
40104497         
4011
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
40124499         
40134500         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40144501         {
....@@ -4024,9 +4511,9 @@
40244511 
40254512     public boolean Replace()
40264513     {
4027
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
40284515         
4029
-        cRadio tab = GetCurrentTab();
4516
+        //cRadio tab = GetCurrentTab();
40304517         
40314518         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40324519         {
....@@ -4034,7 +4521,7 @@
40344521             return false;
40354522         }
40364523 
4037
-        copy.versionlist[copy.versionindex] = CompressCopy();
4524
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
40384525         
40394526         return true;
40404527     }
....@@ -4044,7 +4531,7 @@
40444531         // Option?
40454532         Replace();
40464533         
4047
-        cRadio tab = GetCurrentTab();
4534
+        //cRadio tab = GetCurrentTab();
40484535         
40494536         if (copy.versionlist[copy.versionindex + 1] == null)
40504537         {
....@@ -4363,9 +4850,11 @@
43634850             if (muteSlider)
43644851                 return;
43654852             
4853
+            Replace();
4854
+            
43664855             int version = versionSlider.getInteger();
43674856             
4368
-            if (copy.versionlist[version] != null)
4857
+            if (version != -1 && copy.versionlist[version] != null)
43694858             {
43704859                 copy.versionindex = version;
43714860                 CopyChanged();
....@@ -4409,7 +4898,7 @@
44094898             //System.out.println("stateChanged = " + this);
44104899             materialtouched = true;
44114900             
4412
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4901
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
44134902             {
44144903                 saturationField.setFloat(1);
44154904             }
....@@ -4724,7 +5213,9 @@
47245213         }
47255214         
47265215         if (previousVersionButton != null && copy.versionlist != null)
4727
-            SetUndoStates();
5216
+            SetVersionStates();
5217
+        
5218
+        cameraView.requestFocusInWindow();
47285219     }
47295220     
47305221     static TweenManager tweenManager = new TweenManager();
....@@ -4756,7 +5247,7 @@
47565247 //                group = (Composite) group.get(0);
47575248 //            }
47585249 
4759
-        System.out.println("makeSomething of " + thing);
5250
+        //System.out.println("makeSomething of " + thing);
47605251 
47615252         /*
47625253         if (deselect && jList != null)
....@@ -5110,11 +5601,15 @@
51105601 
51115602             copy.versionlist = readobj.versionlist;
51125603             copy.versionindex = readobj.versionindex;
5604
+            copy.versiontable = readobj.versiontable;
51135605             
51145606         if (copy.versionlist == null)
51155607         {
5608
+            // Backward compatibility
51165609             copy.versionlist = new Object3D[100];
51175610             copy.versionindex = -1;
5611
+            
5612
+            //Save(true);
51185613         }
51195614         
51205615             //? SetUndoStates();
....@@ -5206,6 +5701,8 @@
52065701 
52075702     void save()
52085703     {
5704
+        Replace();
5705
+        
52095706         if (lastname == null)
52105707         {
52115708             return;
....@@ -5448,6 +5945,7 @@
54485945     ButtonGroup buttonGroup;
54495946     
54505947     cGridBag toolboxPanel;
5948
+    cGridBag skyboxPanel;
54515949     cGridBag materialPanel;
54525950     cGridBag ctrlPanel;
54535951     
....@@ -5552,6 +6050,7 @@
55526050     cNumberSlider anisoField;
55536051     JLabel anisoVLabel;
55546052     cNumberSlider anisoVField;
6053
+    
55556054     JLabel cameraLabel;
55566055     cNumberSlider cameraField;
55576056     JLabel selfshadowLabel;
....@@ -5566,6 +6065,7 @@
55666065     cNumberSlider fakedepthField;
55676066     JLabel shadowbiasLabel;
55686067     cNumberSlider shadowbiasField;
6068
+    
55696069     JLabel bumpLabel;
55706070     cNumberSlider bumpField;
55716071     JLabel noiseLabel;