blame | history | patch | commit | commitdiff
Normand Briere
2019-07-30 7a77e39423398b7ad8bf7e80cf45fac6817000c2 
 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;
....@@ -3213,7 +3253,7 @@
32133253         {
32143254             copy.live ^= true;
32153255             return;
3216
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
32173257         {
32183258             copy.dontselect ^= true;
32193259             return;
....@@ -3480,8 +3520,8 @@
34803520         try
34813521         {
34823522             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3483
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3484
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3523
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3524
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34853525 
34863526         Object3D parent = o.parent;
34873527         o.parent = null;
....@@ -3492,10 +3532,14 @@
34923532         
34933533             out.flush();
34943534 
3495
-            zstream.close();
3535
+            baos //zstream
3536
+                    .close();
34963537             out.close();
34973538             
3498
-            return baos.toByteArray();
3539
+            byte[] bytes = baos.toByteArray();
3540
+            
3541
+        System.out.println("save #bytes = " + bytes.length);
3542
+            return bytes;
34993543         } catch (Exception e)
35003544         {
35013545             System.err.println(e);
....@@ -3505,13 +3549,16 @@
35053549 
35063550     static public Object Uncompress(byte[] bytes)
35073551     {
3508
-        System.out.println("#bytes = " + bytes.length);
3552
+        System.out.println("restore #bytes = " + bytes.length);
35093553         try
35103554         {
35113555             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3512
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3513
-            ObjectInputStream in = new ObjectInputStream(istream);
3556
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3557
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35143558             Object obj = in.readObject();
3559
+            
3560
+            bais //istream
3561
+                    .close();
35153562             in.close();
35163563             
35173564             return obj;
....@@ -3566,12 +3613,11 @@
35663613         return null;
35673614     }
35683615     
3569
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35703616     
35713617     public void Save()
35723618     {
3573
-        // Default reduces the probability of heuristics errors.
3574
-        Save(true);
3619
+        //Save(true);
3620
+        Replace();
35753621     }
35763622     
35773623     private boolean Equal(byte[] compress, byte[] name)
....@@ -3590,25 +3636,20 @@
35903636         return true;
35913637     }
35923638 
3639
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640
+    
35933641     public boolean Save(boolean user)
35943642     {
35953643         System.err.println("Save");
35963644         
35973645         cRadio tab = GetCurrentTab();
35983646         
3599
-        boolean temp = CameraPane.SWITCH;
3600
-        CameraPane.SWITCH = false;
3601
-        
3602
-        copy.ExtractBigData(hashtable);
3603
-        
3604
-        byte[] compress = Compress(copy);
3605
-
3606
-        CameraPane.SWITCH = temp;
3647
+        byte[] compress = CompressCopy();
36073648         
36083649         boolean thesame = false;
36093650         
36103651         // Quick heuristic using length. Works only when stream is compressed.
3611
-        if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3652
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
36123653         {
36133654             thesame = true;
36143655         }
....@@ -3616,18 +3657,23 @@
36163657         //EditorFrame.m_MainFrame.requestFocusInWindow();
36173658         if (!thesame)
36183659         {
3619
-            tab.user[tab.undoindex] = user;
3620
-            tab.graphs[tab.undoindex++] = compress;
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++;
36213667         }
36223668 
3623
-        copy.RestoreBigData(hashtable);
3669
+        //copy.RestoreBigData(versiontable);
36243670 
36253671         //assert(hashtable.isEmpty());
36263672         
3627
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3673
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
36283674         {
3629
-            tab.user[i] = false;
3630
-            tab.graphs[i] = null;
3675
+            //tab.user[i] = false;
3676
+            copy.versions[i] = null;
36313677         }
36323678 
36333679         SetUndoStates();
....@@ -3637,7 +3683,7 @@
36373683         {
36383684             try
36393685             {
3640
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3686
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36413687                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36423688 
36433689                 p.writeObject(copy);
....@@ -3661,7 +3707,7 @@
36613707         boolean temp = CameraPane.SWITCH;
36623708         CameraPane.SWITCH = false;
36633709         
3664
-        copy.ExtractBigData(hashtable);
3710
+        copy.ExtractBigData(versiontable);
36653711         
36663712         copy.clear();
36673713         
....@@ -3670,7 +3716,7 @@
36703716             copy.add(obj.get(i));
36713717         }
36723718         
3673
-        copy.RestoreBigData(hashtable);
3719
+        copy.RestoreBigData(versiontable);
36743720         
36753721         CameraPane.SWITCH = temp;
36763722         
....@@ -3698,64 +3744,129 @@
36983744     }
36993745     
37003746     cButton undoButton;
3747
+    cButton restoreButton;
3748
+    cButton replaceButton;
37013749     cButton redoButton;
37023750         
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
+    
37033766     void SetUndoStates()
37043767     {
37053768         cRadio tab = GetCurrentTab();
37063769         
3707
-        undoButton.setEnabled(tab.undoindex > 0);
3708
-        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;
37093780     }
37103781     
37113782     public boolean Undo()
37123783     {
3784
+        // Option?
3785
+        Replace();
3786
+        
37133787         System.err.println("Undo");
37143788         
37153789         cRadio tab = GetCurrentTab();
37163790         
3717
-        if (tab.undoindex == 0)
3791
+        if (copy.versionindex == 0)
37183792         {
37193793             java.awt.Toolkit.getDefaultToolkit().beep();
37203794             return false;
37213795         }
37223796 
3723
-        if (tab.graphs[tab.undoindex] == null || !tab.user[tab.undoindex])
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)
37243824         {
3725
-            if (Save(false))
3726
-                tab.undoindex -= 1;
3727
-            else
3728
-            {
3729
-                if (tab.undoindex <= 0)
3730
-                    return false;
3731
-                else
3732
-                    tab.undoindex -= 1;
3733
-            }
3825
+            java.awt.Toolkit.getDefaultToolkit().beep();
3826
+            return false;
37343827         }
37353828 
3736
-        tab.undoindex -= 1;
3829
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3830
+        
3831
+        return true;
3832
+    }
37373833 
3738
-        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();
37393847         
37403848         return true;
37413849     }
37423850 
37433851     public void Redo()
37443852     {
3853
+        // Option?
3854
+        Replace();
3855
+        
37453856         cRadio tab = GetCurrentTab();
37463857         
3747
-        if (tab.graphs[tab.undoindex + 1] == null)
3858
+        if (copy.versions[copy.versionindex + 1] == null)
37483859         {
37493860             java.awt.Toolkit.getDefaultToolkit().beep();
37503861             return;
37513862         }
37523863 
3753
-        tab.undoindex += 1;
3864
+        copy.versionindex += 1;
37543865 
3755
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3866
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
37563867         
3757
-        if (!tab.user[tab.undoindex])
3758
-            tab.graphs[tab.undoindex] = null;
3868
+        //if (!tab.user[tab.versionindex])
3869
+        //    tab.graphs[tab.versionindex] = null;
37593870     }
37603871 
37613872         void ImportGFD()
....@@ -4051,9 +4162,25 @@
40514162         //copy.Touch();
40524163     }
40534164 
4165
+    cNumberSlider versionSlider;
4166
+    
40544167     public void stateChanged(ChangeEvent e)
40554168     {
40564169         //    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
+        }
40574184 
40584185         if (freezematerial)
40594186         {
....@@ -4402,7 +4529,7 @@
44024529 
44034530     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44044531     {
4405
-        if (Globals.SAVEONMAKE) // && resetmodel)
4532
+        if (Globals.REPLACEONMAKE) // && resetmodel)
44064533             Save();
44074534         //Tween.set(thing, 0).target(1).start(tweenManager);
44084535         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4644,7 +4771,9 @@
46444771             readobj.ResetDisplayList();
46454772         } catch (Exception e)
46464773         {
4647
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
46484777             try
46494778             {
46504779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4718,12 +4847,14 @@
47184847         
47194848         if (readobj != null)
47204849         {
4721
-        if (Globals.SAVEONMAKE)
4722
-            Save();
4850
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4851
+        //    Save();
47234852             try
47244853             {
47254854                 //readobj.deepCopySelf(copy);
47264855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
47274858                 for (int i = 0; i < readobj.size(); i++)
47284859                 {
47294860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4764,6 +4895,7 @@
47644895                 }
47654896             } catch (ClassCastException e)
47664897             {
4898
+                e.printStackTrace();
47674899                 assert (false);
47684900                 Composite c = (Composite) copy;
47694901                 c.children.clear();
....@@ -4774,6 +4906,17 @@
47744906                 c.addChild(csg);
47754907             }
47764908 
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
+            
47774920             ResetModel();
47784921             copy.HardTouch(); // recompile?
47794922             refreshContents();
....@@ -4883,6 +5026,7 @@
48835026             //ps.print(buffer.toString());
48845027         } catch (IOException e)
48855028         {
5029
+            e.printStackTrace();
48865030         }
48875031     }
48885032