blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 ecc1309a04b527c62ffe97e814daf050dbd025cd 
 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 
....@@ -378,6 +426,9 @@
378426 
379427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
381432     void SetupMenu()
382433     {
383434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -427,6 +478,8 @@
427478         
428479         ChangeListener changeListener = new ChangeListener()
429480         {
481
+            //String name;
482
+            
430483             public void stateChanged(ChangeEvent changeEvent)
431484             {
432485 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +498,37 @@
445498 //                        EditSelection(false);
446499 //                }
447500 
448
-                refreshContents(false); // To refresh Info tab
501
+//                if (objectPanel.getSelectedIndex() == 4)
502
+//                {
503
+//                    name = copy.skyboxname;
504
+//                    
505
+//                    if (name == null)
506
+//                    {
507
+//                        name = "";
508
+//                    }
509
+//                    
510
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
511
+//                    copy.skyboxext = "jpg";
512
+//                }
513
+//                else
514
+//                {
515
+//                    if (name != null)
516
+//                    {
517
+//                        if (name.equals(""))
518
+//                        {
519
+//                            copy.skyboxname = null;
520
+//                            copy.skyboxext = null;
521
+//                        }
522
+//                        else
523
+//                        {
524
+//                            copy.skyboxname = name;
525
+//                        }
526
+//                    }
527
+//                }
528
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
529
+                
530
+//                refreshContents(false); // To refresh Info tab
531
+                cameraView.repaint();
449532             }
450533         };
451534         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +837,7 @@
754837         boolean maximized;
755838     
756839         cButton fullscreenLayout;
840
+        cButton expandedLayout;
757841 
758842         void Minimize()
759843         {
....@@ -793,10 +877,12 @@
793877 	cButton minButton;
794878 	cButton maxButton;
795879 	cButton fullButton;
880
+	cButton collapseButton;
881
+        cButton maximize3DButton;
796882         
797883         void ToggleFullScreen()
798884         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
885
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800886 
801887                 cameraView.ToggleFullScreen();
802888                 
....@@ -817,13 +903,13 @@
817903 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818904 // X                   framePanel.add(bigThree);
819905 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
906
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821907                     
822908                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
909
+//                    radio.layout = keepButton;
824910                     //theFrame = null;
825911                     keepButton = null;
826
-                    radio.layout.doClick();
912
+//                    radio.layout.doClick();
827913                     
828914                 } else
829915                 {
....@@ -844,10 +930,10 @@
844930 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845931 // X                   framePanel.remove(bigThree);
846932 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
933
+//                    framePanel.setDividerLocation(0);
848934 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
935
+//                    radio.layout = fullscreenLayout;
936
+//                    radio.layout.doClick();
851937                     //frame.setVisible(true);
852938                 }
853939             frame.validate();
....@@ -855,23 +941,37 @@
855941             cameraView.requestFocusInWindow();
856942         }
857943 
858
-    private Object3D CompressCopy()
944
+        void CollapseToolbar()
945
+        {
946
+            framePanel.setDividerLocation(0);
947
+            //frame.validate();
948
+            
949
+            cameraView.requestFocusInWindow();
950
+        }
951
+        
952
+    private Object3D Duplicate(Object3D object)
859953     {
860954         boolean temp = CameraPane.SWITCH;
861955         CameraPane.SWITCH = false;
862956         
863
-        copy.ExtractBigData(versiontable);
957
+        if (Grafreed.grafreed.universe.versiontable == null)
958
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
959
+         
960
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
864961         // if (copy == client)
865962         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
963
+        Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
965
+        object.versionlist = null;
966
+        object.versiontable = null;
868967         
869968         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
969
+        Object3D compress = (Object3D)Grafreed.clone(object);
871970         
872
-        copy.versionlist = versions;
971
+        object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
873973         
874
-        copy.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875975         
876976         CameraPane.SWITCH = temp;
877977         
....@@ -1233,14 +1333,14 @@
12331333             
12341334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12351335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12361338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12371339                 selectableCB.setToolTipText("Make object selectable");
12381340 //            Return();
12391341                 
12401342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12411343                 hideCB.setToolTipText("Hide object");
1242
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243
-        markCB.setToolTipText("As animation target transform");
12441344         
12451345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12461346         
....@@ -1442,6 +1542,7 @@
14421542 
14431543         if (cam == null || !(copy.get(0) instanceof cGroup))
14441544         {
1545
+        if (Globals.DEBUG)
14451546             System.out.println("CREATE CAMERAS");
14461547             cams = new cTemplate();
14471548             cams.name = "Cameras";
....@@ -1567,14 +1668,14 @@
15671668 
15681669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15691670         //tmp.setName("Edit");
1570
-        objectPanel.add(materialPanel);
1571
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572
-        objectPanel.setToolTipTextAt(0, "Material");
1573
-    
15741671         objectPanel.add(toolboxPanel);
1575
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15771674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
15781679         objectPanel.add(skyboxPanel);
15791680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15801681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1591,6 +1692,10 @@
15911692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
15921693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15931694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
15941699         /*
15951700         aConstraints.gridx = 0;
15961701         aConstraints.gridwidth = 1;
....@@ -1628,9 +1733,9 @@
16281733         scenePanel.add(tabbedPane);
16291734 
16301735         //if (Globals.ADVANCED)
1631
-            tabbedPane.add(infoPanel);
1632
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
-        tabbedPane.setToolTipTextAt(3, "Information");
1736
+//            tabbedPane.add(infoPanel);
1737
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
+//        tabbedPane.setToolTipTextAt(3, "Information");
16341739         
16351740         /*
16361741         cTree jTree = new cTree(null);
....@@ -1702,6 +1807,23 @@
17021807 //		aConstraints.gridheight = 1;
17031808 
17041809         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1810
+        
1811
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1812
+                new java.beans.PropertyChangeListener()
1813
+                {
1814
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1815
+                    {
1816
+                        if ((Integer)pce.getOldValue() == 1)
1817
+                        {
1818
+                            if (radio.layout != expandedLayout)
1819
+                            {
1820
+                                radio.layout = expandedLayout;
1821
+                                radio.layout.doClick();
1822
+                            }
1823
+                        }
1824
+                    }
1825
+                });
1826
+
17051827         framePanel.setContinuousLayout(false);
17061828         framePanel.setOneTouchExpandable(false);
17071829         //.setDividerLocation(0.8);
....@@ -1711,7 +1833,7 @@
17111833 
17121834         frame.getContentPane().setLayout(new BorderLayout());
17131835         /**/
1714
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
17151837         //worldPane.add(bigPanel);
17161838         //worldPane.add(worldPanel);
17171839                 /**/
....@@ -1771,7 +1893,15 @@
17711893                 
17721894                 // Skin
17731895                 colorField.setFloat(material.color);
1774
-                saturationField.setFloat(material.modulation);
1896
+                float saturation = material.modulation;
1897
+                
1898
+                if (!cameraView.Skinshader)
1899
+                {
1900
+                    saturation /= 1.5;
1901
+                }
1902
+                
1903
+                saturationField.setFloat(saturation);
1904
+                
17751905                 subsurfaceField.setFloat(material.subsurface);
17761906                 selfshadowField.setFloat(material.diffuseness);
17771907                 diffusenessField.setFloat(material.factor);
....@@ -2082,6 +2212,21 @@
20822212         });
20832213         presetpanel.add(bump0);
20842214         
2215
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2216
+        borderShader.setToolTipText("Border fade");
2217
+        borderShader.addMouseListener(new MouseAdapter()
2218
+        {
2219
+            public void mouseClicked(MouseEvent e)
2220
+            {
2221
+                borderfadeField.setFloat(0.5);
2222
+                opacityField.setFloat(0.75);
2223
+
2224
+                materialtouched = true;
2225
+                applySelf();
2226
+            }
2227
+        });
2228
+        presetpanel.add(borderShader);
2229
+        
20852230         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20862231         halo.setToolTipText("Halo");
20872232         halo.addMouseListener(new MouseAdapter()
....@@ -2120,6 +2265,25 @@
21202265             }
21212266         });
21222267         presetpanel.add(candle);
2268
+        
2269
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2270
+        shadowShader.setToolTipText("Shadow");
2271
+        shadowShader.addMouseListener(new MouseAdapter()
2272
+        {
2273
+            public void mouseClicked(MouseEvent e)
2274
+            {
2275
+                diffuseField.setFloat(0.001);
2276
+                ambientField.setFloat(0.001);
2277
+                cameraField.setFloat(0.001);
2278
+                specularField.setFloat(0.001);
2279
+                fakedepthField.setFloat(0.001);
2280
+                opacityField.setFloat(0.6);
2281
+
2282
+                materialtouched = true;
2283
+                applySelf();
2284
+            }
2285
+        });
2286
+        presetpanel.add(shadowShader);
21232287         
21242288         cGridBag panel = new cGridBag().setVertical(true);
21252289         
....@@ -2170,9 +2334,20 @@
21702334 
21712335         cGridBag huepanel = new cGridBag();
21722336             cGridBag huelabel = new cGridBag();
2173
-        skin = GetLabel("icons/hue.png", false);
2174
-        skin.fit = true;
2175
-            huelabel.add(skin);
2337
+        cLabel hue = GetLabel("icons/hue.png", false);
2338
+        hue.fit = true;
2339
+        
2340
+        hue.addMouseListener(new MouseAdapter()
2341
+        {
2342
+            public void mousePressed(MouseEvent e)
2343
+            {
2344
+                int x = e.getX();
2345
+                
2346
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2347
+            }
2348
+        });
2349
+        
2350
+            huelabel.add(hue);
21762351             huelabel.preferredWidth = 20;
21772352             huepanel.add(new cGridBag()); // Label
21782353             huepanel.add(huelabel); // Field/slider
....@@ -3448,32 +3623,8 @@
34483623 
34493624         if (multiplyToggle != null)
34503625                 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
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
34773628 
34783629         SetMaterial(mat, object.projectedVertices);
34793630     }
....@@ -3783,7 +3934,7 @@
37833934             //System.out.println("ObjEditor " + event);
37843935             applySelf0(true);
37853936             //parent.applySelf();
3786
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
37873938         } else if (source == resetButton)
37883939         {
37893940             CameraPane.fullreset = true;
....@@ -4076,7 +4227,7 @@
40764227     {
40774228         //Save(true);
40784229         Replace();
4079
-        SetUndoStates();
4230
+        SetVersionStates();
40804231     }
40814232     
40824233     private boolean Equal(byte[] compress, byte[] name)
....@@ -4095,8 +4246,6 @@
40954246         return true;
40964247     }
40974248 
4098
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099
-    
41004249     void DeleteVersion()
41014250     {
41024251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4104,19 +4253,23 @@
41044253             copy.versionlist[i] = copy.versionlist[i+1];
41054254         }
41064255         
4107
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
41084258         
4109
-        SetUndoStates();
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
4261
+        
4262
+        SetVersionStates();
41104263     }
41114264     
41124265     public boolean Save(boolean user)
41134266     {
41144267         System.err.println("Save");
4115
-        //Replace();
4268
+        Replace();
41164269         
4117
-        cRadio tab = GetCurrentTab();
4270
+        //cRadio tab = GetCurrentTab();
41184271         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4272
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204273         
41214274         boolean thesame = false;
41224275         
....@@ -4152,7 +4305,7 @@
41524305 //            copy.versionlist[i] = null;
41534306 //        }
41544307 
4155
-        SetUndoStates();
4308
+        SetVersionStates();
41564309         
41574310         // test save
41584311         if (false)
....@@ -4210,14 +4363,14 @@
42104363 
42114364     void CopyChanged()
42124365     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4366
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144367         
4215
-        SetUndoStates();
4368
+        SetVersionStates();
42164369         
42174370         boolean temp = CameraPane.SWITCH;
42184371         CameraPane.SWITCH = false;
42194372         
4220
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42214374         
42224375         copy.clear();
42234376         
....@@ -4229,7 +4382,7 @@
42294382             copy.add(obj.get(i));
42304383         }
42314384         
4232
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42334386         
42344387         CameraPane.SWITCH = temp;
42354388         
....@@ -4279,22 +4432,27 @@
42794432         return count;
42804433     }
42814434     
4282
-    void SetUndoStates()
4435
+    void SetVersionStates()
42834436     {
4284
-        cRadio tab = GetCurrentTab();
4437
+        //if (true)
4438
+        //    return;
4439
+                    
4440
+        //cRadio tab = GetCurrentTab();
42854441         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4442
+        restoreButton.setEnabled(copy.versionindex != -1);
4443
+        replaceButton.setEnabled(copy.versionindex != -1);
42884444         
42894445         previousVersionButton.setEnabled(copy.versionindex > 0);
42904446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
42914447         
4292
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
42944450         
42954451         muteSlider = true;
4452
+        versionSlider.setMinimum(0);
42964453         versionSlider.setMaximum(VersionCount() - 1);
42974454         versionSlider.setInteger(copy.versionindex);
4455
+        versionSlider.setEnabled(copy.versionindex != -1);
42984456         muteSlider = false;
42994457     }
43004458     
....@@ -4305,7 +4463,7 @@
43054463         
43064464         System.err.println("Undo");
43074465         
4308
-        cRadio tab = GetCurrentTab();
4466
+        //cRadio tab = GetCurrentTab();
43094467         
43104468         if (copy.versionindex == 0)
43114469         {
....@@ -4337,7 +4495,7 @@
43374495     {
43384496         System.err.println("Restore");
43394497         
4340
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
43414499         
43424500         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434501         {
....@@ -4353,9 +4511,9 @@
43534511 
43544512     public boolean Replace()
43554513     {
4356
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
43574515         
4358
-        cRadio tab = GetCurrentTab();
4516
+        //cRadio tab = GetCurrentTab();
43594517         
43604518         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614519         {
....@@ -4363,7 +4521,7 @@
43634521             return false;
43644522         }
43654523 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4524
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674525         
43684526         return true;
43694527     }
....@@ -4373,7 +4531,7 @@
43734531         // Option?
43744532         Replace();
43754533         
4376
-        cRadio tab = GetCurrentTab();
4534
+        //cRadio tab = GetCurrentTab();
43774535         
43784536         if (copy.versionlist[copy.versionindex + 1] == null)
43794537         {
....@@ -4692,9 +4850,11 @@
46924850             if (muteSlider)
46934851                 return;
46944852             
4853
+            Replace();
4854
+            
46954855             int version = versionSlider.getInteger();
46964856             
4697
-            if (copy.versionlist[version] != null)
4857
+            if (version != -1 && copy.versionlist[version] != null)
46984858             {
46994859                 copy.versionindex = version;
47004860                 CopyChanged();
....@@ -4738,7 +4898,7 @@
47384898             //System.out.println("stateChanged = " + this);
47394899             materialtouched = true;
47404900             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4901
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424902             {
47434903                 saturationField.setFloat(1);
47444904             }
....@@ -5053,7 +5213,9 @@
50535213         }
50545214         
50555215         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5216
+            SetVersionStates();
5217
+        
5218
+        cameraView.requestFocusInWindow();
50575219     }
50585220     
50595221     static TweenManager tweenManager = new TweenManager();
....@@ -5085,7 +5247,7 @@
50855247 //                group = (Composite) group.get(0);
50865248 //            }
50875249 
5088
-        System.out.println("makeSomething of " + thing);
5250
+        //System.out.println("makeSomething of " + thing);
50895251 
50905252         /*
50915253         if (deselect && jList != null)
....@@ -5439,11 +5601,15 @@
54395601 
54405602             copy.versionlist = readobj.versionlist;
54415603             copy.versionindex = readobj.versionindex;
5604
+            copy.versiontable = readobj.versiontable;
54425605             
54435606         if (copy.versionlist == null)
54445607         {
5608
+            // Backward compatibility
54455609             copy.versionlist = new Object3D[100];
54465610             copy.versionindex = -1;
5611
+            
5612
+            //Save(true);
54475613         }
54485614         
54495615             //? SetUndoStates();
....@@ -5535,6 +5701,8 @@
55355701 
55365702     void save()
55375703     {
5704
+        Replace();
5705
+        
55385706         if (lastname == null)
55395707         {
55405708             return;
....@@ -5882,6 +6050,7 @@
58826050     cNumberSlider anisoField;
58836051     JLabel anisoVLabel;
58846052     cNumberSlider anisoVField;
6053
+    
58856054     JLabel cameraLabel;
58866055     cNumberSlider cameraField;
58876056     JLabel selfshadowLabel;
....@@ -5896,6 +6065,7 @@
58966065     cNumberSlider fakedepthField;
58976066     JLabel shadowbiasLabel;
58986067     cNumberSlider shadowbiasField;
6068
+    
58996069     JLabel bumpLabel;
59006070     cNumberSlider bumpField;
59016071     JLabel noiseLabel;