blame | history | patch | commit | commitdiff
Normand Briere
2019-08-18 480ad70047e54b2b92f974e6c2ac5a6c0bdc5a5c 
 ObjEditor.java
....@@ -43,6 +43,50 @@
4343     
4444     static ObjEditor theFrame;
4545 
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
+    }
74
+
75
+    public Composite CreateCameras()
76
+    {
77
+        Composite cams = new cTemplate();
78
+        cams.name = "Cameras";
79
+        copy.insertElementAt(cams, 0);
80
+
81
+        cams.addChild(new Camera());
82
+        cams.addChild(new Camera(1));
83
+        cams.addChild(new Camera(2));
84
+        cams.addChild(new Camera(3));
85
+        cams.addChild(new Camera(4));
86
+        
87
+        return cams;
88
+    }
89
+
4690     public cGridBag GetSeparator()
4791     {
4892         cGridBag separator = new cGridBag();
....@@ -54,7 +98,10 @@
5498     cButton GetButton(String name, boolean border)
5599     {
56100         ImageIcon icon = GetIcon(name);
57
-        return new cButton(icon, border);
101
+        if (icon != null || name.contains("/"))
102
+            return new cButton(icon, border);
103
+        else
104
+            return new cButton(name, border);
58105     }
59106 
60107     cLabel GetLabel(String name, boolean border)
....@@ -77,7 +124,7 @@
77124 
78125     static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79126     
80
-    ImageIcon GetIcon(String name)
127
+    static ImageIcon GetIcon(String name)
81128     {
82129         javax.swing.ImageIcon iconCache = icons.get(name);
83130         if (iconCache != null)
....@@ -87,7 +134,7 @@
87134         
88135         try
89136         {
90
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
137
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
91138 
92139 //            if (image.getWidth() > 48 && image.getHeight() > 48)
93140 //            {
....@@ -359,7 +406,8 @@
359406         //parent = p;
360407 
361408         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
409
+        if (Globals.DEBUG)
410
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363411         //gd.setFullScreenWindow(this);
364412         //setResizable(false);
365413         //if (!isDisplayable())
....@@ -396,6 +444,9 @@
396444 
397445     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398446 
447
+    // This is to refresh the UI of the material panel.
448
+    boolean patchMaterial;
449
+    
399450     void SetupMenu()
400451     {
401452         frame.setMenuBar(menuBar = new MenuBar());
....@@ -921,18 +972,29 @@
921972         boolean temp = CameraPane.SWITCH;
922973         CameraPane.SWITCH = false;
923974         
924
-        object.ExtractBigData(versiontable);
975
+        if (Grafreed.grafreed.universe.versiontable == null)
976
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
977
+         
978
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
925979         // if (copy == client)
926980         
927981         Object3D versions[] = object.versionlist;
982
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928983         object.versionlist = null;
984
+        object.versiontable = null;
985
+        
986
+        Object3D parent = object.parent;
987
+        object.parent = null;
929988         
930989         //byte[] compress = Compress(copy);
931990         Object3D compress = (Object3D)Grafreed.clone(object);
932991         
933
-        object.versionlist = versions;
992
+        object.parent = parent;
934993         
935
-        object.RestoreBigData(versiontable);
994
+        object.versionlist = versions;
995
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
996
+        
997
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936998         
937999         CameraPane.SWITCH = temp;
9381000         
....@@ -1271,7 +1333,7 @@
12711333             
12721334         //if (copy.pinned)
12731335         {
1274
-            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1336
+            pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
12751337             pinButton.setSelected(copy.pinned);
12761338             cGridBag t = new cGridBag();
12771339             t.preferredWidth = 2;
....@@ -1294,14 +1356,14 @@
12941356             
12951357         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12961358                 liveCB.setToolTipText("Animate object");
1359
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1360
+        markCB.setToolTipText("Set target transform");
12971361         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12981362                 selectableCB.setToolTipText("Make object selectable");
12991363 //            Return();
13001364                 
13011365         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
13021366                 hideCB.setToolTipText("Hide object");
1303
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
-        markCB.setToolTipText("As animation target transform");
13051367         
13061368         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
13071369         
....@@ -1503,22 +1565,9 @@
15031565 
15041566         if (cam == null || !(copy.get(0) instanceof cGroup))
15051567         {
1506
-            System.out.println("CREATE CAMERAS");
1507
-            cams = new cTemplate();
1508
-            cams.name = "Cameras";
1509
-            copy.insertElementAt(cams, 0);
1510
-            //cams.parent = copy;
1511
-
1512
-            cam = new Camera(); // LA.newVector(3, 2, 1));
1513
-            cams.addChild(cam);
1514
-            cam = new Camera(1);
1515
-            cams.addChild(cam);
1516
-            cam = new Camera(2);
1517
-            cams.addChild(cam);
1518
-            cam = new Camera(3);
1519
-            cams.addChild(cam);
1520
-            cam = new Camera(4); // Light
1521
-            cams.addChild(cam);
1568
+            if (Globals.DEBUG)
1569
+                System.out.println("CREATE CAMERAS");
1570
+            cams = CreateCameras();
15221571         } else
15231572         {
15241573             cams = (cGroup) copy.get(0);
....@@ -1584,6 +1633,45 @@
15841633         //frontView.object = copy;
15851634         //sideView.object = copy;
15861635 
1636
+        transformPanel = new cGridBag().setVertical(true);
1637
+        
1638
+        cGridBag resetTransformPanel = new cGridBag();
1639
+        
1640
+        resetTransformPanel.preferredHeight = 2;
1641
+        
1642
+        cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1643
+        resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1644
+        resetTransform.addMouseListener(new MouseAdapter()
1645
+        {
1646
+            public void mouseClicked(MouseEvent e)
1647
+            {
1648
+                ResetTransform();
1649
+            }
1650
+        });
1651
+        resetTransformPanel.add(resetTransform);
1652
+        
1653
+        resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1654
+        resetTransform.setToolTipText("Reset Translation only");
1655
+        resetTransform.addMouseListener(new MouseAdapter()
1656
+        {
1657
+            public void mouseClicked(MouseEvent e)
1658
+            {
1659
+                ResetTransform(1);
1660
+            }
1661
+        });
1662
+        resetTransformPanel.add(resetTransform);
1663
+        
1664
+        resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1665
+        resetTransform.setToolTipText("Reset Rotation and Scale only");
1666
+        resetTransform.addMouseListener(new MouseAdapter()
1667
+        {
1668
+            public void mouseClicked(MouseEvent e)
1669
+            {
1670
+                ResetTransform(2);
1671
+            }
1672
+        });
1673
+        resetTransformPanel.add(resetTransform);
1674
+        
15871675         XYZPanel = new cGridBag().setVertical(true);
15881676         //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15891677 
....@@ -1593,6 +1681,9 @@
15931681         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15941682         //XYZPanel.setName("XYZ");
15951683 
1684
+        transformPanel.add(resetTransformPanel);
1685
+        transformPanel.add(XYZPanel);
1686
+        
15961687         /*
15971688         gridPanel = new JPanel(); //new BorderLayout());
15981689         gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1600,12 +1691,12 @@
16001691         gridPanel.add(cameraView);
16011692         gridPanel.add(XYZPanel);
16021693          */
1603
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1604
-        gridPanel.setContinuousLayout(true);
1605
-        gridPanel.setOneTouchExpandable(true);
1606
-        gridPanel.setDividerLocation(1.0);
1607
-        gridPanel.setDividerSize(9);
1608
-        gridPanel.setResizeWeight(0.85);
1694
+//        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1695
+//        gridPanel.setContinuousLayout(true);
1696
+//        gridPanel.setOneTouchExpandable(true);
1697
+//        gridPanel.setDividerLocation(1.0);
1698
+//        gridPanel.setDividerSize(9);
1699
+//        gridPanel.setResizeWeight(0.85);
16091700 
16101701 //                aConstraints.weighty = 0;
16111702         //System.out.println("THIS = " + this);
....@@ -1628,30 +1719,34 @@
16281719 
16291720         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16301721         //tmp.setName("Edit");
1631
-        objectPanel.add(materialPanel);
1632
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633
-        objectPanel.setToolTipTextAt(0, "Material");
1634
-    
1722
+        objectPanel.add(skyboxPanel);
1723
+        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1724
+        objectPanel.setToolTipTextAt(0, "Backgrounds");
1725
+        
16351726         objectPanel.add(toolboxPanel);
16361727         objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
16371728         objectPanel.setToolTipTextAt(1, "Objects & textures");
16381729 
1639
-        objectPanel.add(skyboxPanel);
1640
-        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641
-        objectPanel.setToolTipTextAt(2, "Backgrounds");
1642
-        
1730
+        objectPanel.add(materialPanel);
1731
+        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1732
+        objectPanel.setToolTipTextAt(2, "Material");
1733
+    
16431734 //        JPanel north = new JPanel(new BorderLayout());
16441735 //        north.setName("Edit");
16451736 //        north.add(ctrlPanel, BorderLayout.NORTH);
16461737 //        objectPanel.add(north);
16471738         objectPanel.add(editPanel);
1648
-        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1739
+        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
16491740         objectPanel.setToolTipTextAt(3, "Edit controls");
16501741         
1651
-        objectPanel.add(XYZPanel);
1742
+        objectPanel.add(transformPanel);
16521743         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653
-        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1744
+        objectPanel.setToolTipTextAt(4, "TRS transform");
16541745         
1746
+        patchMaterial = true;
1747
+        cameraView.patchMaterial = this;
1748
+        objectPanel.setSelectedIndex(2);
1749
+                
16551750         /*
16561751         aConstraints.gridx = 0;
16571752         aConstraints.gridwidth = 1;
....@@ -1671,7 +1766,7 @@
16711766         scrollpane.addMouseWheelListener(this); // Default not fast enough
16721767 
16731768         /*JTabbedPane*/ scenePanel = new cGridBag();
1674
-        scenePanel.preferredWidth = 5;
1769
+        scenePanel.preferredWidth = 6;
16751770         
16761771         JTabbedPane tabbedPane = new JTabbedPane();
16771772         tabbedPane.add(scrollpane);
....@@ -1682,17 +1777,52 @@
16821777         
16831778         AddOptions(optionsPanel); //, aConstraints);
16841779         
1685
-        tabbedPane.add(optionsPanel);
1686
-        
16871780         tabbedPane.add(FSPane = new cFileSystemPane(this));
16881781 
1782
+        tabbedPane.add(optionsPanel);
1783
+        
16891784         scenePanel.add(tabbedPane);
16901785 
1691
-        //if (Globals.ADVANCED)
1692
-//            tabbedPane.add(infoPanel);
1693
-//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
-//        tabbedPane.setToolTipTextAt(3, "Information");
1786
+        cGridBag creditsPanel = new cGridBag().setVertical(true);
1787
+        creditsPanel.setName("Credits");
16951788         
1789
+        cLabel ogaLabel = new cLabel("   Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1790
+	creditsPanel.add(ogaLabel);
1791
+        
1792
+        cButton opengameartButton;
1793
+	creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1794
+        opengameartButton.setToolTipText("https://opengameart.org");
1795
+        
1796
+        opengameartButton.addMouseListener(new MouseAdapter()
1797
+        {
1798
+            public void mouseClicked(MouseEvent e)
1799
+            {
1800
+                try
1801
+                {
1802
+                    Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1803
+                } catch (Exception e1)
1804
+//                } catch (java.io.IOException | java.net.URISyntaxException e1)
1805
+                {
1806
+                    e1.printStackTrace();
1807
+                }
1808
+            }
1809
+        });
1810
+        
1811
+        for (int i=10; --i>=0;)
1812
+        {
1813
+            creditsPanel.add(new cGridBag());
1814
+        }
1815
+        
1816
+        tabbedPane.add(creditsPanel);
1817
+        tabbedPane.setToolTipTextAt(3, "Credits");
1818
+        
1819
+        if (Globals.ADVANCED)
1820
+        {
1821
+            tabbedPane.add(infoPanel);
1822
+            tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1823
+            tabbedPane.setToolTipTextAt(4, "Information");
1824
+        }
1825
+
16961826         /*
16971827         cTree jTree = new cTree(null);
16981828         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1713,13 +1843,13 @@
17131843         jtp.add(tree);
17141844          */
17151845 
1716
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1717
-        bigPanel.setContinuousLayout(true);
1718
-        bigPanel.setOneTouchExpandable(true);
1719
-        bigPanel.setDividerLocation(0.8);
1720
-        bigPanel.setDividerSize(15);
1721
-        bigPanel.setResizeWeight(0.15);
1722
-        bigPanel.setName("Scene");
1846
+//        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1847
+//        bigPanel.setContinuousLayout(true);
1848
+//        bigPanel.setOneTouchExpandable(true);
1849
+//        bigPanel.setDividerLocation(0.8);
1850
+//        bigPanel.setDividerSize(15);
1851
+//        bigPanel.setResizeWeight(0.15);
1852
+//        bigPanel.setName("Scene");
17231853 
17241854         //bigPanel.setLayout(new BorderLayout());
17251855         //bigPanel.setSize(new Dimension(10,10));
....@@ -1789,7 +1919,7 @@
17891919 
17901920         frame.getContentPane().setLayout(new BorderLayout());
17911921         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1922
+        //JTabbedPane worldPane = new JTabbedPane();
17931923         //worldPane.add(bigPanel);
17941924         //worldPane.add(worldPanel);
17951925                 /**/
....@@ -1803,7 +1933,7 @@
18031933         
18041934                     cameraView.requestFocusInWindow();
18051935                     
1806
-        gridPanel.setDividerLocation(1.0);
1936
+//        gridPanel.setDividerLocation(1.0);
18071937         
18081938         frame.validate();
18091939 
....@@ -1838,7 +1968,7 @@
18381968     {
18391969         cGridBag presetpanel = new cGridBag().setVertical(true);
18401970         
1841
-        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1971
+        cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
18421972         skin.setToolTipText("Skin");
18431973         skin.addMouseListener(new MouseAdapter()
18441974         {
....@@ -1849,7 +1979,15 @@
18491979                 
18501980                 // Skin
18511981                 colorField.setFloat(material.color);
1852
-                saturationField.setFloat(material.modulation);
1982
+                float saturation = material.modulation;
1983
+                
1984
+                if (!cameraView.Skinshader)
1985
+                {
1986
+                    saturation /= 1.5;
1987
+                }
1988
+                
1989
+                saturationField.setFloat(saturation);
1990
+                
18531991                 subsurfaceField.setFloat(material.subsurface);
18541992                 selfshadowField.setFloat(material.diffuseness);
18551993                 diffusenessField.setFloat(material.factor);
....@@ -1868,7 +2006,7 @@
18682006         });
18692007         presetpanel.add(skin);
18702008         
1871
-        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2009
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
18722010         lambert.setToolTipText("Diffuse");
18732011         lambert.addMouseListener(new MouseAdapter()
18742012         {
....@@ -1886,7 +2024,7 @@
18862024         });
18872025         presetpanel.add(lambert);
18882026         
1889
-        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2027
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
18902028         diffuse2.setToolTipText("Diffuse2");
18912029         diffuse2.addMouseListener(new MouseAdapter()
18922030         {
....@@ -1904,7 +2042,7 @@
19042042         });
19052043         presetpanel.add(diffuse2);
19062044         
1907
-        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2045
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
19082046         diffusemoon.setToolTipText("Moon");
19092047         diffusemoon.addMouseListener(new MouseAdapter()
19102048         {
....@@ -1922,7 +2060,7 @@
19222060         });
19232061         presetpanel.add(diffusemoon);
19242062         
1925
-        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2063
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
19262064         diffusemoon2.setToolTipText("Moon2");
19272065         diffusemoon2.addMouseListener(new MouseAdapter()
19282066         {
....@@ -1940,7 +2078,7 @@
19402078         });
19412079         presetpanel.add(diffusemoon2);
19422080         
1943
-        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2081
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
19442082         diffusemoon3.setToolTipText("Moon3");
19452083         diffusemoon3.addMouseListener(new MouseAdapter()
19462084         {
....@@ -1958,7 +2096,7 @@
19582096         });
19592097         presetpanel.add(diffusemoon3);
19602098         
1961
-        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2099
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
19622100         diffusesheen.setToolTipText("Sheen");
19632101         diffusesheen.addMouseListener(new MouseAdapter()
19642102         {
....@@ -1975,7 +2113,7 @@
19752113         });
19762114         presetpanel.add(diffusesheen);
19772115         
1978
-        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2116
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
19792117         rough.setToolTipText("Rough metal");
19802118         rough.addMouseListener(new MouseAdapter()
19812119         {
....@@ -1993,7 +2131,7 @@
19932131         });
19942132         presetpanel.add(rough);
19952133         
1996
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2134
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
19972135         rough2.setToolTipText("Medium metal");
19982136         rough2.addMouseListener(new MouseAdapter()
19992137         {
....@@ -2011,7 +2149,7 @@
20112149         });
20122150         presetpanel.add(rough2);
20132151         
2014
-        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2152
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
20152153         shini0.setToolTipText("Shiny");
20162154         shini0.addMouseListener(new MouseAdapter()
20172155         {
....@@ -2029,7 +2167,7 @@
20292167         });
20302168         presetpanel.add(shini0);
20312169         
2032
-        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2170
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
20332171         shini1.setToolTipText("Shiny2");
20342172         shini1.addMouseListener(new MouseAdapter()
20352173         {
....@@ -2047,7 +2185,7 @@
20472185         });
20482186         presetpanel.add(shini1);
20492187         
2050
-        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2188
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
20512189         shini2.setToolTipText("Shiny3");
20522190         shini2.addMouseListener(new MouseAdapter()
20532191         {
....@@ -2065,7 +2203,7 @@
20652203         });
20662204         presetpanel.add(shini2);
20672205         
2068
-        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2206
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
20692207         aniso.setToolTipText("AnisoU");
20702208         aniso.addMouseListener(new MouseAdapter()
20712209         {
....@@ -2083,7 +2221,7 @@
20832221         });
20842222         presetpanel.add(aniso);
20852223         
2086
-        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2224
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
20872225         aniso2.setToolTipText("AnisoV");
20882226         aniso2.addMouseListener(new MouseAdapter()
20892227         {
....@@ -2101,7 +2239,7 @@
21012239         });
21022240         presetpanel.add(aniso2);
21032241         
2104
-        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2242
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
21052243         aniso3.setToolTipText("AnisoUV");
21062244         aniso3.addMouseListener(new MouseAdapter()
21072245         {
....@@ -2119,7 +2257,7 @@
21192257         });
21202258         presetpanel.add(aniso3);
21212259         
2122
-        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2260
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
21232261         velvet0.setToolTipText("Velvet");
21242262         velvet0.addMouseListener(new MouseAdapter()
21252263         {
....@@ -2141,7 +2279,7 @@
21412279         });
21422280         presetpanel.add(velvet0);
21432281         
2144
-        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2282
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
21452283         bump0.setToolTipText("Bump texture");
21462284         bump0.addMouseListener(new MouseAdapter()
21472285         {
....@@ -2160,7 +2298,22 @@
21602298         });
21612299         presetpanel.add(bump0);
21622300         
2163
-        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2301
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2302
+        borderShader.setToolTipText("Border fade");
2303
+        borderShader.addMouseListener(new MouseAdapter()
2304
+        {
2305
+            public void mouseClicked(MouseEvent e)
2306
+            {
2307
+                borderfadeField.setFloat(0.5);
2308
+                opacityField.setFloat(0.75);
2309
+
2310
+                materialtouched = true;
2311
+                applySelf();
2312
+            }
2313
+        });
2314
+        presetpanel.add(borderShader);
2315
+        
2316
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
21642317         halo.setToolTipText("Halo");
21652318         halo.addMouseListener(new MouseAdapter()
21662319         {
....@@ -2177,7 +2330,7 @@
21772330         });
21782331         presetpanel.add(halo);
21792332         
2180
-        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2333
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
21812334         candle.setToolTipText("Candle");
21822335         candle.addMouseListener(new MouseAdapter()
21832336         {
....@@ -2199,7 +2352,7 @@
21992352         });
22002353         presetpanel.add(candle);
22012354         
2202
-        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2355
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
22032356         shadowShader.setToolTipText("Shadow");
22042357         shadowShader.addMouseListener(new MouseAdapter()
22052358         {
....@@ -2234,19 +2387,19 @@
22342387 
22352388         cGridBag editBar = new cGridBag().setVertical(false);
22362389             
2237
-        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2390
+        editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
22382391                 createMaterialButton.setToolTipText("Create material");
22392392 
22402393         /*
22412394         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
22422395          */
22432396 
2244
-        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2397
+        editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
22452398                 clearMaterialButton.setToolTipText("Clear material");
22462399         
22472400         if (Globals.ADVANCED)
22482401         {
2249
-                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2402
+                editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
22502403                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
22512404                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
22522405         }
....@@ -2267,9 +2420,20 @@
22672420 
22682421         cGridBag huepanel = new cGridBag();
22692422             cGridBag huelabel = new cGridBag();
2270
-        skin = GetLabel("icons/hue.png", false);
2271
-        skin.fit = true;
2272
-            huelabel.add(skin);
2423
+        cLabel hue = GetLabel("icons/hue.png", false);
2424
+        hue.fit = true;
2425
+        
2426
+        hue.addMouseListener(new MouseAdapter()
2427
+        {
2428
+            public void mousePressed(MouseEvent e)
2429
+            {
2430
+                int x = e.getX();
2431
+                
2432
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2433
+            }
2434
+        });
2435
+        
2436
+            huelabel.add(hue);
22732437             huelabel.preferredWidth = 20;
22742438             huepanel.add(new cGridBag()); // Label
22752439             huepanel.add(huelabel); // Field/slider
....@@ -3545,32 +3709,8 @@
35453709 
35463710         if (multiplyToggle != null)
35473711                 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
-        assert (object.projectedVertices != null);
3550
-
3551
-        if (object.projectedVertices.length <= 2)
3552
-        {
3553
-            // Side effect...
3554
-            Object3D.cVector2[] keep = object.projectedVertices;
3555
-            object.projectedVertices = new Object3D.cVector2[3];
3556
-            for (int i = 0; i < 3; i++)
3557
-            {
3558
-                if (i < keep.length)
3559
-                {
3560
-                    object.projectedVertices[i] = keep[i];
3561
-                } else
3562
-                {
3563
-                    object.projectedVertices[i] = new Object3D.cVector2();
3564
-                }
3565
-                /*
3566
-                if(keep.length == 0)
3567
-                object.projectedVertices[0] = new Object3D.cVector2();
3568
-                else
3569
-                object.projectedVertices[0] = keep[0];
3570
-                object.projectedVertices[1] = new Object3D.cVector2();
3571
-                 */
3572
-            }
3573
-        }
3712
+        
3713
+        AllocProjectedVertices(object);
35743714 
35753715         SetMaterial(mat, object.projectedVertices);
35763716     }
....@@ -3880,7 +4020,7 @@
38804020             //System.out.println("ObjEditor " + event);
38814021             applySelf0(true);
38824022             //parent.applySelf();
3883
-            objEditor.refreshContents();
4023
+     // conflicts with requestFocus       objEditor.refreshContents();
38844024         } else if (source == resetButton)
38854025         {
38864026             CameraPane.fullreset = true;
....@@ -4060,11 +4200,18 @@
40604200 
40614201     void New()
40624202     {
4063
-        while (copy.Size() > 1)
4203
+        while (copy.Size() > 0)
40644204         {
4065
-            copy.remove(1);
4205
+            copy.remove(0);
40664206         }
40674207         
4208
+        copy.selection.clear();
4209
+        
4210
+        if (copy == Grafreed.grafreed.universe)
4211
+        {
4212
+            CreateCameras();
4213
+            cameraView.SetCamera(GetCamera(copy, 0));
4214
+        }
40684215         ResetModel();
40694216         objEditor.refreshContents();
40704217     }
....@@ -4192,8 +4339,6 @@
41924339         return true;
41934340     }
41944341 
4195
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196
-    
41974342     void DeleteVersion()
41984343     {
41994344         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4201,7 +4346,11 @@
42014346             copy.versionlist[i] = copy.versionlist[i+1];
42024347         }
42034348         
4204
-        CopyChanged();
4349
+        if (copy.versionlist[copy.versionindex] == null)
4350
+            copy.versionindex -= 1;
4351
+        
4352
+        if (copy.versionindex != -1)
4353
+            CopyChanged();
42054354         
42064355         SetVersionStates();
42074356     }
....@@ -4314,7 +4463,7 @@
43144463         boolean temp = CameraPane.SWITCH;
43154464         CameraPane.SWITCH = false;
43164465         
4317
-        copy.ExtractBigData(versiontable);
4466
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43184467         
43194468         copy.clear();
43204469         
....@@ -4326,7 +4475,7 @@
43264475             copy.add(obj.get(i));
43274476         }
43284477         
4329
-        copy.RestoreBigData(versiontable);
4478
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43304479         
43314480         CameraPane.SWITCH = temp;
43324481         
....@@ -4376,6 +4525,8 @@
43764525         return count;
43774526     }
43784527     
4528
+    public cGridBag versionSliderPane;
4529
+    
43794530     void SetVersionStates()
43804531     {
43814532         //if (true)
....@@ -4383,21 +4534,36 @@
43834534                     
43844535         //cRadio tab = GetCurrentTab();
43854536         
4386
-        restoreButton.setEnabled(copy.versionindex != -1);
4387
-        replaceButton.setEnabled(copy.versionindex != -1);
4388
-        
4389
-        previousVersionButton.setEnabled(copy.versionindex > 0);
4390
-        nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4391
-        
4392
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393
-                                        copy.versionlist[copy.versionindex + 1] != null);
4394
-        
4395
-        muteSlider = true;
4396
-        versionSlider.setMinimum(0);
4397
-        versionSlider.setMaximum(VersionCount() - 1);
4398
-        versionSlider.setInteger(copy.versionindex);
4399
-        versionSlider.setEnabled(copy.versionindex != -1);
4400
-        muteSlider = false;
4537
+        if (copy.versionlist == null)
4538
+        {
4539
+            saveVersionButton.setEnabled(false);
4540
+            restoreButton.setEnabled(false);
4541
+            replaceButton.setEnabled(false);
4542
+            previousVersionButton.setEnabled(false);
4543
+            nextVersionButton.setEnabled(false);
4544
+            deleteVersionButton.setEnabled(false);
4545
+            versionSliderPane.setVisible(false);
4546
+        }
4547
+        else
4548
+        {
4549
+            restoreButton.setEnabled(copy.versionindex != -1);
4550
+            replaceButton.setEnabled(copy.versionindex != -1);
4551
+
4552
+            previousVersionButton.setEnabled(copy.versionindex > 0);
4553
+            nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4554
+
4555
+            deleteVersionButton.setEnabled(copy.versionindex != -1);
4556
+                                            //copy.versionlist[copy.versionindex + 1] != null);
4557
+
4558
+            muteSlider = true;
4559
+            versionSlider.setMinimum(0);
4560
+            versionSlider.setMaximum(VersionCount() - 1);
4561
+            versionSlider.setInteger(copy.versionindex);
4562
+            versionSlider.setEnabled(copy.versionindex != -1);
4563
+            muteSlider = false;
4564
+            
4565
+            versionSliderPane.setVisible(true);
4566
+        }
44014567     }
44024568     
44034569     public boolean PreviousVersion()
....@@ -4455,7 +4621,7 @@
44554621 
44564622     public boolean Replace()
44574623     {
4458
-        System.err.println("Replace");
4624
+        //System.err.println("Replace");
44594625         
44604626         //cRadio tab = GetCurrentTab();
44614627         
....@@ -4682,6 +4848,12 @@
46824848 //            else
46834849 //		applySelf(true);
46844850 //	}
4851
+    
4852
+    boolean Equal(double a, double b)
4853
+    {
4854
+        return Math.abs(a - b) < 0.001;
4855
+    }
4856
+    
46854857     void applySelf0(boolean name)
46864858     {
46874859         if (name)
....@@ -4731,29 +4903,52 @@
47314903                 {
47324904                     cMaterial mat = copy.material;
47334905                             
4734
-                    colorField.SetToolTipValue((mat.color));
4735
-                    saturationField.SetToolTipValue((mat.modulation));
4736
-                    metalnessField.SetToolTipValue((mat.metalness));
4737
-                    diffuseField.SetToolTipValue((mat.diffuse));
4738
-                    specularField.SetToolTipValue((mat.specular));
4739
-                    shininessField.SetToolTipValue((mat.shininess));
4740
-                    shiftField.SetToolTipValue((mat.shift));
4741
-                    ambientField.SetToolTipValue((mat.ambient));
4742
-                    lightareaField.SetToolTipValue((mat.lightarea));
4743
-                    diffusenessField.SetToolTipValue((mat.factor));
4744
-                    velvetField.SetToolTipValue((mat.velvet));
4745
-                    sheenField.SetToolTipValue((mat.sheen));
4746
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4747
-                    backlitField.SetToolTipValue((mat.bump));
4748
-                    anisoField.SetToolTipValue((mat.aniso));
4749
-                    anisoVField.SetToolTipValue((mat.anisoV));
4750
-                    cameraField.SetToolTipValue((mat.cameralight));
4751
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4752
-                    shadowField.SetToolTipValue((mat.shadow));
4753
-                    textureField.SetToolTipValue((mat.texture));
4754
-                    opacityField.SetToolTipValue((mat.opacity));
4755
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4756
-                    shadowbiasField.SetToolTipValue((mat.shadowbias));
4906
+                    if (!Equal(colorField.getFloat(), mat.color))
4907
+                        colorField.SetToolTipValue((mat.color));
4908
+                    if (!Equal(saturationField.getFloat(), mat.modulation))
4909
+                        saturationField.SetToolTipValue((mat.modulation));
4910
+                    if (!Equal(metalnessField.getFloat(), mat.metalness))
4911
+                        metalnessField.SetToolTipValue((mat.metalness));
4912
+                    if (!Equal(diffuseField.getFloat(), mat.diffuse))
4913
+                        diffuseField.SetToolTipValue((mat.diffuse));
4914
+                    if (!Equal(specularField.getFloat(), mat.specular))
4915
+                        specularField.SetToolTipValue((mat.specular));
4916
+                    if (!Equal(shininessField.getFloat(), mat.shininess))
4917
+                        shininessField.SetToolTipValue((mat.shininess));
4918
+                    if (!Equal(shiftField.getFloat(), mat.shift))
4919
+                        shiftField.SetToolTipValue((mat.shift));
4920
+                    if (!Equal(ambientField.getFloat(), mat.ambient))
4921
+                        ambientField.SetToolTipValue((mat.ambient));
4922
+                    if (!Equal(lightareaField.getFloat(), mat.lightarea))
4923
+                        lightareaField.SetToolTipValue((mat.lightarea));
4924
+                    if (!Equal(diffusenessField.getFloat(), mat.factor))
4925
+                        diffusenessField.SetToolTipValue((mat.factor));
4926
+                    if (!Equal(velvetField.getFloat(), mat.velvet))
4927
+                        velvetField.SetToolTipValue((mat.velvet));
4928
+                    if (!Equal(sheenField.getFloat(), mat.sheen))
4929
+                        sheenField.SetToolTipValue((mat.sheen));
4930
+                    if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4931
+                        subsurfaceField.SetToolTipValue((mat.subsurface));
4932
+                    if (!Equal(backlitField.getFloat(), mat.bump))
4933
+                        backlitField.SetToolTipValue((mat.bump));
4934
+                    if (!Equal(anisoField.getFloat(), mat.aniso))
4935
+                        anisoField.SetToolTipValue((mat.aniso));
4936
+                    if (!Equal(anisoVField.getFloat(), mat.anisoV))
4937
+                        anisoVField.SetToolTipValue((mat.anisoV));
4938
+                    if (!Equal(cameraField.getFloat(), mat.cameralight))
4939
+                        cameraField.SetToolTipValue((mat.cameralight));
4940
+                    if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4941
+                        selfshadowField.SetToolTipValue((mat.diffuseness));
4942
+                    if (!Equal(shadowField.getFloat(), mat.shadow))
4943
+                        shadowField.SetToolTipValue((mat.shadow));
4944
+                    if (!Equal(textureField.getFloat(), mat.texture))
4945
+                        textureField.SetToolTipValue((mat.texture));
4946
+                    if (!Equal(opacityField.getFloat(), mat.opacity))
4947
+                        opacityField.SetToolTipValue((mat.opacity));
4948
+                    if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4949
+                        fakedepthField.SetToolTipValue((mat.fakedepth));
4950
+                    if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4951
+                        shadowbiasField.SetToolTipValue((mat.shadowbias));
47574952                 }
47584953                 
47594954                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4788,7 +4983,7 @@
47884983     
47894984     public void stateChanged(ChangeEvent e)
47904985     {
4791
-        //    assert(false);
4986
+        // assert(false);
47924987         if (e.getSource() == versionSlider)
47934988         {
47944989             if (muteSlider)
....@@ -5158,6 +5353,8 @@
51585353         
51595354         if (previousVersionButton != null && copy.versionlist != null)
51605355             SetVersionStates();
5356
+        
5357
+        cameraView.requestFocusInWindow();
51615358     }
51625359     
51635360     static TweenManager tweenManager = new TweenManager();
....@@ -5189,7 +5386,7 @@
51895386 //                group = (Composite) group.get(0);
51905387 //            }
51915388 
5192
-        System.out.println("makeSomething of " + thing);
5389
+        //System.out.println("makeSomething of " + thing);
51935390 
51945391         /*
51955392         if (deselect && jList != null)
....@@ -5543,6 +5740,7 @@
55435740 
55445741             copy.versionlist = readobj.versionlist;
55455742             copy.versionindex = readobj.versionindex;
5743
+            copy.versiontable = readobj.versiontable;
55465744             
55475745         if (copy.versionlist == null)
55485746         {
....@@ -5550,7 +5748,7 @@
55505748             copy.versionlist = new Object3D[100];
55515749             copy.versionindex = -1;
55525750             
5553
-            Save(true);
5751
+            //Save(true);
55545752         }
55555753         
55565754             //? SetUndoStates();
....@@ -5898,6 +6096,7 @@
58986096     boolean materialFlushed;
58996097     Object3D latestObject;
59006098     
6099
+    cGridBag transformPanel;
59016100     cGridBag XYZPanel;
59026101     
59036102     JSplitPane gridPanel;