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 
....@@ -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
....@@ -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,6 +448,7 @@
443448 
444449         infoarea.setEditable(true);
445450         SetText();
451
+        
446452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447453 //            infoarea.setOpaque(false);
448454 //            //infoarea.setForeground(textcolor);
....@@ -450,7 +456,7 @@
450456 // TEXTAREA           infoarea.setWrapStyleWord(true);
451457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452458         infoPanel.setPreferredSize(new Dimension(1, 1));
453
-        infoPanel.setName("Info");
459
+        //infoPanel.setName("Info");
454460         //infoPanel.setLayout(new BorderLayout());
455461         //infoPanel.add(createTextPane());
456462 
....@@ -816,6 +822,28 @@
816822             frame.validate();
817823         }
818824 
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
+    }
846
+
819847     private JTextPane createTextPane()
820848     {
821849 // TEXTAREA       String[] initString =
....@@ -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,16 +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);
1528
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
14961529         
14971530         //if (Globals.ADVANCED)
14981531             objectPanel.add(infoPanel);
1532
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1533
+        
1534
+        objectPanel.add(XYZPanel);
1535
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
14991536         
15001537         objectPanel.add(toolboxPanel);
1538
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15011539 
15021540         /*
15031541         aConstraints.gridx = 0;
....@@ -1518,7 +1556,7 @@
15181556         scrollpane.addMouseWheelListener(this); // Default not fast enough
15191557 
15201558         /*JTabbedPane*/ scenePanel = new cGridBag();
1521
-        scenePanel.preferredWidth = 6;
1559
+        scenePanel.preferredWidth = 5;
15221560         
15231561         JTabbedPane tabbedPane = new JTabbedPane();
15241562         tabbedPane.add(scrollpane);
....@@ -1594,9 +1632,9 @@
15941632         /**/
15951633 
15961634         bigThree = new cGridBag();
1597
-        bigThree.addComponent(scenePanel);
15981635         bigThree.addComponent(centralPanel);
1599
-        bigThree.addComponent(XYZPanel);
1636
+        bigThree.addComponent(scenePanel);
1637
+        //bigThree.addComponent(XYZPanel);
16001638         
16011639 //                // SIDE EFFECT!!!
16021640 //		aConstraints.gridx = 0;
....@@ -1979,8 +2017,9 @@
19792017             // 3D models
19802018             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19812019             {
1982
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1983
-                LoadFile(filename, lastConverter);
2020
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2021
+                //LoadFile(filename, lastConverter);
2022
+                LoadObjFile(filename); // New 3ds loader
19842023                 continue;
19852024             }
19862025             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2706,6 +2745,7 @@
27062745                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27072746                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27082747             }
2748
+            
27092749             //cJME.count++;
27102750             //cJME.count %= 12;
27112751             if (gc)
....@@ -2889,6 +2929,7 @@
28892929             }
28902930         }
28912931     }
2932
+    
28922933     cFileSystemPane FSPane;
28932934 
28942935     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2942,6 +2983,7 @@
29422983                 }
29432984             }
29442985         }
2986
+        
29452987         freezematerial = false;
29462988     }
29472989 
....@@ -3209,7 +3251,7 @@
32093251         {
32103252             copy.live ^= true;
32113253             return;
3212
-        } else if (event.getSource() == selectCB)
3254
+        } else if (event.getSource() == selectableCB)
32133255         {
32143256             copy.dontselect ^= true;
32153257             return;
....@@ -3476,8 +3518,8 @@
34763518         try
34773519         {
34783520             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3521
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3522
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34813523 
34823524         Object3D parent = o.parent;
34833525         o.parent = null;
....@@ -3488,10 +3530,14 @@
34883530         
34893531             out.flush();
34903532 
3491
-            zstream.close();
3533
+            baos //zstream
3534
+                    .close();
34923535             out.close();
34933536             
3494
-            return baos.toByteArray();
3537
+            byte[] bytes = baos.toByteArray();
3538
+            
3539
+        System.out.println("save #bytes = " + bytes.length);
3540
+            return bytes;
34953541         } catch (Exception e)
34963542         {
34973543             System.err.println(e);
....@@ -3501,13 +3547,16 @@
35013547 
35023548     static public Object Uncompress(byte[] bytes)
35033549     {
3504
-        System.out.println("#bytes = " + bytes.length);
3550
+        System.out.println("restore #bytes = " + bytes.length);
35053551         try
35063552         {
35073553             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509
-            ObjectInputStream in = new ObjectInputStream(istream);
3554
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3555
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35103556             Object obj = in.readObject();
3557
+            
3558
+            bais //istream
3559
+                    .close();
35113560             in.close();
35123561             
35133562             return obj;
....@@ -3562,33 +3611,67 @@
35623611         return null;
35633612     }
35643613     
3565
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35663614     
35673615     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)
35683640     {
35693641         System.err.println("Save");
35703642         
35713643         cRadio tab = GetCurrentTab();
35723644         
3573
-        boolean temp = CameraPane.SWITCH;
3574
-        CameraPane.SWITCH = false;
3645
+        byte[] compress = CompressCopy();
35753646         
3576
-        copy.ExtractBigData(hashtable);
3647
+        boolean thesame = false;
35773648         
3578
-        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
+        }
35793654         
35803655         //EditorFrame.m_MainFrame.requestFocusInWindow();
3581
-        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
+        }
35823666 
3583
-        copy.RestoreBigData(hashtable);
3667
+        //copy.RestoreBigData(versiontable);
35843668 
3585
-        CameraPane.SWITCH = temp;
3586
-        
35873669         //assert(hashtable.isEmpty());
35883670         
3589
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3671
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35903672         {
3591
-            tab.graphs[i] = null;
3673
+            //tab.user[i] = false;
3674
+            copy.versions[i] = null;
35923675         }
35933676 
35943677         SetUndoStates();
....@@ -3598,7 +3681,7 @@
35983681         {
35993682             try
36003683             {
3601
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3684
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36023685                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36033686 
36043687                 p.writeObject(copy);
....@@ -3611,6 +3694,8 @@
36113694                 e.printStackTrace();
36123695             }
36133696         }
3697
+        
3698
+        return !thesame;
36143699     }
36153700 
36163701     void CopyChanged(Object3D obj)
....@@ -3620,7 +3705,7 @@
36203705         boolean temp = CameraPane.SWITCH;
36213706         CameraPane.SWITCH = false;
36223707         
3623
-        copy.ExtractBigData(hashtable);
3708
+        copy.ExtractBigData(versiontable);
36243709         
36253710         copy.clear();
36263711         
....@@ -3629,7 +3714,7 @@
36293714             copy.add(obj.get(i));
36303715         }
36313716         
3632
-        copy.RestoreBigData(hashtable);
3717
+        copy.RestoreBigData(versiontable);
36333718         
36343719         CameraPane.SWITCH = temp;
36353720         
....@@ -3657,52 +3742,129 @@
36573742     }
36583743     
36593744     cButton undoButton;
3745
+    cButton restoreButton;
3746
+    cButton replaceButton;
36603747     cButton redoButton;
36613748         
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
+    
36623764     void SetUndoStates()
36633765     {
36643766         cRadio tab = GetCurrentTab();
36653767         
3666
-        undoButton.setEnabled(tab.undoindex > 0);
3667
-        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;
36683778     }
36693779     
3670
-    public void Undo()
3780
+    public boolean Undo()
36713781     {
3782
+        // Option?
3783
+        Replace();
3784
+        
36723785         System.err.println("Undo");
36733786         
36743787         cRadio tab = GetCurrentTab();
36753788         
3676
-        if (tab.undoindex == 0)
3789
+        if (copy.versionindex == 0)
36773790         {
36783791             java.awt.Toolkit.getDefaultToolkit().beep();
3679
-            return;
3792
+            return false;
36803793         }
36813794 
3682
-        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)
36833822         {
3684
-            Save();
3685
-            tab.undoindex -= 1;
3823
+            java.awt.Toolkit.getDefaultToolkit().beep();
3824
+            return false;
36863825         }
36873826 
3688
-        tab.undoindex -= 1;
3827
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3828
+        
3829
+        return true;
3830
+    }
36893831 
3690
-        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;
36913847     }
36923848 
36933849     public void Redo()
36943850     {
3851
+        // Option?
3852
+        Replace();
3853
+        
36953854         cRadio tab = GetCurrentTab();
36963855         
3697
-        if (tab.graphs[tab.undoindex + 1] == null)
3856
+        if (copy.versions[copy.versionindex + 1] == null)
36983857         {
36993858             java.awt.Toolkit.getDefaultToolkit().beep();
37003859             return;
37013860         }
37023861 
3703
-        tab.undoindex += 1;
3862
+        copy.versionindex += 1;
37043863 
3705
-        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;
37063868     }
37073869 
37083870         void ImportGFD()
....@@ -3998,9 +4160,25 @@
39984160         //copy.Touch();
39994161     }
40004162 
4163
+    cNumberSlider versionSlider;
4164
+    
40014165     public void stateChanged(ChangeEvent e)
40024166     {
40034167         //    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
+        }
40044182 
40054183         if (freezematerial)
40064184         {
....@@ -4349,7 +4527,7 @@
43494527 
43504528     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43514529     {
4352
-        if (Globals.SAVEONMAKE) // && resetmodel)
4530
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43534531             Save();
43544532         //Tween.set(thing, 0).target(1).start(tweenManager);
43554533         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4591,7 +4769,9 @@
45914769             readobj.ResetDisplayList();
45924770         } catch (Exception e)
45934771         {
4594
-            //e.printStackTrace();
4772
+            if (!e.toString().contains("GZIP"))
4773
+                e.printStackTrace();
4774
+            
45954775             try
45964776             {
45974777                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4665,8 +4845,8 @@
46654845         
46664846         if (readobj != null)
46674847         {
4668
-        if (Globals.SAVEONMAKE)
4669
-            Save();
4848
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4849
+        //    Save();
46704850             try
46714851             {
46724852                 //readobj.deepCopySelf(copy);
....@@ -4711,6 +4891,7 @@
47114891                 }
47124892             } catch (ClassCastException e)
47134893             {
4894
+                e.printStackTrace();
47144895                 assert (false);
47154896                 Composite c = (Composite) copy;
47164897                 c.children.clear();
....@@ -4721,6 +4902,17 @@
47214902                 c.addChild(csg);
47224903             }
47234904 
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
+            
47244916             ResetModel();
47254917             copy.HardTouch(); // recompile?
47264918             refreshContents();
....@@ -4830,6 +5022,7 @@
48305022             //ps.print(buffer.toString());
48315023         } catch (IOException e)
48325024         {
5025
+            e.printStackTrace();
48335026         }
48345027     }
48355028