blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -41,6 +42,35 @@
4142     JFrame frame;
4243     
4344     static ObjEditor theFrame;
45
+
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
4474 
4575     public cGridBag GetSeparator()
4676     {
....@@ -74,8 +104,16 @@
74104         return new cCheckBox(icon, border);
75105     }
76106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
77109     ImageIcon GetIcon(String name)
78110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
79117         try
80118         {
81119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +131,14 @@
93131 //            }
94132 
95133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
96137             return icon;
97138         }
98139         catch (Exception e)
99140         {
141
+            //icons.put(name, null);
100142             return null;
101143         }
102144     }
....@@ -296,11 +338,13 @@
296338         client = inClient;
297339         copy = client;
298340 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
304348         
305349         // "this" is not called: SetupUI2(objEditor);
306350     }
....@@ -319,6 +363,8 @@
319363         {
320364             copy.versionlist = new Object3D[100];
321365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
322368         }
323369         
324370         SetupUI2(callee.GetEditor());
....@@ -342,7 +388,8 @@
342388         //parent = p;
343389 
344390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346393         //gd.setFullScreenWindow(this);
347394         //setResizable(false);
348395         //if (!isDisplayable())
....@@ -353,11 +400,13 @@
353400         copy = localCopy;
354401         copy.editWindow = this;
355402 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
359406 //            copy.versionindex = -1;
360
-        }
407
+//            
408
+//            Save(true);
409
+//        }
361410         
362411         SetupMenu();
363412 
....@@ -426,6 +475,8 @@
426475         
427476         ChangeListener changeListener = new ChangeListener()
428477         {
478
+            //String name;
479
+            
429480             public void stateChanged(ChangeEvent changeEvent)
430481             {
431482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +495,37 @@
444495 //                        EditSelection(false);
445496 //                }
446497 
447
-                refreshContents(false); // To refresh Info tab
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+                
527
+//                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
448529             }
449530         };
450531         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +547,8 @@
466547                 
467548         toolboxPanel = new cGridBag().setVertical(true);
468549         //toolboxPanel.setName("Toolbox");
550
+        
551
+        skyboxPanel = new cGridBag().setVertical(true);
469552         
470553         materialPanel = new cGridBag().setVertical(false);
471554         //materialPanel.setName("Material");
....@@ -751,6 +834,7 @@
751834         boolean maximized;
752835     
753836         cButton fullscreenLayout;
837
+        cButton expandedLayout;
754838 
755839         void Minimize()
756840         {
....@@ -790,10 +874,12 @@
790874 	cButton minButton;
791875 	cButton maxButton;
792876 	cButton fullButton;
877
+	cButton collapseButton;
878
+        cButton maximize3DButton;
793879         
794880         void ToggleFullScreen()
795881         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797883 
798884                 cameraView.ToggleFullScreen();
799885                 
....@@ -814,13 +900,13 @@
814900 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815901 // X                   framePanel.add(bigThree);
816902 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
903
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818904                     
819905                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
906
+//                    radio.layout = keepButton;
821907                     //theFrame = null;
822908                     keepButton = null;
823
-                    radio.layout.doClick();
909
+//                    radio.layout.doClick();
824910                     
825911                 } else
826912                 {
....@@ -841,10 +927,10 @@
841927 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842928 // X                   framePanel.remove(bigThree);
843929 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
930
+//                    framePanel.setDividerLocation(0);
845931 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
932
+//                    radio.layout = fullscreenLayout;
933
+//                    radio.layout.doClick();
848934                     //frame.setVisible(true);
849935                 }
850936             frame.validate();
....@@ -852,23 +938,37 @@
852938             cameraView.requestFocusInWindow();
853939         }
854940 
855
-    private Object3D CompressCopy()
941
+        void CollapseToolbar()
942
+        {
943
+            framePanel.setDividerLocation(0);
944
+            //frame.validate();
945
+            
946
+            cameraView.requestFocusInWindow();
947
+        }
948
+        
949
+    private Object3D Duplicate(Object3D object)
856950     {
857951         boolean temp = CameraPane.SWITCH;
858952         CameraPane.SWITCH = false;
859953         
860
-        copy.ExtractBigData(versiontable);
954
+        if (Grafreed.grafreed.universe.versiontable == null)
955
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+         
957
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
861958         // if (copy == client)
862959         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
960
+        Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
962
+        object.versionlist = null;
963
+        object.versiontable = null;
865964         
866965         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
966
+        Object3D compress = (Object3D)Grafreed.clone(object);
868967         
869
-        copy.versionlist = versions;
968
+        object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
870970         
871
-        copy.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872972         
873973         CameraPane.SWITCH = temp;
874974         
....@@ -1205,6 +1305,18 @@
12051305         
12061306             namePanel = new cGridBag();
12071307             
1308
+        //if (copy.pinned)
1309
+        {
1310
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1311
+            pinButton.setSelected(copy.pinned);
1312
+            cGridBag t = new cGridBag();
1313
+            t.preferredWidth = 2;
1314
+            t.add(pinButton);
1315
+            namePanel.add(t);
1316
+            
1317
+            pinButton.addItemListener(this);
1318
+        }
1319
+        
12081320         nameField = AddText(namePanel, copy.GetName());
12091321         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101322         oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1330,14 @@
12181330             
12191331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
12211335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221336                 selectableCB.setToolTipText("Make object selectable");
12231337 //            Return();
12241338                 
12251339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261340                 hideCB.setToolTipText("Hide object");
1227
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
-        markCB.setToolTipText("As animation target transform");
12291341         
12301342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311343         
....@@ -1427,6 +1539,7 @@
14271539 
14281540         if (cam == null || !(copy.get(0) instanceof cGroup))
14291541         {
1542
+        if (Globals.DEBUG)
14301543             System.out.println("CREATE CAMERAS");
14311544             cams = new cTemplate();
14321545             cams.name = "Cameras";
....@@ -1552,26 +1665,25 @@
15521665 
15531666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15541667         //tmp.setName("Edit");
1555
-        objectPanel.add(materialPanel);
1556
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
-        objectPanel.setToolTipTextAt(0, "Material");
1558
-    
15591668         objectPanel.add(toolboxPanel);
1560
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561
-        objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15621671 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
1676
+        objectPanel.add(skyboxPanel);
1677
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1679
+        
15631680 //        JPanel north = new JPanel(new BorderLayout());
15641681 //        north.setName("Edit");
15651682 //        north.add(ctrlPanel, BorderLayout.NORTH);
15661683 //        objectPanel.add(north);
15671684         objectPanel.add(editPanel);
1568
-        objectPanel.setIconAt(2, GetIcon("icons/write.png"));
1569
-        objectPanel.setToolTipTextAt(2, "Edit controls");
1570
-        
1571
-        //if (Globals.ADVANCED)
1572
-            objectPanel.add(infoPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/info.png"));
1574
-        objectPanel.setToolTipTextAt(3, "Information");
1685
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1686
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15751687         
15761688         objectPanel.add(XYZPanel);
15771689         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
....@@ -1613,6 +1725,11 @@
16131725 
16141726         scenePanel.add(tabbedPane);
16151727 
1728
+        //if (Globals.ADVANCED)
1729
+//            tabbedPane.add(infoPanel);
1730
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731
+//        tabbedPane.setToolTipTextAt(3, "Information");
1732
+        
16161733         /*
16171734         cTree jTree = new cTree(null);
16181735         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1800,23 @@
16831800 //		aConstraints.gridheight = 1;
16841801 
16851802         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1803
+        
1804
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1805
+                new java.beans.PropertyChangeListener()
1806
+                {
1807
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1808
+                    {
1809
+                        if ((Integer)pce.getOldValue() == 1)
1810
+                        {
1811
+                            if (radio.layout != expandedLayout)
1812
+                            {
1813
+                                radio.layout = expandedLayout;
1814
+                                radio.layout.doClick();
1815
+                            }
1816
+                        }
1817
+                    }
1818
+                });
1819
+
16861820         framePanel.setContinuousLayout(false);
16871821         framePanel.setOneTouchExpandable(false);
16881822         //.setDividerLocation(0.8);
....@@ -1692,7 +1826,7 @@
16921826 
16931827         frame.getContentPane().setLayout(new BorderLayout());
16941828         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1829
+        //JTabbedPane worldPane = new JTabbedPane();
16961830         //worldPane.add(bigPanel);
16971831         //worldPane.add(worldPanel);
16981832                 /**/
....@@ -2063,6 +2197,21 @@
20632197         });
20642198         presetpanel.add(bump0);
20652199         
2200
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2201
+        borderShader.setToolTipText("Border fade");
2202
+        borderShader.addMouseListener(new MouseAdapter()
2203
+        {
2204
+            public void mouseClicked(MouseEvent e)
2205
+            {
2206
+                borderfadeField.setFloat(0.5);
2207
+                opacityField.setFloat(0.75);
2208
+
2209
+                materialtouched = true;
2210
+                applySelf();
2211
+            }
2212
+        });
2213
+        presetpanel.add(borderShader);
2214
+        
20662215         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20672216         halo.setToolTipText("Halo");
20682217         halo.addMouseListener(new MouseAdapter()
....@@ -2101,6 +2250,25 @@
21012250             }
21022251         });
21032252         presetpanel.add(candle);
2253
+        
2254
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2255
+        shadowShader.setToolTipText("Shadow");
2256
+        shadowShader.addMouseListener(new MouseAdapter()
2257
+        {
2258
+            public void mouseClicked(MouseEvent e)
2259
+            {
2260
+                diffuseField.setFloat(0.001);
2261
+                ambientField.setFloat(0.001);
2262
+                cameraField.setFloat(0.001);
2263
+                specularField.setFloat(0.001);
2264
+                fakedepthField.setFloat(0.001);
2265
+                opacityField.setFloat(0.6);
2266
+
2267
+                materialtouched = true;
2268
+                applySelf();
2269
+            }
2270
+        });
2271
+        presetpanel.add(shadowShader);
21042272         
21052273         cGridBag panel = new cGridBag().setVertical(true);
21062274         
....@@ -2151,9 +2319,20 @@
21512319 
21522320         cGridBag huepanel = new cGridBag();
21532321             cGridBag huelabel = new cGridBag();
2154
-        skin = GetLabel("icons/hue.png", false);
2155
-        skin.fit = true;
2156
-            huelabel.add(skin);
2322
+        cLabel hue = GetLabel("icons/hue.png", false);
2323
+        hue.fit = true;
2324
+        
2325
+        hue.addMouseListener(new MouseAdapter()
2326
+        {
2327
+            public void mousePressed(MouseEvent e)
2328
+            {
2329
+                int x = e.getX();
2330
+                
2331
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2332
+            }
2333
+        });
2334
+        
2335
+            huelabel.add(hue);
21572336             huelabel.preferredWidth = 20;
21582337             huepanel.add(new cGridBag()); // Label
21592338             huepanel.add(huelabel); // Field/slider
....@@ -3429,32 +3608,8 @@
34293608 
34303609         if (multiplyToggle != null)
34313610                 multiplyToggle.setSelected(mat.multiply);
3432
-
3433
-        assert (object.projectedVertices != null);
3434
-
3435
-        if (object.projectedVertices.length <= 2)
3436
-        {
3437
-            // Side effect...
3438
-            Object3D.cVector2[] keep = object.projectedVertices;
3439
-            object.projectedVertices = new Object3D.cVector2[3];
3440
-            for (int i = 0; i < 3; i++)
3441
-            {
3442
-                if (i < keep.length)
3443
-                {
3444
-                    object.projectedVertices[i] = keep[i];
3445
-                } else
3446
-                {
3447
-                    object.projectedVertices[i] = new Object3D.cVector2();
3448
-                }
3449
-                /*
3450
-                if(keep.length == 0)
3451
-                object.projectedVertices[0] = new Object3D.cVector2();
3452
-                else
3453
-                object.projectedVertices[0] = keep[0];
3454
-                object.projectedVertices[1] = new Object3D.cVector2();
3455
-                 */
3456
-            }
3457
-        }
3611
+        
3612
+        AllocProjectedVertices(object);
34583613 
34593614         SetMaterial(mat, object.projectedVertices);
34603615     }
....@@ -3574,6 +3729,17 @@
35743729     public void itemStateChanged(ItemEvent event)
35753730     {
35763731         //                   System.out.println("Propagate = " + propagate);
3732
+        if (event.getSource() == pinButton)
3733
+        {
3734
+            copy.pinned ^= true;
3735
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3736
+            {
3737
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3738
+                copy.CloseUI();
3739
+                //copy.editWindow.refreshContents();
3740
+            }
3741
+        }
3742
+        else
35773743         if (event.getSource() == propagateToggle)
35783744         {
35793745             propagate ^= true;
....@@ -3753,7 +3919,7 @@
37533919             //System.out.println("ObjEditor " + event);
37543920             applySelf0(true);
37553921             //parent.applySelf();
3756
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
37573923         } else if (source == resetButton)
37583924         {
37593925             CameraPane.fullreset = true;
....@@ -4046,7 +4212,7 @@
40464212     {
40474213         //Save(true);
40484214         Replace();
4049
-        SetUndoStates();
4215
+        SetVersionStates();
40504216     }
40514217     
40524218     private boolean Equal(byte[] compress, byte[] name)
....@@ -4065,8 +4231,6 @@
40654231         return true;
40664232     }
40674233 
4068
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4069
-    
40704234     void DeleteVersion()
40714235     {
40724236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4074,19 +4238,23 @@
40744238             copy.versionlist[i] = copy.versionlist[i+1];
40754239         }
40764240         
4077
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
40784243         
4079
-        SetUndoStates();
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
4246
+        
4247
+        SetVersionStates();
40804248     }
40814249     
40824250     public boolean Save(boolean user)
40834251     {
40844252         System.err.println("Save");
4085
-        //Replace();
4253
+        Replace();
40864254         
4087
-        cRadio tab = GetCurrentTab();
4255
+        //cRadio tab = GetCurrentTab();
40884256         
4089
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4257
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
40904258         
40914259         boolean thesame = false;
40924260         
....@@ -4122,7 +4290,7 @@
41224290 //            copy.versionlist[i] = null;
41234291 //        }
41244292 
4125
-        SetUndoStates();
4293
+        SetVersionStates();
41264294         
41274295         // test save
41284296         if (false)
....@@ -4180,14 +4348,14 @@
41804348 
41814349     void CopyChanged()
41824350     {
4183
-        Object3D obj = copy.versionlist[copy.versionindex];
4351
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
41844352         
4185
-        SetUndoStates();
4353
+        SetVersionStates();
41864354         
41874355         boolean temp = CameraPane.SWITCH;
41884356         CameraPane.SWITCH = false;
41894357         
4190
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
41914359         
41924360         copy.clear();
41934361         
....@@ -4199,7 +4367,7 @@
41994367             copy.add(obj.get(i));
42004368         }
42014369         
4202
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42034371         
42044372         CameraPane.SWITCH = temp;
42054373         
....@@ -4249,22 +4417,27 @@
42494417         return count;
42504418     }
42514419     
4252
-    void SetUndoStates()
4420
+    void SetVersionStates()
42534421     {
4254
-        cRadio tab = GetCurrentTab();
4422
+        //if (true)
4423
+        //    return;
4424
+                    
4425
+        //cRadio tab = GetCurrentTab();
42554426         
4256
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4257
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4427
+        restoreButton.setEnabled(copy.versionindex != -1);
4428
+        replaceButton.setEnabled(copy.versionindex != -1);
42584429         
42594430         previousVersionButton.setEnabled(copy.versionindex > 0);
42604431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
42614432         
4262
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4263
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
42644435         
42654436         muteSlider = true;
4437
+        versionSlider.setMinimum(0);
42664438         versionSlider.setMaximum(VersionCount() - 1);
42674439         versionSlider.setInteger(copy.versionindex);
4440
+        versionSlider.setEnabled(copy.versionindex != -1);
42684441         muteSlider = false;
42694442     }
42704443     
....@@ -4275,7 +4448,7 @@
42754448         
42764449         System.err.println("Undo");
42774450         
4278
-        cRadio tab = GetCurrentTab();
4451
+        //cRadio tab = GetCurrentTab();
42794452         
42804453         if (copy.versionindex == 0)
42814454         {
....@@ -4307,7 +4480,7 @@
43074480     {
43084481         System.err.println("Restore");
43094482         
4310
-        cRadio tab = GetCurrentTab();
4483
+        //cRadio tab = GetCurrentTab();
43114484         
43124485         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43134486         {
....@@ -4323,9 +4496,9 @@
43234496 
43244497     public boolean Replace()
43254498     {
4326
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
43274500         
4328
-        cRadio tab = GetCurrentTab();
4501
+        //cRadio tab = GetCurrentTab();
43294502         
43304503         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43314504         {
....@@ -4333,7 +4506,7 @@
43334506             return false;
43344507         }
43354508 
4336
-        copy.versionlist[copy.versionindex] = CompressCopy();
4509
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43374510         
43384511         return true;
43394512     }
....@@ -4343,7 +4516,7 @@
43434516         // Option?
43444517         Replace();
43454518         
4346
-        cRadio tab = GetCurrentTab();
4519
+        //cRadio tab = GetCurrentTab();
43474520         
43484521         if (copy.versionlist[copy.versionindex + 1] == null)
43494522         {
....@@ -4662,9 +4835,11 @@
46624835             if (muteSlider)
46634836                 return;
46644837             
4838
+            Replace();
4839
+            
46654840             int version = versionSlider.getInteger();
46664841             
4667
-            if (copy.versionlist[version] != null)
4842
+            if (version != -1 && copy.versionlist[version] != null)
46684843             {
46694844                 copy.versionindex = version;
46704845                 CopyChanged();
....@@ -4708,7 +4883,7 @@
47084883             //System.out.println("stateChanged = " + this);
47094884             materialtouched = true;
47104885             
4711
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4886
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47124887             {
47134888                 saturationField.setFloat(1);
47144889             }
....@@ -5023,7 +5198,9 @@
50235198         }
50245199         
50255200         if (previousVersionButton != null && copy.versionlist != null)
5026
-            SetUndoStates();
5201
+            SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
50275204     }
50285205     
50295206     static TweenManager tweenManager = new TweenManager();
....@@ -5055,7 +5232,7 @@
50555232 //                group = (Composite) group.get(0);
50565233 //            }
50575234 
5058
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
50595236 
50605237         /*
50615238         if (deselect && jList != null)
....@@ -5409,11 +5586,15 @@
54095586 
54105587             copy.versionlist = readobj.versionlist;
54115588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
54125590             
54135591         if (copy.versionlist == null)
54145592         {
5593
+            // Backward compatibility
54155594             copy.versionlist = new Object3D[100];
54165595             copy.versionindex = -1;
5596
+            
5597
+            //Save(true);
54175598         }
54185599         
54195600             //? SetUndoStates();
....@@ -5505,6 +5686,8 @@
55055686 
55065687     void save()
55075688     {
5689
+        Replace();
5690
+        
55085691         if (lastname == null)
55095692         {
55105693             return;
....@@ -5747,6 +5930,7 @@
57475930     ButtonGroup buttonGroup;
57485931     
57495932     cGridBag toolboxPanel;
5933
+    cGridBag skyboxPanel;
57505934     cGridBag materialPanel;
57515935     cGridBag ctrlPanel;
57525936     
....@@ -5851,6 +6035,7 @@
58516035     cNumberSlider anisoField;
58526036     JLabel anisoVLabel;
58536037     cNumberSlider anisoVField;
6038
+    
58546039     JLabel cameraLabel;
58556040     cNumberSlider cameraField;
58566041     JLabel selfshadowLabel;
....@@ -5865,6 +6050,7 @@
58656050     cNumberSlider fakedepthField;
58666051     JLabel shadowbiasLabel;
58676052     cNumberSlider shadowbiasField;
6053
+    
58686054     JLabel bumpLabel;
58696055     cNumberSlider bumpField;
58706056     JLabel noiseLabel;