blame | history | patch | commit | commitdiff
Normand Briere
2019-07-23 0f4fa9dc4191aaee9661c1e6d73725436ae64ac2 
 ObjEditor.java
....@@ -44,61 +44,47 @@
4444     
4545     cButton GetButton(String name, boolean border)
4646     {
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
-        }
47
+        ImageIcon icon = GetIcon(name);
48
+        return new cButton(icon, border);
5649     }
5750 
5851     cToggleButton GetToggleButton(String name, boolean border)
5952     {
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
-        }
53
+        ImageIcon icon = GetIcon(name);
54
+        return new cToggleButton(icon, border);
6955     }
7056 
7157     cCheckBox GetCheckBox(String name, boolean border)
7258     {
59
+        ImageIcon icon = GetIcon(name);
60
+        return new cCheckBox(icon, border);
61
+    }
62
+
63
+    private ImageIcon GetIcon(String name)
64
+    {
7365         try
7466         {
75
-            ImageIcon icon = GetIcon(name);
76
-            return new cCheckBox(icon, border);
67
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
+
69
+            if (image.getWidth() != 24 && image.getHeight() != 24)
70
+            {
71
+                BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
+                Graphics2D g = resized.createGraphics();
73
+                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
+                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
+                g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
+                g.dispose();
77
+
78
+                image = resized;
79
+            }
80
+
81
+            javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
+            return icon;
7783         }
7884         catch (Exception e)
7985         {
80
-            return new cCheckBox(name, border);
86
+            return null;
8187         }
82
-    }
83
-
84
-    private ImageIcon GetIcon(String name) throws IOException
85
-    {
86
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-        
88
-        if (image.getWidth() != 24 && image.getHeight() != 24)
89
-        {
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;
98
-        }
99
-        
100
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
-        return icon;
10288     }
10389     
10490     // SCRIPT
....@@ -282,6 +268,12 @@
282268         client = inClient;
283269         copy = client;
284270 
271
+        if (copy.versions == null)
272
+        {
273
+            copy.versions = new byte[100][];
274
+            copy.versionindex = -1;
275
+        }
276
+        
285277         // "this" is not called: SetupUI2(objEditor);
286278     }
287279 
....@@ -295,6 +287,12 @@
295287         client = inClient;
296288         copy = client;
297289 
290
+        if (copy.versions == null)
291
+        {
292
+            copy.versions = new byte[100][];
293
+            copy.versionindex = -1;
294
+        }
295
+        
298296         SetupUI2(callee.GetEditor());
299297     }
300298 
....@@ -327,6 +325,12 @@
327325         copy = localCopy;
328326         copy.editWindow = this;
329327 
328
+        if (copy.versions == null)
329
+        {
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
+        }
333
+        
330334         SetupMenu();
331335 
332336         //SetupName(objEditor); // new
....@@ -350,7 +354,7 @@
350354         frame.setMenuBar(menuBar = new MenuBar());
351355         menuBar.add(fileMenu = new Menu("File"));
352356         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
357
+        fileMenu.add(openItem = new MenuItem("Open..."));
354358         
355359                 //oe.menuBar.add(menu = new Menu("Include"));
356360         Menu menu = new Menu("Import");
....@@ -382,7 +386,7 @@
382386         }
383387 
384388         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
389
+        openItem.addActionListener(this);
386390         saveItem.addActionListener(this);
387391         saveAsItem.addActionListener(this);
388392         exportAsItem.addActionListener(this);
....@@ -419,11 +423,12 @@
419423     
420424         toolbarPanel = new JPanel();
421425         toolbarPanel.setName("Toolbar");
426
+        
422427         treePanel = new cGridBag();
423428         treePanel.setName("Tree");
424429         
425430         editPanel = new cGridBag().setVertical(true);
426
-        editPanel.setName("Edit");
431
+        //editPanel.setName("Edit");
427432         
428433         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429434         
....@@ -432,10 +437,10 @@
432437         editPanel.add(ctrlPanel);
433438                 
434439         toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
440
+        //toolboxPanel.setName("Toolbox");
436441         
437442         materialPanel = new cGridBag().setVertical(true);
438
-        materialPanel.setName("Material");
443
+        //materialPanel.setName("Material");
439444         
440445         /*JTextPane*/
441446         infoarea = createTextPane();
....@@ -443,14 +448,15 @@
443448 
444449         infoarea.setEditable(true);
445450         SetText();
451
+        
446452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447453 //            infoarea.setOpaque(false);
448454 //            //infoarea.setForeground(textcolor);
449455 // TEXTAREA           infoarea.setLineWrap(true);
450456 // TEXTAREA           infoarea.setWrapStyleWord(true);
451457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        //infoPanel.setPreferredSize(new Dimension(50, 200));
453
-        infoPanel.setName("Info");
458
+        infoPanel.setPreferredSize(new Dimension(1, 1));
459
+        //infoPanel.setName("Info");
454460         //infoPanel.setLayout(new BorderLayout());
455461         //infoPanel.add(createTextPane());
456462 
....@@ -780,7 +786,7 @@
780786 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
781787 // X                   framePanel.add(bigThree);
782788 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
783
-                    framePanel.setDividerLocation(1);
789
+                    framePanel.setDividerLocation(46);
784790                     
785791                     //frame.setVisible(true);
786792                     radio.layout = keepButton;
....@@ -815,6 +821,28 @@
815821                 }
816822             frame.validate();
817823         }
824
+
825
+    private byte[] CompressCopy()
826
+    {
827
+        boolean temp = CameraPane.SWITCH;
828
+        CameraPane.SWITCH = false;
829
+        
830
+        copy.ExtractBigData(versiontable);
831
+        // if (copy == client)
832
+        
833
+        byte[] versions[] = copy.versions;
834
+        copy.versions = null;
835
+        
836
+        byte[] compress = Compress(copy);
837
+        
838
+        copy.versions = versions;
839
+        
840
+        copy.RestoreBigData(versiontable);
841
+        
842
+        CameraPane.SWITCH = temp;
843
+        
844
+        return compress;
845
+    }
818846 
819847     private JTextPane createTextPane()
820848     {
....@@ -946,7 +974,7 @@
946974 //    NumberSlider vDivsField;
947975 //    JCheckBox endcaps;
948976     JCheckBox liveCB;
949
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
950978     JCheckBox hideCB;
951979     JCheckBox link2masterCB;
952980     JCheckBox markCB;
....@@ -1158,9 +1186,10 @@
11581186             
11591187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11601188                 liveCB.setToolTipText("Animate object");
1161
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
11631191 //            Return();
1192
+                
11641193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11651194                 hideCB.setToolTipText("Hide object");
11661195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
....@@ -1174,10 +1203,11 @@
11741203         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11751204         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11761205 
1206
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1207
+        link2masterCB.setToolTipText("Attach to support");
1208
+        
11771209         if (Globals.ADVANCED)
11781210         {
1179
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180
-                link2masterCB.setToolTipText("Attach to support");
11811211                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11821212                 speedupCB.setToolTipText("Option motion capture");
11831213         }
....@@ -1451,6 +1481,7 @@
14511481         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14521482         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14531483         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1484
+        //XYZPanel.setName("XYZ");
14541485 
14551486         /*
14561487         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1488,13 +1519,23 @@
14881519         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14891520         //tmp.setName("Edit");
14901521         objectPanel.add(materialPanel);
1522
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
14911523 //        JPanel north = new JPanel(new BorderLayout());
14921524 //        north.setName("Edit");
14931525 //        north.add(ctrlPanel, BorderLayout.NORTH);
14941526 //        objectPanel.add(north);
14951527         objectPanel.add(editPanel);
1496
-        objectPanel.add(infoPanel);
1528
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1529
+        
1530
+        //if (Globals.ADVANCED)
1531
+            objectPanel.add(infoPanel);
1532
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1533
+        
1534
+        objectPanel.add(XYZPanel);
1535
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1536
+        
14971537         objectPanel.add(toolboxPanel);
1538
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
14981539 
14991540         /*
15001541         aConstraints.gridx = 0;
....@@ -1515,7 +1556,7 @@
15151556         scrollpane.addMouseWheelListener(this); // Default not fast enough
15161557 
15171558         /*JTabbedPane*/ scenePanel = new cGridBag();
1518
-        scenePanel.preferredWidth = 6;
1559
+        scenePanel.preferredWidth = 5;
15191560         
15201561         JTabbedPane tabbedPane = new JTabbedPane();
15211562         tabbedPane.add(scrollpane);
....@@ -1593,7 +1634,7 @@
15931634         bigThree = new cGridBag();
15941635         bigThree.addComponent(scenePanel);
15951636         bigThree.addComponent(centralPanel);
1596
-        bigThree.addComponent(XYZPanel);
1637
+        //bigThree.addComponent(XYZPanel);
15971638         
15981639 //                // SIDE EFFECT!!!
15991640 //		aConstraints.gridx = 0;
....@@ -1602,9 +1643,9 @@
16021643 //		aConstraints.gridheight = 1;
16031644 
16041645         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605
-        framePanel.setContinuousLayout(true);
1606
-        framePanel.setOneTouchExpandable(true);
1607
-        framePanel.setDividerLocation(0.8);
1646
+        framePanel.setContinuousLayout(false);
1647
+        framePanel.setOneTouchExpandable(false);
1648
+        //.setDividerLocation(0.8);
16081649         //framePanel.setDividerSize(15);
16091650         //framePanel.setResizeWeight(0.15);
16101651         framePanel.setName("Frame");
....@@ -1976,8 +2017,9 @@
19762017             // 3D models
19772018             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19782019             {
1979
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1980
-                LoadFile(filename, lastConverter);
2020
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2021
+                //LoadFile(filename, lastConverter);
2022
+                LoadObjFile(filename); // New 3ds loader
19812023                 continue;
19822024             }
19832025             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2703,6 +2745,7 @@
27032745                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27042746                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27052747             }
2748
+            
27062749             //cJME.count++;
27072750             //cJME.count %= 12;
27082751             if (gc)
....@@ -2886,6 +2929,7 @@
28862929             }
28872930         }
28882931     }
2932
+    
28892933     cFileSystemPane FSPane;
28902934 
28912935     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2939,6 +2983,7 @@
29392983                 }
29402984             }
29412985         }
2986
+        
29422987         freezematerial = false;
29432988     }
29442989 
....@@ -3206,7 +3251,7 @@
32063251         {
32073252             copy.live ^= true;
32083253             return;
3209
-        } else if (event.getSource() == selectCB)
3254
+        } else if (event.getSource() == selectableCB)
32103255         {
32113256             copy.dontselect ^= true;
32123257             return;
....@@ -3391,9 +3436,9 @@
33913436         {
33923437             Close();
33933438             //return true;
3394
-        } else if (source == loadItem)
3439
+        } else if (source == openItem)
33953440         {
3396
-            load();
3441
+            Open();
33973442             //return true;
33983443         } else if (source == newItem)
33993444         {
....@@ -3418,6 +3463,10 @@
34183463         {
34193464             generatePOV();
34203465             //return true;
3466
+        } else if (event.getSource() == archiveItem)
3467
+        {
3468
+            cTools.Archive(frame);
3469
+            return;
34213470         } else if (source == zBufferItem)
34223471         {
34233472             try
....@@ -3469,8 +3518,8 @@
34693518         try
34703519         {
34713520             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3521
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3522
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34743523 
34753524         Object3D parent = o.parent;
34763525         o.parent = null;
....@@ -3481,10 +3530,14 @@
34813530         
34823531             out.flush();
34833532 
3484
-            zstream.close();
3533
+            baos //zstream
3534
+                    .close();
34853535             out.close();
34863536             
3487
-            return baos.toByteArray();
3537
+            byte[] bytes = baos.toByteArray();
3538
+            
3539
+        System.out.println("save #bytes = " + bytes.length);
3540
+            return bytes;
34883541         } catch (Exception e)
34893542         {
34903543             System.err.println(e);
....@@ -3494,13 +3547,16 @@
34943547 
34953548     static public Object Uncompress(byte[] bytes)
34963549     {
3497
-        System.out.println("#bytes = " + bytes.length);
3550
+        System.out.println("restore #bytes = " + bytes.length);
34983551         try
34993552         {
35003553             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502
-            ObjectInputStream in = new ObjectInputStream(istream);
3554
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3555
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35033556             Object obj = in.readObject();
3557
+            
3558
+            bais //istream
3559
+                    .close();
35043560             in.close();
35053561             
35063562             return obj;
....@@ -3555,33 +3611,67 @@
35553611         return null;
35563612     }
35573613     
3558
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35593614     
35603615     public void Save()
3616
+    {
3617
+        //Save(true);
3618
+        Replace();
3619
+    }
3620
+    
3621
+    private boolean Equal(byte[] compress, byte[] name)
3622
+    {
3623
+        if (compress.length != name.length)
3624
+        {
3625
+            return false;
3626
+        }
3627
+        
3628
+        for (int i=compress.length; --i>=0;)
3629
+        {
3630
+            if (compress[i] != name[i])
3631
+                return false;
3632
+        }
3633
+        
3634
+        return true;
3635
+    }
3636
+
3637
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3638
+    
3639
+    public boolean Save(boolean user)
35613640     {
35623641         System.err.println("Save");
35633642         
35643643         cRadio tab = GetCurrentTab();
35653644         
3566
-        boolean temp = CameraPane.SWITCH;
3567
-        CameraPane.SWITCH = false;
3645
+        byte[] compress = CompressCopy();
35683646         
3569
-        copy.ExtractBigData(hashtable);
3647
+        boolean thesame = false;
35703648         
3571
-        byte[] compress = Compress(copy);
3649
+        // Quick heuristic using length. Works only when stream is compressed.
3650
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3651
+        {
3652
+            thesame = true;
3653
+        }
35723654         
35733655         //EditorFrame.m_MainFrame.requestFocusInWindow();
3574
-        tab.graphs[tab.undoindex++] = compress;
3656
+        if (!thesame)
3657
+        {
3658
+            //tab.user[tab.versionindex] = user;
3659
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3660
+            
3661
+            copy.versions[++copy.versionindex] = compress;
3662
+            
3663
+            // if (increment)
3664
+            //     tab.versionindex++;
3665
+        }
35753666 
3576
-        copy.RestoreBigData(hashtable);
3667
+        //copy.RestoreBigData(versiontable);
35773668 
3578
-        CameraPane.SWITCH = temp;
3579
-        
35803669         //assert(hashtable.isEmpty());
35813670         
3582
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3671
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35833672         {
3584
-            tab.graphs[i] = null;
3673
+            //tab.user[i] = false;
3674
+            copy.versions[i] = null;
35853675         }
35863676 
35873677         SetUndoStates();
....@@ -3591,7 +3681,7 @@
35913681         {
35923682             try
35933683             {
3594
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3684
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35953685                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35963686 
35973687                 p.writeObject(copy);
....@@ -3604,6 +3694,8 @@
36043694                 e.printStackTrace();
36053695             }
36063696         }
3697
+        
3698
+        return !thesame;
36073699     }
36083700 
36093701     void CopyChanged(Object3D obj)
....@@ -3613,7 +3705,7 @@
36133705         boolean temp = CameraPane.SWITCH;
36143706         CameraPane.SWITCH = false;
36153707         
3616
-        copy.ExtractBigData(hashtable);
3708
+        copy.ExtractBigData(versiontable);
36173709         
36183710         copy.clear();
36193711         
....@@ -3622,7 +3714,7 @@
36223714             copy.add(obj.get(i));
36233715         }
36243716         
3625
-        copy.RestoreBigData(hashtable);
3717
+        copy.RestoreBigData(versiontable);
36263718         
36273719         CameraPane.SWITCH = temp;
36283720         
....@@ -3650,52 +3742,129 @@
36503742     }
36513743     
36523744     cButton undoButton;
3745
+    cButton restoreButton;
3746
+    cButton replaceButton;
36533747     cButton redoButton;
36543748         
3749
+    boolean muteSlider;
3750
+    
3751
+    int VersionCount()
3752
+    {
3753
+        int count = 0;
3754
+        
3755
+        for (int i = copy.versions.length; --i >= 0;)
3756
+        {
3757
+            if (copy.versions[i] != null)
3758
+                count++;
3759
+        }
3760
+        
3761
+        return count;
3762
+    }
3763
+    
36553764     void SetUndoStates()
36563765     {
36573766         cRadio tab = GetCurrentTab();
36583767         
3659
-        undoButton.setEnabled(tab.undoindex > 0);
3660
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3768
+        restoreButton.setEnabled(copy.versionindex != -1);
3769
+        replaceButton.setEnabled(copy.versionindex != -1);
3770
+        
3771
+        undoButton.setEnabled(copy.versionindex > 0);
3772
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3773
+        
3774
+        muteSlider = true;
3775
+        versionSlider.setMaximum(VersionCount() - 1);
3776
+        versionSlider.setInteger(copy.versionindex);
3777
+        muteSlider = false;
36613778     }
36623779     
3663
-    public void Undo()
3780
+    public boolean Undo()
36643781     {
3782
+        // Option?
3783
+        Replace();
3784
+        
36653785         System.err.println("Undo");
36663786         
36673787         cRadio tab = GetCurrentTab();
36683788         
3669
-        if (tab.undoindex == 0)
3789
+        if (copy.versionindex == 0)
36703790         {
36713791             java.awt.Toolkit.getDefaultToolkit().beep();
3672
-            return;
3792
+            return false;
36733793         }
36743794 
3675
-        if (tab.graphs[tab.undoindex] == null)
3795
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3796
+//        {
3797
+//            if (Save(false))
3798
+//                tab.versionindex -= 1;
3799
+//            else
3800
+//            {
3801
+//                if (tab.versionindex <= 0)
3802
+//                    return false;
3803
+//                else
3804
+//                    tab.versionindex -= 1;
3805
+//            }
3806
+//        }
3807
+
3808
+        copy.versionindex -= 1;
3809
+
3810
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3811
+        
3812
+        return true;
3813
+    }
3814
+
3815
+    public boolean Restore()
3816
+    {
3817
+        System.err.println("Restore");
3818
+        
3819
+        cRadio tab = GetCurrentTab();
3820
+        
3821
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36763822         {
3677
-            Save();
3678
-            tab.undoindex -= 1;
3823
+            java.awt.Toolkit.getDefaultToolkit().beep();
3824
+            return false;
36793825         }
36803826 
3681
-        tab.undoindex -= 1;
3827
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3828
+        
3829
+        return true;
3830
+    }
36823831 
3683
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3832
+    public boolean Replace()
3833
+    {
3834
+        System.err.println("Replace");
3835
+        
3836
+        cRadio tab = GetCurrentTab();
3837
+        
3838
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3839
+        {
3840
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3841
+            return false;
3842
+        }
3843
+
3844
+        copy.versions[copy.versionindex] = CompressCopy();
3845
+        
3846
+        return true;
36843847     }
36853848 
36863849     public void Redo()
36873850     {
3851
+        // Option?
3852
+        Replace();
3853
+        
36883854         cRadio tab = GetCurrentTab();
36893855         
3690
-        if (tab.graphs[tab.undoindex + 1] == null)
3856
+        if (copy.versions[copy.versionindex + 1] == null)
36913857         {
36923858             java.awt.Toolkit.getDefaultToolkit().beep();
36933859             return;
36943860         }
36953861 
3696
-        tab.undoindex += 1;
3862
+        copy.versionindex += 1;
36973863 
3698
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3864
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3865
+        
3866
+        //if (!tab.user[tab.versionindex])
3867
+        //    tab.graphs[tab.versionindex] = null;
36993868     }
37003869 
37013870         void ImportGFD()
....@@ -3991,9 +4160,25 @@
39914160         //copy.Touch();
39924161     }
39934162 
4163
+    cNumberSlider versionSlider;
4164
+    
39944165     public void stateChanged(ChangeEvent e)
39954166     {
39964167         //    assert(false);
4168
+        if (e.getSource() == versionSlider)
4169
+        {
4170
+            if (muteSlider)
4171
+                return;
4172
+            
4173
+            int version = versionSlider.getInteger();
4174
+            
4175
+            if (copy.versions[version] != null)
4176
+            {
4177
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4178
+            }
4179
+            
4180
+            return;
4181
+        }
39974182 
39984183         if (freezematerial)
39994184         {
....@@ -4342,7 +4527,7 @@
43424527 
43434528     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43444529     {
4345
-        if (Globals.SAVEONMAKE) // && resetmodel)
4530
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43464531             Save();
43474532         //Tween.set(thing, 0).target(1).start(tweenManager);
43484533         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4584,7 +4769,7 @@
45844769             readobj.ResetDisplayList();
45854770         } catch (Exception e)
45864771         {
4587
-            //e.printStackTrace();
4772
+            e.printStackTrace();
45884773             try
45894774             {
45904775                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4658,8 +4843,8 @@
46584843         
46594844         if (readobj != null)
46604845         {
4661
-        if (Globals.SAVEONMAKE)
4662
-            Save();
4846
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4847
+        //    Save();
46634848             try
46644849             {
46654850                 //readobj.deepCopySelf(copy);
....@@ -4704,6 +4889,7 @@
47044889                 }
47054890             } catch (ClassCastException e)
47064891             {
4892
+                e.printStackTrace();
47074893                 assert (false);
47084894                 Composite c = (Composite) copy;
47094895                 c.children.clear();
....@@ -4714,13 +4900,24 @@
47144900                 c.addChild(csg);
47154901             }
47164902 
4903
+            copy.versions = readobj.versions;
4904
+            copy.versionindex = readobj.versionindex;
4905
+            
4906
+        if (copy.versions == null)
4907
+        {
4908
+            copy.versions = new byte[100][];
4909
+            copy.versionindex = -1;
4910
+        }
4911
+        
4912
+            //? SetUndoStates();
4913
+            
47174914             ResetModel();
47184915             copy.HardTouch(); // recompile?
47194916             refreshContents();
47204917         }
47214918     }
47224919 
4723
-    void load() // throws ClassNotFoundException
4920
+    void Open() // throws ClassNotFoundException
47244921     {
47254922         if (Grafreed.standAlone)
47264923         {
....@@ -4823,6 +5020,7 @@
48235020             //ps.print(buffer.toString());
48245021         } catch (IOException e)
48255022         {
5023
+            e.printStackTrace();
48265024         }
48275025     }
48285026     
....@@ -5005,7 +5203,7 @@
50055203     MenuBar menuBar;
50065204     Menu fileMenu;
50075205     MenuItem newItem;
5008
-    MenuItem loadItem;
5206
+    MenuItem openItem;
50095207     MenuItem saveItem;
50105208     MenuItem saveAsItem;
50115209     MenuItem exportAsItem;
....@@ -5028,6 +5226,7 @@
50285226     CheckboxMenuItem toggleSwitchItem;
50295227     CheckboxMenuItem toggleRootItem;
50305228     CheckboxMenuItem animationItem;
5229
+    MenuItem archiveItem;
50315230     CheckboxMenuItem toggleHandleItem;
50325231     CheckboxMenuItem togglePaintItem;
50335232     JSplitPane mainPanel;