blame | history | patch | commit | commitdiff
Normand Briere
2019-08-01 29d5516687020263d3ae0454ce81879a3a450af0 
 ObjEditor.java
....@@ -41,64 +41,78 @@
4141     JFrame frame;
4242     
4343     static ObjEditor theFrame;
44
+
45
+    public cGridBag GetSeparator()
46
+    {
47
+        cGridBag separator = new cGridBag();
48
+        separator.add(new JSeparator());
49
+        separator.preferredHeight = 5;
50
+        return separator;
51
+    }
4452     
4553     cButton GetButton(String name, boolean border)
4654     {
47
-        try
48
-        {
49
-            ImageIcon icon = GetIcon(name);
50
-            return new cButton(icon, border);
51
-        }
52
-        catch (Exception e)
53
-        {
54
-            return new cButton(name, border);
55
-        }
55
+        ImageIcon icon = GetIcon(name);
56
+        return new cButton(icon, border);
57
+    }
58
+
59
+    cLabel GetLabel(String name, boolean border)
60
+    {
61
+        //ImageIcon icon = GetIcon(name);
62
+        return new cLabel(GetImage(name), border);
5663     }
5764 
5865     cToggleButton GetToggleButton(String name, boolean border)
5966     {
60
-        try
61
-        {
62
-            ImageIcon icon = GetIcon(name);
63
-            return new cToggleButton(icon, border);
64
-        }
65
-        catch (Exception e)
66
-        {
67
-            return new cToggleButton(name, border);
68
-        }
67
+        ImageIcon icon = GetIcon(name);
68
+        return new cToggleButton(icon, border);
6969     }
7070 
7171     cCheckBox GetCheckBox(String name, boolean border)
7272     {
73
+        ImageIcon icon = GetIcon(name);
74
+        return new cCheckBox(icon, border);
75
+    }
76
+
77
+    ImageIcon GetIcon(String name)
78
+    {
7379         try
7480         {
75
-            ImageIcon icon = GetIcon(name);
76
-            return new cCheckBox(icon, border);
81
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
+
83
+//            if (image.getWidth() > 48 && image.getHeight() > 48)
84
+//            {
85
+//                BufferedImage resized = new BufferedImage(48, 48, image.getType());
86
+//                Graphics2D g = resized.createGraphics();
87
+//                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
88
+//                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
89
+//                g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
90
+//                g.dispose();
91
+//
92
+//                image = resized;
93
+//            }
94
+
95
+            javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
96
+            return icon;
7797         }
7898         catch (Exception e)
7999         {
80
-            return new cCheckBox(name, border);
100
+            return null;
81101         }
82102     }
83
-
84
-    private ImageIcon GetIcon(String name) throws IOException
103
+    
104
+    BufferedImage GetImage(String name)
85105     {
86
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-        
88
-        if (image.getWidth() != 24 && image.getHeight() != 24)
106
+        try
89107         {
90
-            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
-            Graphics2D g = resized.createGraphics();
92
-            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
-            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
-            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
-            g.dispose();
96
-            
97
-            image = resized;
108
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
109
+
110
+            return image;
98111         }
99
-        
100
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
-        return icon;
112
+        catch (Exception e)
113
+        {
114
+            return null;
115
+        }
102116     }
103117     
104118     // SCRIPT
....@@ -282,6 +296,12 @@
282296         client = inClient;
283297         copy = client;
284298 
299
+        if (copy.versions == null)
300
+        {
301
+            copy.versions = new byte[100][];
302
+            copy.versionindex = -1;
303
+        }
304
+        
285305         // "this" is not called: SetupUI2(objEditor);
286306     }
287307 
....@@ -295,6 +315,12 @@
295315         client = inClient;
296316         copy = client;
297317 
318
+        if (copy.versions == null)
319
+        {
320
+            copy.versions = new byte[100][];
321
+            copy.versionindex = -1;
322
+        }
323
+        
298324         SetupUI2(callee.GetEditor());
299325     }
300326 
....@@ -327,6 +353,12 @@
327353         copy = localCopy;
328354         copy.editWindow = this;
329355 
356
+        if (copy.versions == null)
357
+        {
358
+//            copy.versions = new byte[100][];
359
+//            copy.versionindex = -1;
360
+        }
361
+        
330362         SetupMenu();
331363 
332364         //SetupName(objEditor); // new
....@@ -419,11 +451,12 @@
419451     
420452         toolbarPanel = new JPanel();
421453         toolbarPanel.setName("Toolbar");
454
+        
422455         treePanel = new cGridBag();
423456         treePanel.setName("Tree");
424457         
425458         editPanel = new cGridBag().setVertical(true);
426
-        editPanel.setName("Edit");
459
+        //editPanel.setName("Edit");
427460         
428461         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429462         
....@@ -431,11 +464,11 @@
431464         editPanel.add(editCommandsPanel);
432465         editPanel.add(ctrlPanel);
433466                 
434
-        toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
467
+        toolboxPanel = new cGridBag().setVertical(true);
468
+        //toolboxPanel.setName("Toolbox");
436469         
437470         materialPanel = new cGridBag().setVertical(true);
438
-        materialPanel.setName("Material");
471
+        //materialPanel.setName("Material");
439472         
440473         /*JTextPane*/
441474         infoarea = createTextPane();
....@@ -443,6 +476,7 @@
443476 
444477         infoarea.setEditable(true);
445478         SetText();
479
+        
446480 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447481 //            infoarea.setOpaque(false);
448482 //            //infoarea.setForeground(textcolor);
....@@ -450,7 +484,7 @@
450484 // TEXTAREA           infoarea.setWrapStyleWord(true);
451485         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452486         infoPanel.setPreferredSize(new Dimension(1, 1));
453
-        infoPanel.setName("Info");
487
+        //infoPanel.setName("Info");
454488         //infoPanel.setLayout(new BorderLayout());
455489         //infoPanel.add(createTextPane());
456490 
....@@ -816,6 +850,28 @@
816850             frame.validate();
817851         }
818852 
853
+    private byte[] CompressCopy()
854
+    {
855
+        boolean temp = CameraPane.SWITCH;
856
+        CameraPane.SWITCH = false;
857
+        
858
+        copy.ExtractBigData(versiontable);
859
+        // if (copy == client)
860
+        
861
+        byte[] versions[] = copy.versions;
862
+        copy.versions = null;
863
+        
864
+        byte[] compress = Compress(copy);
865
+        
866
+        copy.versions = versions;
867
+        
868
+        copy.RestoreBigData(versiontable);
869
+        
870
+        CameraPane.SWITCH = temp;
871
+        
872
+        return compress;
873
+    }
874
+
819875     private JTextPane createTextPane()
820876     {
821877 // TEXTAREA       String[] initString =
....@@ -946,7 +1002,7 @@
9461002 //    NumberSlider vDivsField;
9471003 //    JCheckBox endcaps;
9481004     JCheckBox liveCB;
949
-    JCheckBox selectCB;
1005
+    JCheckBox selectableCB;
9501006     JCheckBox hideCB;
9511007     JCheckBox link2masterCB;
9521008     JCheckBox markCB;
....@@ -1158,13 +1214,16 @@
11581214             
11591215         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11601216                 liveCB.setToolTipText("Animate object");
1161
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162
-                selectCB.setToolTipText("Make object selectable");
1217
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1218
+                selectableCB.setToolTipText("Make object selectable");
11631219 //            Return();
1220
+                
11641221         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11651222                 hideCB.setToolTipText("Hide object");
11661223         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11671224         markCB.setToolTipText("As animation target transform");
1225
+        
1226
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11681227         
11691228             setupPanel2 = new cGridBag().setVertical(false);
11701229             
....@@ -1174,10 +1233,11 @@
11741233         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11751234         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11761235 
1236
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1237
+        link2masterCB.setToolTipText("Attach to support");
1238
+        
11771239         if (Globals.ADVANCED)
11781240         {
1179
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180
-                link2masterCB.setToolTipText("Attach to support");
11811241                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11821242                 speedupCB.setToolTipText("Option motion capture");
11831243         }
....@@ -1451,6 +1511,7 @@
14511511         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14521512         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14531513         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1514
+        //XYZPanel.setName("XYZ");
14541515 
14551516         /*
14561517         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1488,16 +1549,29 @@
14881549         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14891550         //tmp.setName("Edit");
14901551         objectPanel.add(materialPanel);
1552
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553
+        objectPanel.setToolTipTextAt(0, "Material panel");
1554
+    
14911555 //        JPanel north = new JPanel(new BorderLayout());
14921556 //        north.setName("Edit");
14931557 //        north.add(ctrlPanel, BorderLayout.NORTH);
14941558 //        objectPanel.add(north);
14951559         objectPanel.add(editPanel);
1560
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1561
+        objectPanel.setToolTipTextAt(1, "Edit panel");
14961562         
14971563         //if (Globals.ADVANCED)
14981564             objectPanel.add(infoPanel);
1565
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1566
+        objectPanel.setToolTipTextAt(2, "Info panel");
1567
+        
1568
+        objectPanel.add(XYZPanel);
1569
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570
+        objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
14991571         
15001572         objectPanel.add(toolboxPanel);
1573
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574
+        objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
15011575 
15021576         /*
15031577         aConstraints.gridx = 0;
....@@ -1518,7 +1592,7 @@
15181592         scrollpane.addMouseWheelListener(this); // Default not fast enough
15191593 
15201594         /*JTabbedPane*/ scenePanel = new cGridBag();
1521
-        scenePanel.preferredWidth = 6;
1595
+        scenePanel.preferredWidth = 5;
15221596         
15231597         JTabbedPane tabbedPane = new JTabbedPane();
15241598         tabbedPane.add(scrollpane);
....@@ -1596,7 +1670,7 @@
15961670         bigThree = new cGridBag();
15971671         bigThree.addComponent(scenePanel);
15981672         bigThree.addComponent(centralPanel);
1599
-        bigThree.addComponent(XYZPanel);
1673
+        //bigThree.addComponent(XYZPanel);
16001674         
16011675 //                // SIDE EFFECT!!!
16021676 //		aConstraints.gridx = 0;
....@@ -1637,7 +1711,6 @@
16371711         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16381712         frame.addWindowListener(new WindowAdapter()
16391713         {
1640
-
16411714             public void windowClosing(WindowEvent e)
16421715             {
16431716                 Close();
....@@ -1699,27 +1772,48 @@
16991772         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17001773 
17011774         cGridBag colorSection = new cGridBag().setVertical(true);
1775
+
1776
+        cGridBag huepanel = new cGridBag();
1777
+            cGridBag huelabel = new cGridBag();
1778
+            huelabel.add(GetLabel("icons/hue.png", false));
1779
+            huelabel.preferredWidth = 20;
1780
+            huepanel.add(new cGridBag()); // Label
1781
+            huepanel.add(huelabel); // Field/slider
1782
+            
1783
+        huepanel.preferredHeight = 7;
1784
+
1785
+        colorSection.add(huepanel);
17021786         
17031787         cGridBag color = new cGridBag();
1704
-                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1705
-                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706
-                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1788
+        
1789
+            color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1790
+            colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1791
+            color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1792
+
17071793         //colorField.preferredWidth = 200;
17081794         colorSection.add(color);
17091795 
17101796         cGridBag modulation = new cGridBag();
17111797                 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17121798                 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713
-                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1799
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17141800         colorSection.add(modulation);
17151801 
1802
+        cGridBag opacity = new cGridBag();
1803
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1804
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1806
+        colorSection.add(opacity);
1807
+
1808
+        colorSection.add(GetSeparator());
1809
+        
17161810         cGridBag texture = new cGridBag();
17171811                 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17181812                 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17191813                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17201814         colorSection.add(texture);
17211815 
1722
-        panel.add(new JSeparator());
1816
+        panel.add(GetSeparator());
17231817         
17241818         panel.add(colorSection);
17251819         
....@@ -1775,7 +1869,7 @@
17751869                 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17761870         diffuseSection.add(shadowbias);
17771871 
1778
-        panel.add(new JSeparator());
1872
+        panel.add(GetSeparator());
17791873         
17801874         panel.add(diffuseSection);
17811875         
....@@ -1838,7 +1932,7 @@
18381932         specularSection.add(anisoV);
18391933 
18401934 
1841
-        panel.add(new JSeparator());
1935
+        panel.add(GetSeparator());
18421936         
18431937         panel.add(specularSection);
18441938         
....@@ -1863,12 +1957,6 @@
18631957                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18641958                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18651959         colorSection.add(backlit);
1866
-
1867
-        cGridBag opacity = new cGridBag();
1868
-                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1869
-                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870
-                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1871
-        colorSection.add(opacity);
18721960 
18731961         //panel.add(new JSeparator());
18741962         
....@@ -1914,7 +2002,7 @@
19142002                 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19152003         textureSection.add(opacityPower);
19162004 
1917
-        panel.add(new JSeparator());
2005
+        panel.add(GetSeparator());
19182006         
19192007         panel.add(textureSection);
19202008         
....@@ -1979,8 +2067,9 @@
19792067             // 3D models
19802068             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19812069             {
1982
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1983
-                LoadFile(filename, lastConverter);
2070
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2071
+                //LoadFile(filename, lastConverter);
2072
+                LoadObjFile(filename); // New 3ds loader
19842073                 continue;
19852074             }
19862075             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2706,6 +2795,7 @@
27062795                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27072796                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27082797             }
2798
+            
27092799             //cJME.count++;
27102800             //cJME.count %= 12;
27112801             if (gc)
....@@ -2889,6 +2979,7 @@
28892979             }
28902980         }
28912981     }
2982
+    
28922983     cFileSystemPane FSPane;
28932984 
28942985     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2942,6 +3033,7 @@
29423033                 }
29433034             }
29443035         }
3036
+        
29453037         freezematerial = false;
29463038     }
29473039 
....@@ -3209,7 +3301,7 @@
32093301         {
32103302             copy.live ^= true;
32113303             return;
3212
-        } else if (event.getSource() == selectCB)
3304
+        } else if (event.getSource() == selectableCB)
32133305         {
32143306             copy.dontselect ^= true;
32153307             return;
....@@ -3476,8 +3568,8 @@
34763568         try
34773569         {
34783570             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3571
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3572
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34813573 
34823574         Object3D parent = o.parent;
34833575         o.parent = null;
....@@ -3488,10 +3580,14 @@
34883580         
34893581             out.flush();
34903582 
3491
-            zstream.close();
3583
+            baos //zstream
3584
+                    .close();
34923585             out.close();
34933586             
3494
-            return baos.toByteArray();
3587
+            byte[] bytes = baos.toByteArray();
3588
+            
3589
+        System.out.println("save #bytes = " + bytes.length);
3590
+            return bytes;
34953591         } catch (Exception e)
34963592         {
34973593             System.err.println(e);
....@@ -3501,13 +3597,16 @@
35013597 
35023598     static public Object Uncompress(byte[] bytes)
35033599     {
3504
-        System.out.println("#bytes = " + bytes.length);
3600
+        System.out.println("restore #bytes = " + bytes.length);
35053601         try
35063602         {
35073603             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509
-            ObjectInputStream in = new ObjectInputStream(istream);
3604
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3605
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35103606             Object obj = in.readObject();
3607
+            
3608
+            bais //istream
3609
+                    .close();
35113610             in.close();
35123611             
35133612             return obj;
....@@ -3562,33 +3661,67 @@
35623661         return null;
35633662     }
35643663     
3565
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35663664     
35673665     public void Save()
3666
+    {
3667
+        //Save(true);
3668
+        Replace();
3669
+    }
3670
+    
3671
+    private boolean Equal(byte[] compress, byte[] name)
3672
+    {
3673
+        if (compress.length != name.length)
3674
+        {
3675
+            return false;
3676
+        }
3677
+        
3678
+        for (int i=compress.length; --i>=0;)
3679
+        {
3680
+            if (compress[i] != name[i])
3681
+                return false;
3682
+        }
3683
+        
3684
+        return true;
3685
+    }
3686
+
3687
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688
+    
3689
+    public boolean Save(boolean user)
35683690     {
35693691         System.err.println("Save");
35703692         
35713693         cRadio tab = GetCurrentTab();
35723694         
3573
-        boolean temp = CameraPane.SWITCH;
3574
-        CameraPane.SWITCH = false;
3695
+        byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
35753696         
3576
-        copy.ExtractBigData(hashtable);
3697
+        boolean thesame = false;
35773698         
3578
-        byte[] compress = Compress(copy);
3699
+        // Quick heuristic using length. Works only when stream is compressed.
3700
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3701
+        {
3702
+            thesame = true;
3703
+        }
35793704         
35803705         //EditorFrame.m_MainFrame.requestFocusInWindow();
3581
-        tab.graphs[tab.undoindex++] = compress;
3706
+        if (!thesame)
3707
+        {
3708
+            //tab.user[tab.versionindex] = user;
3709
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710
+            
3711
+            copy.versions[++copy.versionindex] = compress;
3712
+            
3713
+            // if (increment)
3714
+            //     tab.versionindex++;
3715
+        }
35823716 
3583
-        copy.RestoreBigData(hashtable);
3717
+        //copy.RestoreBigData(versiontable);
35843718 
3585
-        CameraPane.SWITCH = temp;
3586
-        
35873719         //assert(hashtable.isEmpty());
35883720         
3589
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3721
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35903722         {
3591
-            tab.graphs[i] = null;
3723
+            //tab.user[i] = false;
3724
+            copy.versions[i] = null;
35923725         }
35933726 
35943727         SetUndoStates();
....@@ -3598,7 +3731,7 @@
35983731         {
35993732             try
36003733             {
3601
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3734
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36023735                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36033736 
36043737                 p.writeObject(copy);
....@@ -3611,6 +3744,8 @@
36113744                 e.printStackTrace();
36123745             }
36133746         }
3747
+        
3748
+        return !thesame;
36143749     }
36153750 
36163751     void CopyChanged(Object3D obj)
....@@ -3620,16 +3755,19 @@
36203755         boolean temp = CameraPane.SWITCH;
36213756         CameraPane.SWITCH = false;
36223757         
3623
-        copy.ExtractBigData(hashtable);
3758
+        copy.ExtractBigData(versiontable);
36243759         
36253760         copy.clear();
36263761         
3762
+        copy.skyboxname = obj.skyboxname;
3763
+        copy.skyboxext = obj.skyboxext;
3764
+                
36273765         for (int i=0; i<obj.Size(); i++)
36283766         {
36293767             copy.add(obj.get(i));
36303768         }
36313769         
3632
-        copy.RestoreBigData(hashtable);
3770
+        copy.RestoreBigData(versiontable);
36333771         
36343772         CameraPane.SWITCH = temp;
36353773         
....@@ -3657,52 +3795,129 @@
36573795     }
36583796     
36593797     cButton undoButton;
3798
+    cButton restoreButton;
3799
+    cButton replaceButton;
36603800     cButton redoButton;
36613801         
3802
+    boolean muteSlider;
3803
+    
3804
+    int VersionCount()
3805
+    {
3806
+        int count = 0;
3807
+        
3808
+        for (int i = copy.versions.length; --i >= 0;)
3809
+        {
3810
+            if (copy.versions[i] != null)
3811
+                count++;
3812
+        }
3813
+        
3814
+        return count;
3815
+    }
3816
+    
36623817     void SetUndoStates()
36633818     {
36643819         cRadio tab = GetCurrentTab();
36653820         
3666
-        undoButton.setEnabled(tab.undoindex > 0);
3667
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3821
+        restoreButton.setEnabled(copy.versionindex != -1);
3822
+        replaceButton.setEnabled(copy.versionindex != -1);
3823
+        
3824
+        undoButton.setEnabled(copy.versionindex > 0);
3825
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3826
+        
3827
+        muteSlider = true;
3828
+        versionSlider.setMaximum(VersionCount() - 1);
3829
+        versionSlider.setInteger(copy.versionindex);
3830
+        muteSlider = false;
36683831     }
36693832     
3670
-    public void Undo()
3833
+    public boolean Undo()
36713834     {
3835
+        // Option?
3836
+        Replace();
3837
+        
36723838         System.err.println("Undo");
36733839         
36743840         cRadio tab = GetCurrentTab();
36753841         
3676
-        if (tab.undoindex == 0)
3842
+        if (copy.versionindex == 0)
36773843         {
36783844             java.awt.Toolkit.getDefaultToolkit().beep();
3679
-            return;
3845
+            return false;
36803846         }
36813847 
3682
-        if (tab.graphs[tab.undoindex] == null)
3848
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3849
+//        {
3850
+//            if (Save(false))
3851
+//                tab.versionindex -= 1;
3852
+//            else
3853
+//            {
3854
+//                if (tab.versionindex <= 0)
3855
+//                    return false;
3856
+//                else
3857
+//                    tab.versionindex -= 1;
3858
+//            }
3859
+//        }
3860
+
3861
+        copy.versionindex -= 1;
3862
+
3863
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3864
+        
3865
+        return true;
3866
+    }
3867
+
3868
+    public boolean Restore()
3869
+    {
3870
+        System.err.println("Restore");
3871
+        
3872
+        cRadio tab = GetCurrentTab();
3873
+        
3874
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36833875         {
3684
-            Save();
3685
-            tab.undoindex -= 1;
3876
+            java.awt.Toolkit.getDefaultToolkit().beep();
3877
+            return false;
36863878         }
36873879 
3688
-        tab.undoindex -= 1;
3880
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3881
+        
3882
+        return true;
3883
+    }
36893884 
3690
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3885
+    public boolean Replace()
3886
+    {
3887
+        System.err.println("Replace");
3888
+        
3889
+        cRadio tab = GetCurrentTab();
3890
+        
3891
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3892
+        {
3893
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894
+            return false;
3895
+        }
3896
+
3897
+        copy.versions[copy.versionindex] = CompressCopy();
3898
+        
3899
+        return true;
36913900     }
36923901 
36933902     public void Redo()
36943903     {
3904
+        // Option?
3905
+        Replace();
3906
+        
36953907         cRadio tab = GetCurrentTab();
36963908         
3697
-        if (tab.graphs[tab.undoindex + 1] == null)
3909
+        if (copy.versions[copy.versionindex + 1] == null)
36983910         {
36993911             java.awt.Toolkit.getDefaultToolkit().beep();
37003912             return;
37013913         }
37023914 
3703
-        tab.undoindex += 1;
3915
+        copy.versionindex += 1;
37043916 
3705
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3917
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3918
+        
3919
+        //if (!tab.user[tab.versionindex])
3920
+        //    tab.graphs[tab.versionindex] = null;
37063921     }
37073922 
37083923         void ImportGFD()
....@@ -3998,9 +4213,25 @@
39984213         //copy.Touch();
39994214     }
40004215 
4216
+    cNumberSlider versionSlider;
4217
+    
40014218     public void stateChanged(ChangeEvent e)
40024219     {
40034220         //    assert(false);
4221
+        if (e.getSource() == versionSlider)
4222
+        {
4223
+            if (muteSlider)
4224
+                return;
4225
+            
4226
+            int version = versionSlider.getInteger();
4227
+            
4228
+            if (copy.versions[version] != null)
4229
+            {
4230
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4231
+            }
4232
+            
4233
+            return;
4234
+        }
40044235 
40054236         if (freezematerial)
40064237         {
....@@ -4349,7 +4580,7 @@
43494580 
43504581     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43514582     {
4352
-        if (Globals.SAVEONMAKE) // && resetmodel)
4583
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43534584             Save();
43544585         //Tween.set(thing, 0).target(1).start(tweenManager);
43554586         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4591,7 +4822,9 @@
45914822             readobj.ResetDisplayList();
45924823         } catch (Exception e)
45934824         {
4594
-            //e.printStackTrace();
4825
+            if (!e.toString().contains("GZIP"))
4826
+                e.printStackTrace();
4827
+            
45954828             try
45964829             {
45974830                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4665,12 +4898,14 @@
46654898         
46664899         if (readobj != null)
46674900         {
4668
-        if (Globals.SAVEONMAKE)
4669
-            Save();
4901
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4902
+        //    Save();
46704903             try
46714904             {
46724905                 //readobj.deepCopySelf(copy);
46734906                 copy.clear(); // june 2014
4907
+                copy.skyboxname = readobj.skyboxname;
4908
+                copy.skyboxext = readobj.skyboxext;
46744909                 for (int i = 0; i < readobj.size(); i++)
46754910                 {
46764911                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4711,6 +4946,7 @@
47114946                 }
47124947             } catch (ClassCastException e)
47134948             {
4949
+                e.printStackTrace();
47144950                 assert (false);
47154951                 Composite c = (Composite) copy;
47164952                 c.children.clear();
....@@ -4721,6 +4957,17 @@
47214957                 c.addChild(csg);
47224958             }
47234959 
4960
+            copy.versions = readobj.versions;
4961
+            copy.versionindex = readobj.versionindex;
4962
+            
4963
+        if (copy.versions == null)
4964
+        {
4965
+            copy.versions = new byte[100][];
4966
+            copy.versionindex = -1;
4967
+        }
4968
+        
4969
+            //? SetUndoStates();
4970
+            
47244971             ResetModel();
47254972             copy.HardTouch(); // recompile?
47264973             refreshContents();
....@@ -4830,6 +5077,7 @@
48305077             //ps.print(buffer.toString());
48315078         } catch (IOException e)
48325079         {
5080
+            e.printStackTrace();
48335081         }
48345082     }
48355083