blame | history | patch | commit | commitdiff
Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9 
 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
+    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() > 48 && image.getHeight() > 48)
70
+//            {
71
+//                BufferedImage resized = new BufferedImage(48, 48, 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, 48, 48, 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         
....@@ -431,11 +436,11 @@
431436         editPanel.add(editCommandsPanel);
432437         editPanel.add(ctrlPanel);
433438                 
434
-        toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
439
+        toolboxPanel = new cGridBag().setVertical(true);
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,13 +1186,16 @@
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);
11671196         markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11681199         
11691200             setupPanel2 = new cGridBag().setVertical(false);
11701201             
....@@ -1174,10 +1205,11 @@
11741205         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11751206         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11761207 
1208
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1209
+        link2masterCB.setToolTipText("Attach to support");
1210
+        
11771211         if (Globals.ADVANCED)
11781212         {
1179
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180
-                link2masterCB.setToolTipText("Attach to support");
11811213                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11821214                 speedupCB.setToolTipText("Option motion capture");
11831215         }
....@@ -1451,6 +1483,7 @@
14511483         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14521484         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14531485         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+        //XYZPanel.setName("XYZ");
14541487 
14551488         /*
14561489         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1488,16 +1521,23 @@
14881521         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14891522         //tmp.setName("Edit");
14901523         objectPanel.add(materialPanel);
1524
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
14911525 //        JPanel north = new JPanel(new BorderLayout());
14921526 //        north.setName("Edit");
14931527 //        north.add(ctrlPanel, BorderLayout.NORTH);
14941528 //        objectPanel.add(north);
14951529         objectPanel.add(editPanel);
1530
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
14961531         
14971532         //if (Globals.ADVANCED)
14981533             objectPanel.add(infoPanel);
1534
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+        
1536
+        objectPanel.add(XYZPanel);
1537
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
14991538         
15001539         objectPanel.add(toolboxPanel);
1540
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15011541 
15021542         /*
15031543         aConstraints.gridx = 0;
....@@ -1518,7 +1558,7 @@
15181558         scrollpane.addMouseWheelListener(this); // Default not fast enough
15191559 
15201560         /*JTabbedPane*/ scenePanel = new cGridBag();
1521
-        scenePanel.preferredWidth = 6;
1561
+        scenePanel.preferredWidth = 5;
15221562         
15231563         JTabbedPane tabbedPane = new JTabbedPane();
15241564         tabbedPane.add(scrollpane);
....@@ -1594,9 +1634,9 @@
15941634         /**/
15951635 
15961636         bigThree = new cGridBag();
1597
-        bigThree.addComponent(scenePanel);
15981637         bigThree.addComponent(centralPanel);
1599
-        bigThree.addComponent(XYZPanel);
1638
+        bigThree.addComponent(scenePanel);
1639
+        //bigThree.addComponent(XYZPanel);
16001640         
16011641 //                // SIDE EFFECT!!!
16021642 //		aConstraints.gridx = 0;
....@@ -1979,8 +2019,9 @@
19792019             // 3D models
19802020             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19812021             {
1982
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1983
-                LoadFile(filename, lastConverter);
2022
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2023
+                //LoadFile(filename, lastConverter);
2024
+                LoadObjFile(filename); // New 3ds loader
19842025                 continue;
19852026             }
19862027             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2706,6 +2747,7 @@
27062747                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27072748                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27082749             }
2750
+            
27092751             //cJME.count++;
27102752             //cJME.count %= 12;
27112753             if (gc)
....@@ -2889,6 +2931,7 @@
28892931             }
28902932         }
28912933     }
2934
+    
28922935     cFileSystemPane FSPane;
28932936 
28942937     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2942,6 +2985,7 @@
29422985                 }
29432986             }
29442987         }
2988
+        
29452989         freezematerial = false;
29462990     }
29472991 
....@@ -3209,7 +3253,7 @@
32093253         {
32103254             copy.live ^= true;
32113255             return;
3212
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
32133257         {
32143258             copy.dontselect ^= true;
32153259             return;
....@@ -3476,8 +3520,8 @@
34763520         try
34773521         {
34783522             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3523
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3524
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34813525 
34823526         Object3D parent = o.parent;
34833527         o.parent = null;
....@@ -3488,10 +3532,14 @@
34883532         
34893533             out.flush();
34903534 
3491
-            zstream.close();
3535
+            baos //zstream
3536
+                    .close();
34923537             out.close();
34933538             
3494
-            return baos.toByteArray();
3539
+            byte[] bytes = baos.toByteArray();
3540
+            
3541
+        System.out.println("save #bytes = " + bytes.length);
3542
+            return bytes;
34953543         } catch (Exception e)
34963544         {
34973545             System.err.println(e);
....@@ -3501,13 +3549,16 @@
35013549 
35023550     static public Object Uncompress(byte[] bytes)
35033551     {
3504
-        System.out.println("#bytes = " + bytes.length);
3552
+        System.out.println("restore #bytes = " + bytes.length);
35053553         try
35063554         {
35073555             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509
-            ObjectInputStream in = new ObjectInputStream(istream);
3556
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3557
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35103558             Object obj = in.readObject();
3559
+            
3560
+            bais //istream
3561
+                    .close();
35113562             in.close();
35123563             
35133564             return obj;
....@@ -3562,33 +3613,67 @@
35623613         return null;
35633614     }
35643615     
3565
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35663616     
35673617     public void Save()
3618
+    {
3619
+        //Save(true);
3620
+        Replace();
3621
+    }
3622
+    
3623
+    private boolean Equal(byte[] compress, byte[] name)
3624
+    {
3625
+        if (compress.length != name.length)
3626
+        {
3627
+            return false;
3628
+        }
3629
+        
3630
+        for (int i=compress.length; --i>=0;)
3631
+        {
3632
+            if (compress[i] != name[i])
3633
+                return false;
3634
+        }
3635
+        
3636
+        return true;
3637
+    }
3638
+
3639
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640
+    
3641
+    public boolean Save(boolean user)
35683642     {
35693643         System.err.println("Save");
35703644         
35713645         cRadio tab = GetCurrentTab();
35723646         
3573
-        boolean temp = CameraPane.SWITCH;
3574
-        CameraPane.SWITCH = false;
3647
+        byte[] compress = CompressCopy();
35753648         
3576
-        copy.ExtractBigData(hashtable);
3649
+        boolean thesame = false;
35773650         
3578
-        byte[] compress = Compress(copy);
3651
+        // Quick heuristic using length. Works only when stream is compressed.
3652
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653
+        {
3654
+            thesame = true;
3655
+        }
35793656         
35803657         //EditorFrame.m_MainFrame.requestFocusInWindow();
3581
-        tab.graphs[tab.undoindex++] = compress;
3658
+        if (!thesame)
3659
+        {
3660
+            //tab.user[tab.versionindex] = user;
3661
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3662
+            
3663
+            copy.versions[++copy.versionindex] = compress;
3664
+            
3665
+            // if (increment)
3666
+            //     tab.versionindex++;
3667
+        }
35823668 
3583
-        copy.RestoreBigData(hashtable);
3669
+        //copy.RestoreBigData(versiontable);
35843670 
3585
-        CameraPane.SWITCH = temp;
3586
-        
35873671         //assert(hashtable.isEmpty());
35883672         
3589
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3673
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35903674         {
3591
-            tab.graphs[i] = null;
3675
+            //tab.user[i] = false;
3676
+            copy.versions[i] = null;
35923677         }
35933678 
35943679         SetUndoStates();
....@@ -3598,7 +3683,7 @@
35983683         {
35993684             try
36003685             {
3601
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3686
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36023687                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36033688 
36043689                 p.writeObject(copy);
....@@ -3611,6 +3696,8 @@
36113696                 e.printStackTrace();
36123697             }
36133698         }
3699
+        
3700
+        return !thesame;
36143701     }
36153702 
36163703     void CopyChanged(Object3D obj)
....@@ -3620,7 +3707,7 @@
36203707         boolean temp = CameraPane.SWITCH;
36213708         CameraPane.SWITCH = false;
36223709         
3623
-        copy.ExtractBigData(hashtable);
3710
+        copy.ExtractBigData(versiontable);
36243711         
36253712         copy.clear();
36263713         
....@@ -3629,7 +3716,7 @@
36293716             copy.add(obj.get(i));
36303717         }
36313718         
3632
-        copy.RestoreBigData(hashtable);
3719
+        copy.RestoreBigData(versiontable);
36333720         
36343721         CameraPane.SWITCH = temp;
36353722         
....@@ -3657,52 +3744,129 @@
36573744     }
36583745     
36593746     cButton undoButton;
3747
+    cButton restoreButton;
3748
+    cButton replaceButton;
36603749     cButton redoButton;
36613750         
3751
+    boolean muteSlider;
3752
+    
3753
+    int VersionCount()
3754
+    {
3755
+        int count = 0;
3756
+        
3757
+        for (int i = copy.versions.length; --i >= 0;)
3758
+        {
3759
+            if (copy.versions[i] != null)
3760
+                count++;
3761
+        }
3762
+        
3763
+        return count;
3764
+    }
3765
+    
36623766     void SetUndoStates()
36633767     {
36643768         cRadio tab = GetCurrentTab();
36653769         
3666
-        undoButton.setEnabled(tab.undoindex > 0);
3667
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3770
+        restoreButton.setEnabled(copy.versionindex != -1);
3771
+        replaceButton.setEnabled(copy.versionindex != -1);
3772
+        
3773
+        undoButton.setEnabled(copy.versionindex > 0);
3774
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3775
+        
3776
+        muteSlider = true;
3777
+        versionSlider.setMaximum(VersionCount() - 1);
3778
+        versionSlider.setInteger(copy.versionindex);
3779
+        muteSlider = false;
36683780     }
36693781     
3670
-    public void Undo()
3782
+    public boolean Undo()
36713783     {
3784
+        // Option?
3785
+        Replace();
3786
+        
36723787         System.err.println("Undo");
36733788         
36743789         cRadio tab = GetCurrentTab();
36753790         
3676
-        if (tab.undoindex == 0)
3791
+        if (copy.versionindex == 0)
36773792         {
36783793             java.awt.Toolkit.getDefaultToolkit().beep();
3679
-            return;
3794
+            return false;
36803795         }
36813796 
3682
-        if (tab.graphs[tab.undoindex] == null)
3797
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3798
+//        {
3799
+//            if (Save(false))
3800
+//                tab.versionindex -= 1;
3801
+//            else
3802
+//            {
3803
+//                if (tab.versionindex <= 0)
3804
+//                    return false;
3805
+//                else
3806
+//                    tab.versionindex -= 1;
3807
+//            }
3808
+//        }
3809
+
3810
+        copy.versionindex -= 1;
3811
+
3812
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3813
+        
3814
+        return true;
3815
+    }
3816
+
3817
+    public boolean Restore()
3818
+    {
3819
+        System.err.println("Restore");
3820
+        
3821
+        cRadio tab = GetCurrentTab();
3822
+        
3823
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36833824         {
3684
-            Save();
3685
-            tab.undoindex -= 1;
3825
+            java.awt.Toolkit.getDefaultToolkit().beep();
3826
+            return false;
36863827         }
36873828 
3688
-        tab.undoindex -= 1;
3829
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3830
+        
3831
+        return true;
3832
+    }
36893833 
3690
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3834
+    public boolean Replace()
3835
+    {
3836
+        System.err.println("Replace");
3837
+        
3838
+        cRadio tab = GetCurrentTab();
3839
+        
3840
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3841
+        {
3842
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3843
+            return false;
3844
+        }
3845
+
3846
+        copy.versions[copy.versionindex] = CompressCopy();
3847
+        
3848
+        return true;
36913849     }
36923850 
36933851     public void Redo()
36943852     {
3853
+        // Option?
3854
+        Replace();
3855
+        
36953856         cRadio tab = GetCurrentTab();
36963857         
3697
-        if (tab.graphs[tab.undoindex + 1] == null)
3858
+        if (copy.versions[copy.versionindex + 1] == null)
36983859         {
36993860             java.awt.Toolkit.getDefaultToolkit().beep();
37003861             return;
37013862         }
37023863 
3703
-        tab.undoindex += 1;
3864
+        copy.versionindex += 1;
37043865 
3705
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3866
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3867
+        
3868
+        //if (!tab.user[tab.versionindex])
3869
+        //    tab.graphs[tab.versionindex] = null;
37063870     }
37073871 
37083872         void ImportGFD()
....@@ -3998,9 +4162,25 @@
39984162         //copy.Touch();
39994163     }
40004164 
4165
+    cNumberSlider versionSlider;
4166
+    
40014167     public void stateChanged(ChangeEvent e)
40024168     {
40034169         //    assert(false);
4170
+        if (e.getSource() == versionSlider)
4171
+        {
4172
+            if (muteSlider)
4173
+                return;
4174
+            
4175
+            int version = versionSlider.getInteger();
4176
+            
4177
+            if (copy.versions[version] != null)
4178
+            {
4179
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4180
+            }
4181
+            
4182
+            return;
4183
+        }
40044184 
40054185         if (freezematerial)
40064186         {
....@@ -4349,7 +4529,7 @@
43494529 
43504530     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43514531     {
4352
-        if (Globals.SAVEONMAKE) // && resetmodel)
4532
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43534533             Save();
43544534         //Tween.set(thing, 0).target(1).start(tweenManager);
43554535         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4591,7 +4771,9 @@
45914771             readobj.ResetDisplayList();
45924772         } catch (Exception e)
45934773         {
4594
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
45954777             try
45964778             {
45974779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4665,12 +4847,14 @@
46654847         
46664848         if (readobj != null)
46674849         {
4668
-        if (Globals.SAVEONMAKE)
4669
-            Save();
4850
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4851
+        //    Save();
46704852             try
46714853             {
46724854                 //readobj.deepCopySelf(copy);
46734855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
46744858                 for (int i = 0; i < readobj.size(); i++)
46754859                 {
46764860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4711,6 +4895,7 @@
47114895                 }
47124896             } catch (ClassCastException e)
47134897             {
4898
+                e.printStackTrace();
47144899                 assert (false);
47154900                 Composite c = (Composite) copy;
47164901                 c.children.clear();
....@@ -4721,6 +4906,17 @@
47214906                 c.addChild(csg);
47224907             }
47234908 
4909
+            copy.versions = readobj.versions;
4910
+            copy.versionindex = readobj.versionindex;
4911
+            
4912
+        if (copy.versions == null)
4913
+        {
4914
+            copy.versions = new byte[100][];
4915
+            copy.versionindex = -1;
4916
+        }
4917
+        
4918
+            //? SetUndoStates();
4919
+            
47244920             ResetModel();
47254921             copy.HardTouch(); // recompile?
47264922             refreshContents();
....@@ -4830,6 +5026,7 @@
48305026             //ps.print(buffer.toString());
48315027         } catch (IOException e)
48325028         {
5029
+            e.printStackTrace();
48335030         }
48345031     }
48355032