blame | history | patch | commit | commitdiff
Normand Briere
2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1 
 ObjEditor.java
....@@ -282,6 +282,12 @@
282282         client = inClient;
283283         copy = client;
284284 
285
+        if (copy.versions == null)
286
+        {
287
+            copy.versions = new byte[100][];
288
+            copy.versionindex = -1;
289
+        }
290
+        
285291         // "this" is not called: SetupUI2(objEditor);
286292     }
287293 
....@@ -295,6 +301,12 @@
295301         client = inClient;
296302         copy = client;
297303 
304
+        if (copy.versions == null)
305
+        {
306
+            copy.versions = new byte[100][];
307
+            copy.versionindex = -1;
308
+        }
309
+        
298310         SetupUI2(callee.GetEditor());
299311     }
300312 
....@@ -327,6 +339,12 @@
327339         copy = localCopy;
328340         copy.editWindow = this;
329341 
342
+        if (copy.versions == null)
343
+        {
344
+            copy.versions = new byte[100][];
345
+            copy.versionindex = -1;
346
+        }
347
+        
330348         SetupMenu();
331349 
332350         //SetupName(objEditor); // new
....@@ -816,6 +834,28 @@
816834             frame.validate();
817835         }
818836 
837
+    private byte[] CompressCopy()
838
+    {
839
+        boolean temp = CameraPane.SWITCH;
840
+        CameraPane.SWITCH = false;
841
+        
842
+        copy.ExtractBigData(versiontable);
843
+        // if (copy == client)
844
+        
845
+        byte[] versions[] = copy.versions;
846
+        copy.versions = null;
847
+        
848
+        byte[] compress = Compress(copy);
849
+        
850
+        copy.versions = versions;
851
+        
852
+        copy.RestoreBigData(versiontable);
853
+        
854
+        CameraPane.SWITCH = temp;
855
+        
856
+        return compress;
857
+    }
858
+
819859     private JTextPane createTextPane()
820860     {
821861 // TEXTAREA       String[] initString =
....@@ -1174,10 +1214,11 @@
11741214         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11751215         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11761216 
1217
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1218
+        link2masterCB.setToolTipText("Attach to support");
1219
+        
11771220         if (Globals.ADVANCED)
11781221         {
1179
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180
-                link2masterCB.setToolTipText("Attach to support");
11811222                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11821223                 speedupCB.setToolTipText("Option motion capture");
11831224         }
....@@ -3480,8 +3521,8 @@
34803521         try
34813522         {
34823523             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3483
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3484
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3524
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3525
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34853526 
34863527         Object3D parent = o.parent;
34873528         o.parent = null;
....@@ -3492,10 +3533,14 @@
34923533         
34933534             out.flush();
34943535 
3495
-            zstream.close();
3536
+            baos //zstream
3537
+                    .close();
34963538             out.close();
34973539             
3498
-            return baos.toByteArray();
3540
+            byte[] bytes = baos.toByteArray();
3541
+            
3542
+        System.out.println("save #bytes = " + bytes.length);
3543
+            return bytes;
34993544         } catch (Exception e)
35003545         {
35013546             System.err.println(e);
....@@ -3505,13 +3550,16 @@
35053550 
35063551     static public Object Uncompress(byte[] bytes)
35073552     {
3508
-        System.out.println("#bytes = " + bytes.length);
3553
+        System.out.println("restore #bytes = " + bytes.length);
35093554         try
35103555         {
35113556             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3512
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3513
-            ObjectInputStream in = new ObjectInputStream(istream);
3557
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3558
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35143559             Object obj = in.readObject();
3560
+            
3561
+            bais //istream
3562
+                    .close();
35153563             in.close();
35163564             
35173565             return obj;
....@@ -3566,12 +3614,11 @@
35663614         return null;
35673615     }
35683616     
3569
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35703617     
35713618     public void Save()
35723619     {
3573
-        // Default reduces the probability of heuristics errors.
3574
-        Save(true);
3620
+        //Save(true);
3621
+        Replace();
35753622     }
35763623     
35773624     private boolean Equal(byte[] compress, byte[] name)
....@@ -3590,25 +3637,20 @@
35903637         return true;
35913638     }
35923639 
3640
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3641
+    
35933642     public boolean Save(boolean user)
35943643     {
35953644         System.err.println("Save");
35963645         
35973646         cRadio tab = GetCurrentTab();
35983647         
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;
3648
+        byte[] compress = CompressCopy();
36073649         
36083650         boolean thesame = false;
36093651         
36103652         // 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]))
3653
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
36123654         {
36133655             thesame = true;
36143656         }
....@@ -3616,18 +3658,23 @@
36163658         //EditorFrame.m_MainFrame.requestFocusInWindow();
36173659         if (!thesame)
36183660         {
3619
-            tab.user[tab.undoindex] = user;
3620
-            tab.graphs[tab.undoindex++] = compress;
3661
+            //tab.user[tab.versionindex] = user;
3662
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663
+            
3664
+            copy.versions[++copy.versionindex] = compress;
3665
+            
3666
+            // if (increment)
3667
+            //     tab.versionindex++;
36213668         }
36223669 
3623
-        copy.RestoreBigData(hashtable);
3670
+        //copy.RestoreBigData(versiontable);
36243671 
36253672         //assert(hashtable.isEmpty());
36263673         
3627
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3674
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
36283675         {
3629
-            tab.user[i] = false;
3630
-            tab.graphs[i] = null;
3676
+            //tab.user[i] = false;
3677
+            copy.versions[i] = null;
36313678         }
36323679 
36333680         SetUndoStates();
....@@ -3637,7 +3684,7 @@
36373684         {
36383685             try
36393686             {
3640
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3687
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36413688                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36423689 
36433690                 p.writeObject(copy);
....@@ -3661,7 +3708,7 @@
36613708         boolean temp = CameraPane.SWITCH;
36623709         CameraPane.SWITCH = false;
36633710         
3664
-        copy.ExtractBigData(hashtable);
3711
+        copy.ExtractBigData(versiontable);
36653712         
36663713         copy.clear();
36673714         
....@@ -3670,7 +3717,7 @@
36703717             copy.add(obj.get(i));
36713718         }
36723719         
3673
-        copy.RestoreBigData(hashtable);
3720
+        copy.RestoreBigData(versiontable);
36743721         
36753722         CameraPane.SWITCH = temp;
36763723         
....@@ -3698,64 +3745,129 @@
36983745     }
36993746     
37003747     cButton undoButton;
3748
+    cButton restoreButton;
3749
+    cButton replaceButton;
37013750     cButton redoButton;
37023751         
3752
+    boolean muteSlider;
3753
+    
3754
+    int VersionCount()
3755
+    {
3756
+        int count = 0;
3757
+        
3758
+        for (int i = copy.versions.length; --i >= 0;)
3759
+        {
3760
+            if (copy.versions[i] != null)
3761
+                count++;
3762
+        }
3763
+        
3764
+        return count;
3765
+    }
3766
+    
37033767     void SetUndoStates()
37043768     {
37053769         cRadio tab = GetCurrentTab();
37063770         
3707
-        undoButton.setEnabled(tab.undoindex > 0);
3708
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3771
+        restoreButton.setEnabled(copy.versionindex != -1);
3772
+        replaceButton.setEnabled(copy.versionindex != -1);
3773
+        
3774
+        undoButton.setEnabled(copy.versionindex > 0);
3775
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776
+        
3777
+        muteSlider = true;
3778
+        versionSlider.setMaximum(VersionCount() - 1);
3779
+        versionSlider.setInteger(copy.versionindex);
3780
+        muteSlider = false;
37093781     }
37103782     
37113783     public boolean Undo()
37123784     {
3785
+        // Option?
3786
+        Replace();
3787
+        
37133788         System.err.println("Undo");
37143789         
37153790         cRadio tab = GetCurrentTab();
37163791         
3717
-        if (tab.undoindex == 0)
3792
+        if (copy.versionindex == 0)
37183793         {
37193794             java.awt.Toolkit.getDefaultToolkit().beep();
37203795             return false;
37213796         }
37223797 
3723
-        if (tab.graphs[tab.undoindex] == null || !tab.user[tab.undoindex])
3798
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3799
+//        {
3800
+//            if (Save(false))
3801
+//                tab.versionindex -= 1;
3802
+//            else
3803
+//            {
3804
+//                if (tab.versionindex <= 0)
3805
+//                    return false;
3806
+//                else
3807
+//                    tab.versionindex -= 1;
3808
+//            }
3809
+//        }
3810
+
3811
+        copy.versionindex -= 1;
3812
+
3813
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3814
+        
3815
+        return true;
3816
+    }
3817
+
3818
+    public boolean Restore()
3819
+    {
3820
+        System.err.println("Restore");
3821
+        
3822
+        cRadio tab = GetCurrentTab();
3823
+        
3824
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
37243825         {
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
-            }
3826
+            java.awt.Toolkit.getDefaultToolkit().beep();
3827
+            return false;
37343828         }
37353829 
3736
-        tab.undoindex -= 1;
3830
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3831
+        
3832
+        return true;
3833
+    }
37373834 
3738
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3835
+    public boolean Replace()
3836
+    {
3837
+        System.err.println("Replace");
3838
+        
3839
+        cRadio tab = GetCurrentTab();
3840
+        
3841
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3842
+        {
3843
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844
+            return false;
3845
+        }
3846
+
3847
+        copy.versions[copy.versionindex] = CompressCopy();
37393848         
37403849         return true;
37413850     }
37423851 
37433852     public void Redo()
37443853     {
3854
+        // Option?
3855
+        Replace();
3856
+        
37453857         cRadio tab = GetCurrentTab();
37463858         
3747
-        if (tab.graphs[tab.undoindex + 1] == null)
3859
+        if (copy.versions[copy.versionindex + 1] == null)
37483860         {
37493861             java.awt.Toolkit.getDefaultToolkit().beep();
37503862             return;
37513863         }
37523864 
3753
-        tab.undoindex += 1;
3865
+        copy.versionindex += 1;
37543866 
3755
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3867
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
37563868         
3757
-        if (!tab.user[tab.undoindex])
3758
-            tab.graphs[tab.undoindex] = null;
3869
+        //if (!tab.user[tab.versionindex])
3870
+        //    tab.graphs[tab.versionindex] = null;
37593871     }
37603872 
37613873         void ImportGFD()
....@@ -4051,9 +4163,25 @@
40514163         //copy.Touch();
40524164     }
40534165 
4166
+    cNumberSlider versionSlider;
4167
+    
40544168     public void stateChanged(ChangeEvent e)
40554169     {
40564170         //    assert(false);
4171
+        if (e.getSource() == versionSlider)
4172
+        {
4173
+            if (muteSlider)
4174
+                return;
4175
+            
4176
+            int version = versionSlider.getInteger();
4177
+            
4178
+            if (copy.versions[version] != null)
4179
+            {
4180
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4181
+            }
4182
+            
4183
+            return;
4184
+        }
40574185 
40584186         if (freezematerial)
40594187         {
....@@ -4402,7 +4530,7 @@
44024530 
44034531     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44044532     {
4405
-        if (Globals.SAVEONMAKE) // && resetmodel)
4533
+        if (Globals.REPLACEONMAKE) // && resetmodel)
44064534             Save();
44074535         //Tween.set(thing, 0).target(1).start(tweenManager);
44084536         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4718,8 +4846,8 @@
47184846         
47194847         if (readobj != null)
47204848         {
4721
-        if (Globals.SAVEONMAKE)
4722
-            Save();
4849
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4850
+        //    Save();
47234851             try
47244852             {
47254853                 //readobj.deepCopySelf(copy);
....@@ -4774,6 +4902,17 @@
47744902                 c.addChild(csg);
47754903             }
47764904 
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
+            
47774916             ResetModel();
47784917             copy.HardTouch(); // recompile?
47794918             refreshContents();