blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 ObjEditor.java
....@@ -43,6 +43,35 @@
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
+
4675     public cGridBag GetSeparator()
4776     {
4877         cGridBag separator = new cGridBag();
....@@ -75,8 +104,16 @@
75104         return new cCheckBox(icon, border);
76105     }
77106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
78109     ImageIcon GetIcon(String name)
79110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
80117         try
81118         {
82119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -94,10 +131,14 @@
94131 //            }
95132 
96133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
97137             return icon;
98138         }
99139         catch (Exception e)
100140         {
141
+            //icons.put(name, null);
101142             return null;
102143         }
103144     }
....@@ -297,11 +338,13 @@
297338         client = inClient;
298339         copy = client;
299340 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
305348         
306349         // "this" is not called: SetupUI2(objEditor);
307350     }
....@@ -320,6 +363,8 @@
320363         {
321364             copy.versionlist = new Object3D[100];
322365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
323368         }
324369         
325370         SetupUI2(callee.GetEditor());
....@@ -343,7 +388,8 @@
343388         //parent = p;
344389 
345390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347393         //gd.setFullScreenWindow(this);
348394         //setResizable(false);
349395         //if (!isDisplayable())
....@@ -354,11 +400,13 @@
354400         copy = localCopy;
355401         copy.editWindow = this;
356402 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
360406 //            copy.versionindex = -1;
361
-        }
407
+//            
408
+//            Save(true);
409
+//        }
362410         
363411         SetupMenu();
364412 
....@@ -427,6 +475,8 @@
427475         
428476         ChangeListener changeListener = new ChangeListener()
429477         {
478
+            //String name;
479
+            
430480             public void stateChanged(ChangeEvent changeEvent)
431481             {
432482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +495,37 @@
445495 //                        EditSelection(false);
446496 //                }
447497 
448
-                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();
449529             }
450530         };
451531         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +834,7 @@
754834         boolean maximized;
755835     
756836         cButton fullscreenLayout;
837
+        cButton expandedLayout;
757838 
758839         void Minimize()
759840         {
....@@ -793,10 +874,12 @@
793874 	cButton minButton;
794875 	cButton maxButton;
795876 	cButton fullButton;
877
+	cButton collapseButton;
878
+        cButton maximize3DButton;
796879         
797880         void ToggleFullScreen()
798881         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800883 
801884                 cameraView.ToggleFullScreen();
802885                 
....@@ -817,13 +900,13 @@
817900 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818901 // X                   framePanel.add(bigThree);
819902 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
903
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821904                     
822905                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
906
+//                    radio.layout = keepButton;
824907                     //theFrame = null;
825908                     keepButton = null;
826
-                    radio.layout.doClick();
909
+//                    radio.layout.doClick();
827910                     
828911                 } else
829912                 {
....@@ -844,10 +927,10 @@
844927 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845928 // X                   framePanel.remove(bigThree);
846929 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
930
+//                    framePanel.setDividerLocation(0);
848931 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
932
+//                    radio.layout = fullscreenLayout;
933
+//                    radio.layout.doClick();
851934                     //frame.setVisible(true);
852935                 }
853936             frame.validate();
....@@ -855,23 +938,37 @@
855938             cameraView.requestFocusInWindow();
856939         }
857940 
858
-    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)
859950     {
860951         boolean temp = CameraPane.SWITCH;
861952         CameraPane.SWITCH = false;
862953         
863
-        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);
864958         // if (copy == client)
865959         
866
-        Object3D versions[] = copy.versionlist;
867
-        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;
868964         
869965         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
966
+        Object3D compress = (Object3D)Grafreed.clone(object);
871967         
872
-        copy.versionlist = versions;
968
+        object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
873970         
874
-        copy.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875972         
876973         CameraPane.SWITCH = temp;
877974         
....@@ -1233,14 +1330,14 @@
12331330             
12341331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12351332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
12361335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12371336                 selectableCB.setToolTipText("Make object selectable");
12381337 //            Return();
12391338                 
12401339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12411340                 hideCB.setToolTipText("Hide object");
1242
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243
-        markCB.setToolTipText("As animation target transform");
12441341         
12451342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12461343         
....@@ -1442,6 +1539,7 @@
14421539 
14431540         if (cam == null || !(copy.get(0) instanceof cGroup))
14441541         {
1542
+        if (Globals.DEBUG)
14451543             System.out.println("CREATE CAMERAS");
14461544             cams = new cTemplate();
14471545             cams.name = "Cameras";
....@@ -1567,14 +1665,14 @@
15671665 
15681666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15691667         //tmp.setName("Edit");
1570
-        objectPanel.add(materialPanel);
1571
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572
-        objectPanel.setToolTipTextAt(0, "Material");
1573
-    
15741668         objectPanel.add(toolboxPanel);
1575
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15771671 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
15781676         objectPanel.add(skyboxPanel);
15791677         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15801678         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1628,9 +1726,9 @@
16281726         scenePanel.add(tabbedPane);
16291727 
16301728         //if (Globals.ADVANCED)
1631
-            tabbedPane.add(infoPanel);
1632
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
-        tabbedPane.setToolTipTextAt(3, "Information");
1729
+//            tabbedPane.add(infoPanel);
1730
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731
+//        tabbedPane.setToolTipTextAt(3, "Information");
16341732         
16351733         /*
16361734         cTree jTree = new cTree(null);
....@@ -1702,6 +1800,23 @@
17021800 //		aConstraints.gridheight = 1;
17031801 
17041802         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
+
17051820         framePanel.setContinuousLayout(false);
17061821         framePanel.setOneTouchExpandable(false);
17071822         //.setDividerLocation(0.8);
....@@ -1711,7 +1826,7 @@
17111826 
17121827         frame.getContentPane().setLayout(new BorderLayout());
17131828         /**/
1714
-        JTabbedPane worldPane = new JTabbedPane();
1829
+        //JTabbedPane worldPane = new JTabbedPane();
17151830         //worldPane.add(bigPanel);
17161831         //worldPane.add(worldPanel);
17171832                 /**/
....@@ -2082,6 +2197,21 @@
20822197         });
20832198         presetpanel.add(bump0);
20842199         
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
+        
20852215         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20862216         halo.setToolTipText("Halo");
20872217         halo.addMouseListener(new MouseAdapter()
....@@ -2120,6 +2250,25 @@
21202250             }
21212251         });
21222252         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);
21232272         
21242273         cGridBag panel = new cGridBag().setVertical(true);
21252274         
....@@ -2170,9 +2319,20 @@
21702319 
21712320         cGridBag huepanel = new cGridBag();
21722321             cGridBag huelabel = new cGridBag();
2173
-        skin = GetLabel("icons/hue.png", false);
2174
-        skin.fit = true;
2175
-            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);
21762336             huelabel.preferredWidth = 20;
21772337             huepanel.add(new cGridBag()); // Label
21782338             huepanel.add(huelabel); // Field/slider
....@@ -3448,32 +3608,8 @@
34483608 
34493609         if (multiplyToggle != null)
34503610                 multiplyToggle.setSelected(mat.multiply);
3451
-
3452
-        assert (object.projectedVertices != null);
3453
-
3454
-        if (object.projectedVertices.length <= 2)
3455
-        {
3456
-            // Side effect...
3457
-            Object3D.cVector2[] keep = object.projectedVertices;
3458
-            object.projectedVertices = new Object3D.cVector2[3];
3459
-            for (int i = 0; i < 3; i++)
3460
-            {
3461
-                if (i < keep.length)
3462
-                {
3463
-                    object.projectedVertices[i] = keep[i];
3464
-                } else
3465
-                {
3466
-                    object.projectedVertices[i] = new Object3D.cVector2();
3467
-                }
3468
-                /*
3469
-                if(keep.length == 0)
3470
-                object.projectedVertices[0] = new Object3D.cVector2();
3471
-                else
3472
-                object.projectedVertices[0] = keep[0];
3473
-                object.projectedVertices[1] = new Object3D.cVector2();
3474
-                 */
3475
-            }
3476
-        }
3611
+        
3612
+        AllocProjectedVertices(object);
34773613 
34783614         SetMaterial(mat, object.projectedVertices);
34793615     }
....@@ -3783,7 +3919,7 @@
37833919             //System.out.println("ObjEditor " + event);
37843920             applySelf0(true);
37853921             //parent.applySelf();
3786
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
37873923         } else if (source == resetButton)
37883924         {
37893925             CameraPane.fullreset = true;
....@@ -4076,7 +4212,7 @@
40764212     {
40774213         //Save(true);
40784214         Replace();
4079
-        SetUndoStates();
4215
+        SetVersionStates();
40804216     }
40814217     
40824218     private boolean Equal(byte[] compress, byte[] name)
....@@ -4095,8 +4231,6 @@
40954231         return true;
40964232     }
40974233 
4098
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099
-    
41004234     void DeleteVersion()
41014235     {
41024236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4104,19 +4238,23 @@
41044238             copy.versionlist[i] = copy.versionlist[i+1];
41054239         }
41064240         
4107
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
41084243         
4109
-        SetUndoStates();
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
4246
+        
4247
+        SetVersionStates();
41104248     }
41114249     
41124250     public boolean Save(boolean user)
41134251     {
41144252         System.err.println("Save");
4115
-        //Replace();
4253
+        Replace();
41164254         
4117
-        cRadio tab = GetCurrentTab();
4255
+        //cRadio tab = GetCurrentTab();
41184256         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4257
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204258         
41214259         boolean thesame = false;
41224260         
....@@ -4152,7 +4290,7 @@
41524290 //            copy.versionlist[i] = null;
41534291 //        }
41544292 
4155
-        SetUndoStates();
4293
+        SetVersionStates();
41564294         
41574295         // test save
41584296         if (false)
....@@ -4210,14 +4348,14 @@
42104348 
42114349     void CopyChanged()
42124350     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4351
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144352         
4215
-        SetUndoStates();
4353
+        SetVersionStates();
42164354         
42174355         boolean temp = CameraPane.SWITCH;
42184356         CameraPane.SWITCH = false;
42194357         
4220
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42214359         
42224360         copy.clear();
42234361         
....@@ -4229,7 +4367,7 @@
42294367             copy.add(obj.get(i));
42304368         }
42314369         
4232
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42334371         
42344372         CameraPane.SWITCH = temp;
42354373         
....@@ -4279,22 +4417,27 @@
42794417         return count;
42804418     }
42814419     
4282
-    void SetUndoStates()
4420
+    void SetVersionStates()
42834421     {
4284
-        cRadio tab = GetCurrentTab();
4422
+        //if (true)
4423
+        //    return;
4424
+                    
4425
+        //cRadio tab = GetCurrentTab();
42854426         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4427
+        restoreButton.setEnabled(copy.versionindex != -1);
4428
+        replaceButton.setEnabled(copy.versionindex != -1);
42884429         
42894430         previousVersionButton.setEnabled(copy.versionindex > 0);
42904431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
42914432         
4292
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
42944435         
42954436         muteSlider = true;
4437
+        versionSlider.setMinimum(0);
42964438         versionSlider.setMaximum(VersionCount() - 1);
42974439         versionSlider.setInteger(copy.versionindex);
4440
+        versionSlider.setEnabled(copy.versionindex != -1);
42984441         muteSlider = false;
42994442     }
43004443     
....@@ -4305,7 +4448,7 @@
43054448         
43064449         System.err.println("Undo");
43074450         
4308
-        cRadio tab = GetCurrentTab();
4451
+        //cRadio tab = GetCurrentTab();
43094452         
43104453         if (copy.versionindex == 0)
43114454         {
....@@ -4337,7 +4480,7 @@
43374480     {
43384481         System.err.println("Restore");
43394482         
4340
-        cRadio tab = GetCurrentTab();
4483
+        //cRadio tab = GetCurrentTab();
43414484         
43424485         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434486         {
....@@ -4353,9 +4496,9 @@
43534496 
43544497     public boolean Replace()
43554498     {
4356
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
43574500         
4358
-        cRadio tab = GetCurrentTab();
4501
+        //cRadio tab = GetCurrentTab();
43594502         
43604503         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614504         {
....@@ -4363,7 +4506,7 @@
43634506             return false;
43644507         }
43654508 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4509
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674510         
43684511         return true;
43694512     }
....@@ -4373,7 +4516,7 @@
43734516         // Option?
43744517         Replace();
43754518         
4376
-        cRadio tab = GetCurrentTab();
4519
+        //cRadio tab = GetCurrentTab();
43774520         
43784521         if (copy.versionlist[copy.versionindex + 1] == null)
43794522         {
....@@ -4692,9 +4835,11 @@
46924835             if (muteSlider)
46934836                 return;
46944837             
4838
+            Replace();
4839
+            
46954840             int version = versionSlider.getInteger();
46964841             
4697
-            if (copy.versionlist[version] != null)
4842
+            if (version != -1 && copy.versionlist[version] != null)
46984843             {
46994844                 copy.versionindex = version;
47004845                 CopyChanged();
....@@ -4738,7 +4883,7 @@
47384883             //System.out.println("stateChanged = " + this);
47394884             materialtouched = true;
47404885             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4886
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424887             {
47434888                 saturationField.setFloat(1);
47444889             }
....@@ -5053,7 +5198,9 @@
50535198         }
50545199         
50555200         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5201
+            SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
50575204     }
50585205     
50595206     static TweenManager tweenManager = new TweenManager();
....@@ -5085,7 +5232,7 @@
50855232 //                group = (Composite) group.get(0);
50865233 //            }
50875234 
5088
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
50895236 
50905237         /*
50915238         if (deselect && jList != null)
....@@ -5439,11 +5586,15 @@
54395586 
54405587             copy.versionlist = readobj.versionlist;
54415588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
54425590             
54435591         if (copy.versionlist == null)
54445592         {
5593
+            // Backward compatibility
54455594             copy.versionlist = new Object3D[100];
54465595             copy.versionindex = -1;
5596
+            
5597
+            //Save(true);
54475598         }
54485599         
54495600             //? SetUndoStates();
....@@ -5535,6 +5686,8 @@
55355686 
55365687     void save()
55375688     {
5689
+        Replace();
5690
+        
55385691         if (lastname == null)
55395692         {
55405693             return;
....@@ -5882,6 +6035,7 @@
58826035     cNumberSlider anisoField;
58836036     JLabel anisoVLabel;
58846037     cNumberSlider anisoVField;
6038
+    
58856039     JLabel cameraLabel;
58866040     cNumberSlider cameraField;
58876041     JLabel selfshadowLabel;
....@@ -5896,6 +6050,7 @@
58966050     cNumberSlider fakedepthField;
58976051     JLabel shadowbiasLabel;
58986052     cNumberSlider shadowbiasField;
6053
+    
58996054     JLabel bumpLabel;
59006055     cNumberSlider bumpField;
59016056     JLabel noiseLabel;