blame | history | patch | commit | commitdiff
Normand Briere
2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15 
 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 
....@@ -309,7 +307,7 @@
309307         //localCopy.parent = null;
310308 
311309         frame = new JFrame();
312
-                frame.setUndecorated(true);
310
+                frame.setUndecorated(false);
313311         objEditor = this;
314312         this.callee = callee;
315313 
....@@ -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 
....@@ -699,8 +705,8 @@
699705         }
700706     }
701707 
702
-static GraphicsDevice device = GraphicsEnvironment
703
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
708
+//static GraphicsDevice device = GraphicsEnvironment
709
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704710 
705711     Rectangle keeprect;
706712         cRadio radio;
....@@ -741,10 +747,11 @@
741747             else
742748             {
743749                 keeprect = frame.getBounds();
744
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
-                Dimension rect2 = frame.getToolkit().getScreenSize();
746
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
750
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
751
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
752
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747753 //                frame.setState(Frame.MAXIMIZED_BOTH);
754
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748755             }
749756             
750757             maximized ^= true;
....@@ -758,12 +765,17 @@
758765         
759766         void ToggleFullScreen()
760767         {
768
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769
+
761770                 cameraView.ToggleFullScreen();
762771                 
763772                 if (!CameraPane.FULLSCREEN)
764773                 {
765774                     device.setFullScreenWindow(null);
775
+                    frame.dispose();
776
+                frame.setUndecorated(false);
766777             frame.validate();
778
+                    frame.setVisible(true);
767779                     
768780                     //frame.setVisible(false);
769781 //                frame.removeNotify();
....@@ -774,7 +786,7 @@
774786 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
775787 // X                   framePanel.add(bigThree);
776788 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
777
-                    framePanel.setDividerLocation(1);
789
+                    framePanel.setDividerLocation(46);
778790                     
779791                     //frame.setVisible(true);
780792                     radio.layout = keepButton;
....@@ -789,8 +801,12 @@
789801 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790802 //                        frame.getToolkit().getScreenSize().height);
791803                     //frame.setVisible(false);
804
+                    
805
+            frame.dispose();
806
+                frame.setUndecorated(true);
792807                     device.setFullScreenWindow(frame);
793808             frame.validate();
809
+                    frame.setVisible(true);
794810 //                frame.removeNotify();
795811 //                frame.setUndecorated(true);
796812 //                frame.addNotify();
....@@ -805,6 +821,28 @@
805821                 }
806822             frame.validate();
807823         }
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
+    }
808846 
809847     private JTextPane createTextPane()
810848     {
....@@ -936,7 +974,7 @@
936974 //    NumberSlider vDivsField;
937975 //    JCheckBox endcaps;
938976     JCheckBox liveCB;
939
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
940978     JCheckBox hideCB;
941979     JCheckBox link2masterCB;
942980     JCheckBox markCB;
....@@ -1148,9 +1186,10 @@
11481186             
11491187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11501188                 liveCB.setToolTipText("Animate object");
1151
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1152
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
11531191 //            Return();
1192
+                
11541193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11551194                 hideCB.setToolTipText("Hide object");
11561195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
....@@ -1164,10 +1203,11 @@
11641203         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11651204         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11661205 
1206
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1207
+        link2masterCB.setToolTipText("Attach to support");
1208
+        
11671209         if (Globals.ADVANCED)
11681210         {
1169
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170
-                link2masterCB.setToolTipText("Attach to support");
11711211                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11721212                 speedupCB.setToolTipText("Option motion capture");
11731213         }
....@@ -1441,6 +1481,7 @@
14411481         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14421482         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14431483         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1484
+        //XYZPanel.setName("XYZ");
14441485 
14451486         /*
14461487         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1478,13 +1519,23 @@
14781519         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14791520         //tmp.setName("Edit");
14801521         objectPanel.add(materialPanel);
1522
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
14811523 //        JPanel north = new JPanel(new BorderLayout());
14821524 //        north.setName("Edit");
14831525 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841526 //        objectPanel.add(north);
14851527         objectPanel.add(editPanel);
1486
-        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
+        
14871537         objectPanel.add(toolboxPanel);
1538
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
14881539 
14891540         /*
14901541         aConstraints.gridx = 0;
....@@ -1505,7 +1556,7 @@
15051556         scrollpane.addMouseWheelListener(this); // Default not fast enough
15061557 
15071558         /*JTabbedPane*/ scenePanel = new cGridBag();
1508
-        scenePanel.preferredWidth = 6;
1559
+        scenePanel.preferredWidth = 5;
15091560         
15101561         JTabbedPane tabbedPane = new JTabbedPane();
15111562         tabbedPane.add(scrollpane);
....@@ -1581,9 +1632,9 @@
15811632         /**/
15821633 
15831634         bigThree = new cGridBag();
1584
-        bigThree.addComponent(scenePanel);
15851635         bigThree.addComponent(centralPanel);
1586
-        bigThree.addComponent(XYZPanel);
1636
+        bigThree.addComponent(scenePanel);
1637
+        //bigThree.addComponent(XYZPanel);
15871638         
15881639 //                // SIDE EFFECT!!!
15891640 //		aConstraints.gridx = 0;
....@@ -1592,9 +1643,9 @@
15921643 //		aConstraints.gridheight = 1;
15931644 
15941645         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1646
+        framePanel.setContinuousLayout(false);
1647
+        framePanel.setOneTouchExpandable(false);
1648
+        //.setDividerLocation(0.8);
15981649         //framePanel.setDividerSize(15);
15991650         //framePanel.setResizeWeight(0.15);
16001651         framePanel.setName("Frame");
....@@ -1613,12 +1664,13 @@
16131664 
16141665         frame.setSize(1280, 860);
16151666         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191667                     cameraView.requestFocusInWindow();
16201668                     
16211669         gridPanel.setDividerLocation(1.0);
1670
+        
1671
+        frame.validate();
1672
+
1673
+        frame.setVisible(true);
16221674 
16231675         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241676         frame.addWindowListener(new WindowAdapter()
....@@ -1965,8 +2017,9 @@
19652017             // 3D models
19662018             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19672019             {
1968
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1969
-                LoadFile(filename, lastConverter);
2020
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2021
+                //LoadFile(filename, lastConverter);
2022
+                LoadObjFile(filename); // New 3ds loader
19702023                 continue;
19712024             }
19722025             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2692,6 +2745,7 @@
26922745                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26932746                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26942747             }
2748
+            
26952749             //cJME.count++;
26962750             //cJME.count %= 12;
26972751             if (gc)
....@@ -2875,6 +2929,7 @@
28752929             }
28762930         }
28772931     }
2932
+    
28782933     cFileSystemPane FSPane;
28792934 
28802935     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2928,6 +2983,7 @@
29282983                 }
29292984             }
29302985         }
2986
+        
29312987         freezematerial = false;
29322988     }
29332989 
....@@ -3195,7 +3251,7 @@
31953251         {
31963252             copy.live ^= true;
31973253             return;
3198
-        } else if (event.getSource() == selectCB)
3254
+        } else if (event.getSource() == selectableCB)
31993255         {
32003256             copy.dontselect ^= true;
32013257             return;
....@@ -3380,9 +3436,9 @@
33803436         {
33813437             Close();
33823438             //return true;
3383
-        } else if (source == loadItem)
3439
+        } else if (source == openItem)
33843440         {
3385
-            load();
3441
+            Open();
33863442             //return true;
33873443         } else if (source == newItem)
33883444         {
....@@ -3407,6 +3463,10 @@
34073463         {
34083464             generatePOV();
34093465             //return true;
3466
+        } else if (event.getSource() == archiveItem)
3467
+        {
3468
+            cTools.Archive(frame);
3469
+            return;
34103470         } else if (source == zBufferItem)
34113471         {
34123472             try
....@@ -3458,8 +3518,8 @@
34583518         try
34593519         {
34603520             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3521
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3522
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34633523 
34643524         Object3D parent = o.parent;
34653525         o.parent = null;
....@@ -3470,10 +3530,14 @@
34703530         
34713531             out.flush();
34723532 
3473
-            zstream.close();
3533
+            baos //zstream
3534
+                    .close();
34743535             out.close();
34753536             
3476
-            return baos.toByteArray();
3537
+            byte[] bytes = baos.toByteArray();
3538
+            
3539
+        System.out.println("save #bytes = " + bytes.length);
3540
+            return bytes;
34773541         } catch (Exception e)
34783542         {
34793543             System.err.println(e);
....@@ -3483,13 +3547,16 @@
34833547 
34843548     static public Object Uncompress(byte[] bytes)
34853549     {
3486
-        System.out.println("#bytes = " + bytes.length);
3550
+        System.out.println("restore #bytes = " + bytes.length);
34873551         try
34883552         {
34893553             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491
-            ObjectInputStream in = new ObjectInputStream(istream);
3554
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3555
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34923556             Object obj = in.readObject();
3557
+            
3558
+            bais //istream
3559
+                    .close();
34933560             in.close();
34943561             
34953562             return obj;
....@@ -3544,33 +3611,67 @@
35443611         return null;
35453612     }
35463613     
3547
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35483614     
35493615     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)
35503640     {
35513641         System.err.println("Save");
35523642         
35533643         cRadio tab = GetCurrentTab();
35543644         
3555
-        boolean temp = CameraPane.SWITCH;
3556
-        CameraPane.SWITCH = false;
3645
+        byte[] compress = CompressCopy();
35573646         
3558
-        copy.ExtractBigData(hashtable);
3647
+        boolean thesame = false;
35593648         
3560
-        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
+        }
35613654         
35623655         //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
-        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
+        }
35643666 
3565
-        copy.RestoreBigData(hashtable);
3667
+        //copy.RestoreBigData(versiontable);
35663668 
3567
-        CameraPane.SWITCH = temp;
3568
-        
35693669         //assert(hashtable.isEmpty());
35703670         
3571
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3671
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35723672         {
3573
-            tab.graphs[i] = null;
3673
+            //tab.user[i] = false;
3674
+            copy.versions[i] = null;
35743675         }
35753676 
35763677         SetUndoStates();
....@@ -3580,7 +3681,7 @@
35803681         {
35813682             try
35823683             {
3583
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3684
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35843685                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35853686 
35863687                 p.writeObject(copy);
....@@ -3593,6 +3694,8 @@
35933694                 e.printStackTrace();
35943695             }
35953696         }
3697
+        
3698
+        return !thesame;
35963699     }
35973700 
35983701     void CopyChanged(Object3D obj)
....@@ -3602,7 +3705,7 @@
36023705         boolean temp = CameraPane.SWITCH;
36033706         CameraPane.SWITCH = false;
36043707         
3605
-        copy.ExtractBigData(hashtable);
3708
+        copy.ExtractBigData(versiontable);
36063709         
36073710         copy.clear();
36083711         
....@@ -3611,7 +3714,7 @@
36113714             copy.add(obj.get(i));
36123715         }
36133716         
3614
-        copy.RestoreBigData(hashtable);
3717
+        copy.RestoreBigData(versiontable);
36153718         
36163719         CameraPane.SWITCH = temp;
36173720         
....@@ -3639,52 +3742,129 @@
36393742     }
36403743     
36413744     cButton undoButton;
3745
+    cButton restoreButton;
3746
+    cButton replaceButton;
36423747     cButton redoButton;
36433748         
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
+    
36443764     void SetUndoStates()
36453765     {
36463766         cRadio tab = GetCurrentTab();
36473767         
3648
-        undoButton.setEnabled(tab.undoindex > 0);
3649
-        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;
36503778     }
36513779     
3652
-    public void Undo()
3780
+    public boolean Undo()
36533781     {
3782
+        // Option?
3783
+        Replace();
3784
+        
36543785         System.err.println("Undo");
36553786         
36563787         cRadio tab = GetCurrentTab();
36573788         
3658
-        if (tab.undoindex == 0)
3789
+        if (copy.versionindex == 0)
36593790         {
36603791             java.awt.Toolkit.getDefaultToolkit().beep();
3661
-            return;
3792
+            return false;
36623793         }
36633794 
3664
-        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)
36653822         {
3666
-            Save();
3667
-            tab.undoindex -= 1;
3823
+            java.awt.Toolkit.getDefaultToolkit().beep();
3824
+            return false;
36683825         }
36693826 
3670
-        tab.undoindex -= 1;
3827
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3828
+        
3829
+        return true;
3830
+    }
36713831 
3672
-        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;
36733847     }
36743848 
36753849     public void Redo()
36763850     {
3851
+        // Option?
3852
+        Replace();
3853
+        
36773854         cRadio tab = GetCurrentTab();
36783855         
3679
-        if (tab.graphs[tab.undoindex + 1] == null)
3856
+        if (copy.versions[copy.versionindex + 1] == null)
36803857         {
36813858             java.awt.Toolkit.getDefaultToolkit().beep();
36823859             return;
36833860         }
36843861 
3685
-        tab.undoindex += 1;
3862
+        copy.versionindex += 1;
36863863 
3687
-        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;
36883868     }
36893869 
36903870         void ImportGFD()
....@@ -3980,9 +4160,25 @@
39804160         //copy.Touch();
39814161     }
39824162 
4163
+    cNumberSlider versionSlider;
4164
+    
39834165     public void stateChanged(ChangeEvent e)
39844166     {
39854167         //    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
+        }
39864182 
39874183         if (freezematerial)
39884184         {
....@@ -4331,7 +4527,7 @@
43314527 
43324528     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43334529     {
4334
-        if (Globals.SAVEONMAKE) // && resetmodel)
4530
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43354531             Save();
43364532         //Tween.set(thing, 0).target(1).start(tweenManager);
43374533         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4573,7 +4769,9 @@
45734769             readobj.ResetDisplayList();
45744770         } catch (Exception e)
45754771         {
4576
-            //e.printStackTrace();
4772
+            if (!e.toString().contains("GZIP"))
4773
+                e.printStackTrace();
4774
+            
45774775             try
45784776             {
45794777                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4647,8 +4845,8 @@
46474845         
46484846         if (readobj != null)
46494847         {
4650
-        if (Globals.SAVEONMAKE)
4651
-            Save();
4848
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4849
+        //    Save();
46524850             try
46534851             {
46544852                 //readobj.deepCopySelf(copy);
....@@ -4693,6 +4891,7 @@
46934891                 }
46944892             } catch (ClassCastException e)
46954893             {
4894
+                e.printStackTrace();
46964895                 assert (false);
46974896                 Composite c = (Composite) copy;
46984897                 c.children.clear();
....@@ -4703,13 +4902,24 @@
47034902                 c.addChild(csg);
47044903             }
47054904 
4905
+            copy.versions = readobj.versions;
4906
+            copy.versionindex = readobj.versionindex;
4907
+            
4908
+        if (copy.versions == null)
4909
+        {
4910
+            copy.versions = new byte[100][];
4911
+            copy.versionindex = -1;
4912
+        }
4913
+        
4914
+            //? SetUndoStates();
4915
+            
47064916             ResetModel();
47074917             copy.HardTouch(); // recompile?
47084918             refreshContents();
47094919         }
47104920     }
47114921 
4712
-    void load() // throws ClassNotFoundException
4922
+    void Open() // throws ClassNotFoundException
47134923     {
47144924         if (Grafreed.standAlone)
47154925         {
....@@ -4812,6 +5022,7 @@
48125022             //ps.print(buffer.toString());
48135023         } catch (IOException e)
48145024         {
5025
+            e.printStackTrace();
48155026         }
48165027     }
48175028     
....@@ -4994,7 +5205,7 @@
49945205     MenuBar menuBar;
49955206     Menu fileMenu;
49965207     MenuItem newItem;
4997
-    MenuItem loadItem;
5208
+    MenuItem openItem;
49985209     MenuItem saveItem;
49995210     MenuItem saveAsItem;
50005211     MenuItem exportAsItem;
....@@ -5017,6 +5228,7 @@
50175228     CheckboxMenuItem toggleSwitchItem;
50185229     CheckboxMenuItem toggleRootItem;
50195230     CheckboxMenuItem animationItem;
5231
+    MenuItem archiveItem;
50205232     CheckboxMenuItem toggleHandleItem;
50215233     CheckboxMenuItem togglePaintItem;
50225234     JSplitPane mainPanel;