blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -41,6 +42,35 @@
4142     JFrame frame;
4243     
4344     static ObjEditor theFrame;
45
+
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
4474 
4575     public cGridBag GetSeparator()
4676     {
....@@ -74,8 +104,16 @@
74104         return new cCheckBox(icon, border);
75105     }
76106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
77109     ImageIcon GetIcon(String name)
78110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
79117         try
80118         {
81119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +131,14 @@
93131 //            }
94132 
95133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
96137             return icon;
97138         }
98139         catch (Exception e)
99140         {
141
+            //icons.put(name, null);
100142             return null;
101143         }
102144     }
....@@ -296,11 +338,13 @@
296338         client = inClient;
297339         copy = client;
298340 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
304348         
305349         // "this" is not called: SetupUI2(objEditor);
306350     }
....@@ -319,6 +363,8 @@
319363         {
320364             copy.versionlist = new Object3D[100];
321365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
322368         }
323369         
324370         SetupUI2(callee.GetEditor());
....@@ -342,7 +388,8 @@
342388         //parent = p;
343389 
344390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346393         //gd.setFullScreenWindow(this);
347394         //setResizable(false);
348395         //if (!isDisplayable())
....@@ -353,11 +400,13 @@
353400         copy = localCopy;
354401         copy.editWindow = this;
355402 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
359406 //            copy.versionindex = -1;
360
-        }
407
+//            
408
+//            Save(true);
409
+//        }
361410         
362411         SetupMenu();
363412 
....@@ -426,6 +475,8 @@
426475         
427476         ChangeListener changeListener = new ChangeListener()
428477         {
478
+            //String name;
479
+            
429480             public void stateChanged(ChangeEvent changeEvent)
430481             {
431482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +495,37 @@
444495 //                        EditSelection(false);
445496 //                }
446497 
447
-                refreshContents(false); // To refresh Info tab
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+                
527
+//                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
448529             }
449530         };
450531         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +547,8 @@
466547                 
467548         toolboxPanel = new cGridBag().setVertical(true);
468549         //toolboxPanel.setName("Toolbox");
550
+        
551
+        skyboxPanel = new cGridBag().setVertical(true);
469552         
470553         materialPanel = new cGridBag().setVertical(false);
471554         //materialPanel.setName("Material");
....@@ -751,6 +834,7 @@
751834         boolean maximized;
752835     
753836         cButton fullscreenLayout;
837
+        cButton expandedLayout;
754838 
755839         void Minimize()
756840         {
....@@ -790,10 +874,12 @@
790874 	cButton minButton;
791875 	cButton maxButton;
792876 	cButton fullButton;
877
+	cButton collapseButton;
878
+        cButton maximize3DButton;
793879         
794880         void ToggleFullScreen()
795881         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797883 
798884                 cameraView.ToggleFullScreen();
799885                 
....@@ -814,13 +900,13 @@
814900 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815901 // X                   framePanel.add(bigThree);
816902 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
903
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818904                     
819905                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
906
+//                    radio.layout = keepButton;
821907                     //theFrame = null;
822908                     keepButton = null;
823
-                    radio.layout.doClick();
909
+//                    radio.layout.doClick();
824910                     
825911                 } else
826912                 {
....@@ -841,10 +927,10 @@
841927 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842928 // X                   framePanel.remove(bigThree);
843929 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
930
+//                    framePanel.setDividerLocation(0);
845931 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
932
+//                    radio.layout = fullscreenLayout;
933
+//                    radio.layout.doClick();
848934                     //frame.setVisible(true);
849935                 }
850936             frame.validate();
....@@ -852,23 +938,31 @@
852938             cameraView.requestFocusInWindow();
853939         }
854940 
855
-    private Object3D CompressCopy()
941
+        void CollapseToolbar()
942
+        {
943
+            framePanel.setDividerLocation(0);
944
+            //frame.validate();
945
+            
946
+            cameraView.requestFocusInWindow();
947
+        }
948
+        
949
+    private Object3D Duplicate(Object3D object)
856950     {
857951         boolean temp = CameraPane.SWITCH;
858952         CameraPane.SWITCH = false;
859953         
860
-        copy.ExtractBigData(versiontable);
954
+        object.ExtractBigData(versiontable);
861955         // if (copy == client)
862956         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
957
+        Object3D versions[] = object.versionlist;
958
+        object.versionlist = null;
865959         
866960         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
961
+        Object3D compress = (Object3D)Grafreed.clone(object);
868962         
869
-        copy.versionlist = versions;
963
+        object.versionlist = versions;
870964         
871
-        copy.RestoreBigData(versiontable);
965
+        object.RestoreBigData(versiontable);
872966         
873967         CameraPane.SWITCH = temp;
874968         
....@@ -1205,6 +1299,18 @@
12051299         
12061300             namePanel = new cGridBag();
12071301             
1302
+        //if (copy.pinned)
1303
+        {
1304
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1305
+            pinButton.setSelected(copy.pinned);
1306
+            cGridBag t = new cGridBag();
1307
+            t.preferredWidth = 2;
1308
+            t.add(pinButton);
1309
+            namePanel.add(t);
1310
+            
1311
+            pinButton.addItemListener(this);
1312
+        }
1313
+        
12081314         nameField = AddText(namePanel, copy.GetName());
12091315         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101316         oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1324,14 @@
12181324             
12191325         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201326                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
12211329         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221330                 selectableCB.setToolTipText("Make object selectable");
12231331 //            Return();
12241332                 
12251333         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261334                 hideCB.setToolTipText("Hide object");
1227
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
-        markCB.setToolTipText("As animation target transform");
12291335         
12301336         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311337         
....@@ -1427,6 +1533,7 @@
14271533 
14281534         if (cam == null || !(copy.get(0) instanceof cGroup))
14291535         {
1536
+        if (Globals.DEBUG)
14301537             System.out.println("CREATE CAMERAS");
14311538             cams = new cTemplate();
14321539             cams.name = "Cameras";
....@@ -1558,20 +1665,19 @@
15581665     
15591666         objectPanel.add(toolboxPanel);
15601667         objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561
-        objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
1668
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
15621669 
1670
+        objectPanel.add(skyboxPanel);
1671
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1673
+        
15631674 //        JPanel north = new JPanel(new BorderLayout());
15641675 //        north.setName("Edit");
15651676 //        north.add(ctrlPanel, BorderLayout.NORTH);
15661677 //        objectPanel.add(north);
15671678         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");
1679
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1680
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15751681         
15761682         objectPanel.add(XYZPanel);
15771683         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
....@@ -1613,6 +1719,11 @@
16131719 
16141720         scenePanel.add(tabbedPane);
16151721 
1722
+        //if (Globals.ADVANCED)
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
1726
+        
16161727         /*
16171728         cTree jTree = new cTree(null);
16181729         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1794,23 @@
16831794 //		aConstraints.gridheight = 1;
16841795 
16851796         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1797
+        
1798
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1799
+                new java.beans.PropertyChangeListener()
1800
+                {
1801
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1802
+                    {
1803
+                        if ((Integer)pce.getOldValue() == 1)
1804
+                        {
1805
+                            if (radio.layout != expandedLayout)
1806
+                            {
1807
+                                radio.layout = expandedLayout;
1808
+                                radio.layout.doClick();
1809
+                            }
1810
+                        }
1811
+                    }
1812
+                });
1813
+
16861814         framePanel.setContinuousLayout(false);
16871815         framePanel.setOneTouchExpandable(false);
16881816         //.setDividerLocation(0.8);
....@@ -1692,7 +1820,7 @@
16921820 
16931821         frame.getContentPane().setLayout(new BorderLayout());
16941822         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
16961824         //worldPane.add(bigPanel);
16971825         //worldPane.add(worldPanel);
16981826                 /**/
....@@ -2063,6 +2191,21 @@
20632191         });
20642192         presetpanel.add(bump0);
20652193         
2194
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+        borderShader.setToolTipText("Border fade");
2196
+        borderShader.addMouseListener(new MouseAdapter()
2197
+        {
2198
+            public void mouseClicked(MouseEvent e)
2199
+            {
2200
+                borderfadeField.setFloat(0.5);
2201
+                opacityField.setFloat(0.75);
2202
+
2203
+                materialtouched = true;
2204
+                applySelf();
2205
+            }
2206
+        });
2207
+        presetpanel.add(borderShader);
2208
+        
20662209         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20672210         halo.setToolTipText("Halo");
20682211         halo.addMouseListener(new MouseAdapter()
....@@ -2101,6 +2244,25 @@
21012244             }
21022245         });
21032246         presetpanel.add(candle);
2247
+        
2248
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2249
+        shadowShader.setToolTipText("Shadow");
2250
+        shadowShader.addMouseListener(new MouseAdapter()
2251
+        {
2252
+            public void mouseClicked(MouseEvent e)
2253
+            {
2254
+                diffuseField.setFloat(0.001);
2255
+                ambientField.setFloat(0.001);
2256
+                cameraField.setFloat(0.001);
2257
+                specularField.setFloat(0.001);
2258
+                fakedepthField.setFloat(0.001);
2259
+                opacityField.setFloat(0.6);
2260
+
2261
+                materialtouched = true;
2262
+                applySelf();
2263
+            }
2264
+        });
2265
+        presetpanel.add(shadowShader);
21042266         
21052267         cGridBag panel = new cGridBag().setVertical(true);
21062268         
....@@ -2151,9 +2313,20 @@
21512313 
21522314         cGridBag huepanel = new cGridBag();
21532315             cGridBag huelabel = new cGridBag();
2154
-        skin = GetLabel("icons/hue.png", false);
2155
-        skin.fit = true;
2156
-            huelabel.add(skin);
2316
+        cLabel hue = GetLabel("icons/hue.png", false);
2317
+        hue.fit = true;
2318
+        
2319
+        hue.addMouseListener(new MouseAdapter()
2320
+        {
2321
+            public void mousePressed(MouseEvent e)
2322
+            {
2323
+                int x = e.getX();
2324
+                
2325
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+            }
2327
+        });
2328
+        
2329
+            huelabel.add(hue);
21572330             huelabel.preferredWidth = 20;
21582331             huepanel.add(new cGridBag()); // Label
21592332             huepanel.add(huelabel); // Field/slider
....@@ -3429,32 +3602,8 @@
34293602 
34303603         if (multiplyToggle != null)
34313604                 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
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
34583607 
34593608         SetMaterial(mat, object.projectedVertices);
34603609     }
....@@ -3574,6 +3723,17 @@
35743723     public void itemStateChanged(ItemEvent event)
35753724     {
35763725         //                   System.out.println("Propagate = " + propagate);
3726
+        if (event.getSource() == pinButton)
3727
+        {
3728
+            copy.pinned ^= true;
3729
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3730
+            {
3731
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3732
+                copy.CloseUI();
3733
+                //copy.editWindow.refreshContents();
3734
+            }
3735
+        }
3736
+        else
35773737         if (event.getSource() == propagateToggle)
35783738         {
35793739             propagate ^= true;
....@@ -4046,7 +4206,7 @@
40464206     {
40474207         //Save(true);
40484208         Replace();
4049
-        SetUndoStates();
4209
+        SetVersionStates();
40504210     }
40514211     
40524212     private boolean Equal(byte[] compress, byte[] name)
....@@ -4076,17 +4236,17 @@
40764236         
40774237         CopyChanged();
40784238         
4079
-        SetUndoStates();
4239
+        SetVersionStates();
40804240     }
40814241     
40824242     public boolean Save(boolean user)
40834243     {
40844244         System.err.println("Save");
4085
-        //Replace();
4245
+        Replace();
40864246         
4087
-        cRadio tab = GetCurrentTab();
4247
+        //cRadio tab = GetCurrentTab();
40884248         
4089
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4249
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
40904250         
40914251         boolean thesame = false;
40924252         
....@@ -4122,7 +4282,7 @@
41224282 //            copy.versionlist[i] = null;
41234283 //        }
41244284 
4125
-        SetUndoStates();
4285
+        SetVersionStates();
41264286         
41274287         // test save
41284288         if (false)
....@@ -4180,9 +4340,9 @@
41804340 
41814341     void CopyChanged()
41824342     {
4183
-        Object3D obj = copy.versionlist[copy.versionindex];
4343
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
41844344         
4185
-        SetUndoStates();
4345
+        SetVersionStates();
41864346         
41874347         boolean temp = CameraPane.SWITCH;
41884348         CameraPane.SWITCH = false;
....@@ -4249,12 +4409,15 @@
42494409         return count;
42504410     }
42514411     
4252
-    void SetUndoStates()
4412
+    void SetVersionStates()
42534413     {
4254
-        cRadio tab = GetCurrentTab();
4414
+        //if (true)
4415
+        //    return;
4416
+                    
4417
+        //cRadio tab = GetCurrentTab();
42554418         
4256
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4257
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4419
+        restoreButton.setEnabled(copy.versionindex != -1);
4420
+        replaceButton.setEnabled(copy.versionindex != -1);
42584421         
42594422         previousVersionButton.setEnabled(copy.versionindex > 0);
42604423         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4263,8 +4426,10 @@
42634426                                         copy.versionlist[copy.versionindex + 1] != null);
42644427         
42654428         muteSlider = true;
4429
+        versionSlider.setMinimum(0);
42664430         versionSlider.setMaximum(VersionCount() - 1);
42674431         versionSlider.setInteger(copy.versionindex);
4432
+        versionSlider.setEnabled(copy.versionindex != -1);
42684433         muteSlider = false;
42694434     }
42704435     
....@@ -4275,7 +4440,7 @@
42754440         
42764441         System.err.println("Undo");
42774442         
4278
-        cRadio tab = GetCurrentTab();
4443
+        //cRadio tab = GetCurrentTab();
42794444         
42804445         if (copy.versionindex == 0)
42814446         {
....@@ -4307,7 +4472,7 @@
43074472     {
43084473         System.err.println("Restore");
43094474         
4310
-        cRadio tab = GetCurrentTab();
4475
+        //cRadio tab = GetCurrentTab();
43114476         
43124477         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43134478         {
....@@ -4325,7 +4490,7 @@
43254490     {
43264491         System.err.println("Replace");
43274492         
4328
-        cRadio tab = GetCurrentTab();
4493
+        //cRadio tab = GetCurrentTab();
43294494         
43304495         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43314496         {
....@@ -4333,7 +4498,7 @@
43334498             return false;
43344499         }
43354500 
4336
-        copy.versionlist[copy.versionindex] = CompressCopy();
4501
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43374502         
43384503         return true;
43394504     }
....@@ -4343,7 +4508,7 @@
43434508         // Option?
43444509         Replace();
43454510         
4346
-        cRadio tab = GetCurrentTab();
4511
+        //cRadio tab = GetCurrentTab();
43474512         
43484513         if (copy.versionlist[copy.versionindex + 1] == null)
43494514         {
....@@ -4662,9 +4827,11 @@
46624827             if (muteSlider)
46634828                 return;
46644829             
4830
+            Replace();
4831
+            
46654832             int version = versionSlider.getInteger();
46664833             
4667
-            if (copy.versionlist[version] != null)
4834
+            if (version != -1 && copy.versionlist[version] != null)
46684835             {
46694836                 copy.versionindex = version;
46704837                 CopyChanged();
....@@ -4708,7 +4875,7 @@
47084875             //System.out.println("stateChanged = " + this);
47094876             materialtouched = true;
47104877             
4711
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4878
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47124879             {
47134880                 saturationField.setFloat(1);
47144881             }
....@@ -5023,7 +5190,9 @@
50235190         }
50245191         
50255192         if (previousVersionButton != null && copy.versionlist != null)
5026
-            SetUndoStates();
5193
+            SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
50275196     }
50285197     
50295198     static TweenManager tweenManager = new TweenManager();
....@@ -5055,7 +5224,7 @@
50555224 //                group = (Composite) group.get(0);
50565225 //            }
50575226 
5058
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
50595228 
50605229         /*
50615230         if (deselect && jList != null)
....@@ -5412,8 +5581,11 @@
54125581             
54135582         if (copy.versionlist == null)
54145583         {
5584
+            // Backward compatibility
54155585             copy.versionlist = new Object3D[100];
54165586             copy.versionindex = -1;
5587
+            
5588
+            //Save(true);
54175589         }
54185590         
54195591             //? SetUndoStates();
....@@ -5505,6 +5677,8 @@
55055677 
55065678     void save()
55075679     {
5680
+        Replace();
5681
+        
55085682         if (lastname == null)
55095683         {
55105684             return;
....@@ -5747,6 +5921,7 @@
57475921     ButtonGroup buttonGroup;
57485922     
57495923     cGridBag toolboxPanel;
5924
+    cGridBag skyboxPanel;
57505925     cGridBag materialPanel;
57515926     cGridBag ctrlPanel;
57525927     
....@@ -5851,6 +6026,7 @@
58516026     cNumberSlider anisoField;
58526027     JLabel anisoVLabel;
58536028     cNumberSlider anisoVField;
6029
+    
58546030     JLabel cameraLabel;
58556031     cNumberSlider cameraField;
58566032     JLabel selfshadowLabel;
....@@ -5865,6 +6041,7 @@
58656041     cNumberSlider fakedepthField;
58666042     JLabel shadowbiasLabel;
58676043     cNumberSlider shadowbiasField;
6044
+    
58686045     JLabel bumpLabel;
58696046     cNumberSlider bumpField;
58706047     JLabel noiseLabel;