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
....@@ -350,7 +368,7 @@
350368         frame.setMenuBar(menuBar = new MenuBar());
351369         menuBar.add(fileMenu = new Menu("File"));
352370         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
371
+        fileMenu.add(openItem = new MenuItem("Open..."));
354372         
355373                 //oe.menuBar.add(menu = new Menu("Include"));
356374         Menu menu = new Menu("Import");
....@@ -382,7 +400,7 @@
382400         }
383401 
384402         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
403
+        openItem.addActionListener(this);
386404         saveItem.addActionListener(this);
387405         saveAsItem.addActionListener(this);
388406         exportAsItem.addActionListener(this);
....@@ -449,7 +467,7 @@
449467 // TEXTAREA           infoarea.setLineWrap(true);
450468 // TEXTAREA           infoarea.setWrapStyleWord(true);
451469         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        //infoPanel.setPreferredSize(new Dimension(50, 200));
470
+        infoPanel.setPreferredSize(new Dimension(1, 1));
453471         infoPanel.setName("Info");
454472         //infoPanel.setLayout(new BorderLayout());
455473         //infoPanel.add(createTextPane());
....@@ -780,7 +798,7 @@
780798 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
781799 // X                   framePanel.add(bigThree);
782800 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
783
-                    framePanel.setDividerLocation(1);
801
+                    framePanel.setDividerLocation(46);
784802                     
785803                     //frame.setVisible(true);
786804                     radio.layout = keepButton;
....@@ -815,6 +833,28 @@
815833                 }
816834             frame.validate();
817835         }
836
+
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
+    }
818858 
819859     private JTextPane createTextPane()
820860     {
....@@ -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         }
....@@ -1493,7 +1534,10 @@
14931534 //        north.add(ctrlPanel, BorderLayout.NORTH);
14941535 //        objectPanel.add(north);
14951536         objectPanel.add(editPanel);
1496
-        objectPanel.add(infoPanel);
1537
+        
1538
+        //if (Globals.ADVANCED)
1539
+            objectPanel.add(infoPanel);
1540
+        
14971541         objectPanel.add(toolboxPanel);
14981542 
14991543         /*
....@@ -1602,9 +1646,9 @@
16021646 //		aConstraints.gridheight = 1;
16031647 
16041648         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605
-        framePanel.setContinuousLayout(true);
1606
-        framePanel.setOneTouchExpandable(true);
1607
-        framePanel.setDividerLocation(0.8);
1649
+        framePanel.setContinuousLayout(false);
1650
+        framePanel.setOneTouchExpandable(false);
1651
+        //.setDividerLocation(0.8);
16081652         //framePanel.setDividerSize(15);
16091653         //framePanel.setResizeWeight(0.15);
16101654         framePanel.setName("Frame");
....@@ -1976,8 +2020,9 @@
19762020             // 3D models
19772021             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19782022             {
1979
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1980
-                LoadFile(filename, lastConverter);
2023
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2024
+                //LoadFile(filename, lastConverter);
2025
+                LoadObjFile(filename); // New 3ds loader
19812026                 continue;
19822027             }
19832028             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2703,6 +2748,7 @@
27032748                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27042749                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27052750             }
2751
+            
27062752             //cJME.count++;
27072753             //cJME.count %= 12;
27082754             if (gc)
....@@ -2886,6 +2932,7 @@
28862932             }
28872933         }
28882934     }
2935
+    
28892936     cFileSystemPane FSPane;
28902937 
28912938     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2939,6 +2986,7 @@
29392986                 }
29402987             }
29412988         }
2989
+        
29422990         freezematerial = false;
29432991     }
29442992 
....@@ -3391,9 +3439,9 @@
33913439         {
33923440             Close();
33933441             //return true;
3394
-        } else if (source == loadItem)
3442
+        } else if (source == openItem)
33953443         {
3396
-            load();
3444
+            Open();
33973445             //return true;
33983446         } else if (source == newItem)
33993447         {
....@@ -3418,6 +3466,10 @@
34183466         {
34193467             generatePOV();
34203468             //return true;
3469
+        } else if (event.getSource() == archiveItem)
3470
+        {
3471
+            cTools.Archive(frame);
3472
+            return;
34213473         } else if (source == zBufferItem)
34223474         {
34233475             try
....@@ -3469,8 +3521,8 @@
34693521         try
34703522         {
34713523             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3524
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3525
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34743526 
34753527         Object3D parent = o.parent;
34763528         o.parent = null;
....@@ -3481,10 +3533,14 @@
34813533         
34823534             out.flush();
34833535 
3484
-            zstream.close();
3536
+            baos //zstream
3537
+                    .close();
34853538             out.close();
34863539             
3487
-            return baos.toByteArray();
3540
+            byte[] bytes = baos.toByteArray();
3541
+            
3542
+        System.out.println("save #bytes = " + bytes.length);
3543
+            return bytes;
34883544         } catch (Exception e)
34893545         {
34903546             System.err.println(e);
....@@ -3494,13 +3550,16 @@
34943550 
34953551     static public Object Uncompress(byte[] bytes)
34963552     {
3497
-        System.out.println("#bytes = " + bytes.length);
3553
+        System.out.println("restore #bytes = " + bytes.length);
34983554         try
34993555         {
35003556             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502
-            ObjectInputStream in = new ObjectInputStream(istream);
3557
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3558
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35033559             Object obj = in.readObject();
3560
+            
3561
+            bais //istream
3562
+                    .close();
35043563             in.close();
35053564             
35063565             return obj;
....@@ -3555,33 +3614,67 @@
35553614         return null;
35563615     }
35573616     
3558
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35593617     
35603618     public void Save()
3619
+    {
3620
+        //Save(true);
3621
+        Replace();
3622
+    }
3623
+    
3624
+    private boolean Equal(byte[] compress, byte[] name)
3625
+    {
3626
+        if (compress.length != name.length)
3627
+        {
3628
+            return false;
3629
+        }
3630
+        
3631
+        for (int i=compress.length; --i>=0;)
3632
+        {
3633
+            if (compress[i] != name[i])
3634
+                return false;
3635
+        }
3636
+        
3637
+        return true;
3638
+    }
3639
+
3640
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3641
+    
3642
+    public boolean Save(boolean user)
35613643     {
35623644         System.err.println("Save");
35633645         
35643646         cRadio tab = GetCurrentTab();
35653647         
3566
-        boolean temp = CameraPane.SWITCH;
3567
-        CameraPane.SWITCH = false;
3648
+        byte[] compress = CompressCopy();
35683649         
3569
-        copy.ExtractBigData(hashtable);
3650
+        boolean thesame = false;
35703651         
3571
-        byte[] compress = Compress(copy);
3652
+        // Quick heuristic using length. Works only when stream is compressed.
3653
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654
+        {
3655
+            thesame = true;
3656
+        }
35723657         
35733658         //EditorFrame.m_MainFrame.requestFocusInWindow();
3574
-        tab.graphs[tab.undoindex++] = compress;
3659
+        if (!thesame)
3660
+        {
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++;
3668
+        }
35753669 
3576
-        copy.RestoreBigData(hashtable);
3670
+        //copy.RestoreBigData(versiontable);
35773671 
3578
-        CameraPane.SWITCH = temp;
3579
-        
35803672         //assert(hashtable.isEmpty());
35813673         
3582
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3674
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35833675         {
3584
-            tab.graphs[i] = null;
3676
+            //tab.user[i] = false;
3677
+            copy.versions[i] = null;
35853678         }
35863679 
35873680         SetUndoStates();
....@@ -3591,7 +3684,7 @@
35913684         {
35923685             try
35933686             {
3594
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3687
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35953688                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35963689 
35973690                 p.writeObject(copy);
....@@ -3604,6 +3697,8 @@
36043697                 e.printStackTrace();
36053698             }
36063699         }
3700
+        
3701
+        return !thesame;
36073702     }
36083703 
36093704     void CopyChanged(Object3D obj)
....@@ -3613,7 +3708,7 @@
36133708         boolean temp = CameraPane.SWITCH;
36143709         CameraPane.SWITCH = false;
36153710         
3616
-        copy.ExtractBigData(hashtable);
3711
+        copy.ExtractBigData(versiontable);
36173712         
36183713         copy.clear();
36193714         
....@@ -3622,7 +3717,7 @@
36223717             copy.add(obj.get(i));
36233718         }
36243719         
3625
-        copy.RestoreBigData(hashtable);
3720
+        copy.RestoreBigData(versiontable);
36263721         
36273722         CameraPane.SWITCH = temp;
36283723         
....@@ -3650,52 +3745,129 @@
36503745     }
36513746     
36523747     cButton undoButton;
3748
+    cButton restoreButton;
3749
+    cButton replaceButton;
36533750     cButton redoButton;
36543751         
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
+    
36553767     void SetUndoStates()
36563768     {
36573769         cRadio tab = GetCurrentTab();
36583770         
3659
-        undoButton.setEnabled(tab.undoindex > 0);
3660
-        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;
36613781     }
36623782     
3663
-    public void Undo()
3783
+    public boolean Undo()
36643784     {
3785
+        // Option?
3786
+        Replace();
3787
+        
36653788         System.err.println("Undo");
36663789         
36673790         cRadio tab = GetCurrentTab();
36683791         
3669
-        if (tab.undoindex == 0)
3792
+        if (copy.versionindex == 0)
36703793         {
36713794             java.awt.Toolkit.getDefaultToolkit().beep();
3672
-            return;
3795
+            return false;
36733796         }
36743797 
3675
-        if (tab.graphs[tab.undoindex] == null)
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)
36763825         {
3677
-            Save();
3678
-            tab.undoindex -= 1;
3826
+            java.awt.Toolkit.getDefaultToolkit().beep();
3827
+            return false;
36793828         }
36803829 
3681
-        tab.undoindex -= 1;
3830
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3831
+        
3832
+        return true;
3833
+    }
36823834 
3683
-        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();
3848
+        
3849
+        return true;
36843850     }
36853851 
36863852     public void Redo()
36873853     {
3854
+        // Option?
3855
+        Replace();
3856
+        
36883857         cRadio tab = GetCurrentTab();
36893858         
3690
-        if (tab.graphs[tab.undoindex + 1] == null)
3859
+        if (copy.versions[copy.versionindex + 1] == null)
36913860         {
36923861             java.awt.Toolkit.getDefaultToolkit().beep();
36933862             return;
36943863         }
36953864 
3696
-        tab.undoindex += 1;
3865
+        copy.versionindex += 1;
36973866 
3698
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3867
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3868
+        
3869
+        //if (!tab.user[tab.versionindex])
3870
+        //    tab.graphs[tab.versionindex] = null;
36993871     }
37003872 
37013873         void ImportGFD()
....@@ -3991,9 +4163,25 @@
39914163         //copy.Touch();
39924164     }
39934165 
4166
+    cNumberSlider versionSlider;
4167
+    
39944168     public void stateChanged(ChangeEvent e)
39954169     {
39964170         //    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
+        }
39974185 
39984186         if (freezematerial)
39994187         {
....@@ -4342,7 +4530,7 @@
43424530 
43434531     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43444532     {
4345
-        if (Globals.SAVEONMAKE) // && resetmodel)
4533
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43464534             Save();
43474535         //Tween.set(thing, 0).target(1).start(tweenManager);
43484536         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4658,8 +4846,8 @@
46584846         
46594847         if (readobj != null)
46604848         {
4661
-        if (Globals.SAVEONMAKE)
4662
-            Save();
4849
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4850
+        //    Save();
46634851             try
46644852             {
46654853                 //readobj.deepCopySelf(copy);
....@@ -4714,13 +4902,24 @@
47144902                 c.addChild(csg);
47154903             }
47164904 
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
+            
47174916             ResetModel();
47184917             copy.HardTouch(); // recompile?
47194918             refreshContents();
47204919         }
47214920     }
47224921 
4723
-    void load() // throws ClassNotFoundException
4922
+    void Open() // throws ClassNotFoundException
47244923     {
47254924         if (Grafreed.standAlone)
47264925         {
....@@ -5005,7 +5204,7 @@
50055204     MenuBar menuBar;
50065205     Menu fileMenu;
50075206     MenuItem newItem;
5008
-    MenuItem loadItem;
5207
+    MenuItem openItem;
50095208     MenuItem saveItem;
50105209     MenuItem saveAsItem;
50115210     MenuItem exportAsItem;
....@@ -5028,6 +5227,7 @@
50285227     CheckboxMenuItem toggleSwitchItem;
50295228     CheckboxMenuItem toggleRootItem;
50305229     CheckboxMenuItem animationItem;
5230
+    MenuItem archiveItem;
50315231     CheckboxMenuItem toggleHandleItem;
50325232     CheckboxMenuItem togglePaintItem;
50335233     JSplitPane mainPanel;