blame | history | patch | commit | commitdiff
Normand Briere
2019-07-17 a5580a47d246c1272b10adba68070f6e13da5e41 
 ObjEditor.java
....@@ -350,7 +350,7 @@
350350         frame.setMenuBar(menuBar = new MenuBar());
351351         menuBar.add(fileMenu = new Menu("File"));
352352         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
353
+        fileMenu.add(openItem = new MenuItem("Open..."));
354354         
355355                 //oe.menuBar.add(menu = new Menu("Include"));
356356         Menu menu = new Menu("Import");
....@@ -382,7 +382,7 @@
382382         }
383383 
384384         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
385
+        openItem.addActionListener(this);
386386         saveItem.addActionListener(this);
387387         saveAsItem.addActionListener(this);
388388         exportAsItem.addActionListener(this);
....@@ -449,7 +449,7 @@
449449 // TEXTAREA           infoarea.setLineWrap(true);
450450 // TEXTAREA           infoarea.setWrapStyleWord(true);
451451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        //infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        infoPanel.setPreferredSize(new Dimension(1, 1));
453453         infoPanel.setName("Info");
454454         //infoPanel.setLayout(new BorderLayout());
455455         //infoPanel.add(createTextPane());
....@@ -780,7 +780,7 @@
780780 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
781781 // X                   framePanel.add(bigThree);
782782 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
783
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
784784                     
785785                     //frame.setVisible(true);
786786                     radio.layout = keepButton;
....@@ -815,6 +815,28 @@
815815                 }
816816             frame.validate();
817817         }
818
+
819
+    private byte[] CompressCopy()
820
+    {
821
+        boolean temp = CameraPane.SWITCH;
822
+        CameraPane.SWITCH = false;
823
+        
824
+        copy.ExtractBigData(versiontable);
825
+        // if (copy == client)
826
+        
827
+        byte[] versions[] = copy.versions;
828
+        copy.versions = null;
829
+        
830
+        byte[] compress = Compress(copy);
831
+        
832
+        copy.versions = versions;
833
+        
834
+        copy.RestoreBigData(versiontable);
835
+        
836
+        CameraPane.SWITCH = temp;
837
+        
838
+        return compress;
839
+    }
818840 
819841     private JTextPane createTextPane()
820842     {
....@@ -1174,10 +1196,11 @@
11741196         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11751197         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11761198 
1199
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1200
+        link2masterCB.setToolTipText("Attach to support");
1201
+        
11771202         if (Globals.ADVANCED)
11781203         {
1179
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180
-                link2masterCB.setToolTipText("Attach to support");
11811204                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11821205                 speedupCB.setToolTipText("Option motion capture");
11831206         }
....@@ -1493,7 +1516,10 @@
14931516 //        north.add(ctrlPanel, BorderLayout.NORTH);
14941517 //        objectPanel.add(north);
14951518         objectPanel.add(editPanel);
1496
-        objectPanel.add(infoPanel);
1519
+        
1520
+        //if (Globals.ADVANCED)
1521
+            objectPanel.add(infoPanel);
1522
+        
14971523         objectPanel.add(toolboxPanel);
14981524 
14991525         /*
....@@ -1602,9 +1628,9 @@
16021628 //		aConstraints.gridheight = 1;
16031629 
16041630         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605
-        framePanel.setContinuousLayout(true);
1606
-        framePanel.setOneTouchExpandable(true);
1607
-        framePanel.setDividerLocation(0.8);
1631
+        framePanel.setContinuousLayout(false);
1632
+        framePanel.setOneTouchExpandable(false);
1633
+        //.setDividerLocation(0.8);
16081634         //framePanel.setDividerSize(15);
16091635         //framePanel.setResizeWeight(0.15);
16101636         framePanel.setName("Frame");
....@@ -1976,8 +2002,9 @@
19762002             // 3D models
19772003             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19782004             {
1979
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1980
-                LoadFile(filename, lastConverter);
2005
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2006
+                //LoadFile(filename, lastConverter);
2007
+                LoadObjFile(filename); // New 3ds loader
19812008                 continue;
19822009             }
19832010             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2703,6 +2730,7 @@
27032730                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
27042731                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
27052732             }
2733
+            
27062734             //cJME.count++;
27072735             //cJME.count %= 12;
27082736             if (gc)
....@@ -2886,6 +2914,7 @@
28862914             }
28872915         }
28882916     }
2917
+    
28892918     cFileSystemPane FSPane;
28902919 
28912920     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2939,6 +2968,7 @@
29392968                 }
29402969             }
29412970         }
2971
+        
29422972         freezematerial = false;
29432973     }
29442974 
....@@ -3391,9 +3421,9 @@
33913421         {
33923422             Close();
33933423             //return true;
3394
-        } else if (source == loadItem)
3424
+        } else if (source == openItem)
33953425         {
3396
-            load();
3426
+            Open();
33973427             //return true;
33983428         } else if (source == newItem)
33993429         {
....@@ -3418,6 +3448,10 @@
34183448         {
34193449             generatePOV();
34203450             //return true;
3451
+        } else if (event.getSource() == archiveItem)
3452
+        {
3453
+            cTools.Archive(frame);
3454
+            return;
34213455         } else if (source == zBufferItem)
34223456         {
34233457             try
....@@ -3469,8 +3503,8 @@
34693503         try
34703504         {
34713505             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3506
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3507
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34743508 
34753509         Object3D parent = o.parent;
34763510         o.parent = null;
....@@ -3481,10 +3515,14 @@
34813515         
34823516             out.flush();
34833517 
3484
-            zstream.close();
3518
+            baos //zstream
3519
+                    .close();
34853520             out.close();
34863521             
3487
-            return baos.toByteArray();
3522
+            byte[] bytes = baos.toByteArray();
3523
+            
3524
+        System.out.println("save #bytes = " + bytes.length);
3525
+            return bytes;
34883526         } catch (Exception e)
34893527         {
34903528             System.err.println(e);
....@@ -3494,13 +3532,16 @@
34943532 
34953533     static public Object Uncompress(byte[] bytes)
34963534     {
3497
-        System.out.println("#bytes = " + bytes.length);
3535
+        System.out.println("restore #bytes = " + bytes.length);
34983536         try
34993537         {
35003538             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502
-            ObjectInputStream in = new ObjectInputStream(istream);
3539
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3540
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
35033541             Object obj = in.readObject();
3542
+            
3543
+            bais //istream
3544
+                    .close();
35043545             in.close();
35053546             
35063547             return obj;
....@@ -3555,33 +3596,67 @@
35553596         return null;
35563597     }
35573598     
3558
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35593599     
35603600     public void Save()
3601
+    {
3602
+        //Save(true);
3603
+        Replace();
3604
+    }
3605
+    
3606
+    private boolean Equal(byte[] compress, byte[] name)
3607
+    {
3608
+        if (compress.length != name.length)
3609
+        {
3610
+            return false;
3611
+        }
3612
+        
3613
+        for (int i=compress.length; --i>=0;)
3614
+        {
3615
+            if (compress[i] != name[i])
3616
+                return false;
3617
+        }
3618
+        
3619
+        return true;
3620
+    }
3621
+
3622
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3623
+    
3624
+    public boolean Save(boolean user)
35613625     {
35623626         System.err.println("Save");
35633627         
35643628         cRadio tab = GetCurrentTab();
35653629         
3566
-        boolean temp = CameraPane.SWITCH;
3567
-        CameraPane.SWITCH = false;
3630
+        byte[] compress = CompressCopy();
35683631         
3569
-        copy.ExtractBigData(hashtable);
3632
+        boolean thesame = false;
35703633         
3571
-        byte[] compress = Compress(copy);
3634
+        // Quick heuristic using length. Works only when stream is compressed.
3635
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3636
+        {
3637
+            thesame = true;
3638
+        }
35723639         
35733640         //EditorFrame.m_MainFrame.requestFocusInWindow();
3574
-        tab.graphs[tab.undoindex++] = compress;
3641
+        if (!thesame)
3642
+        {
3643
+            //tab.user[tab.versionindex] = user;
3644
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3645
+            
3646
+            copy.versions[++copy.versionindex] = compress;
3647
+            
3648
+            // if (increment)
3649
+            //     tab.versionindex++;
3650
+        }
35753651 
3576
-        copy.RestoreBigData(hashtable);
3652
+        //copy.RestoreBigData(versiontable);
35773653 
3578
-        CameraPane.SWITCH = temp;
3579
-        
35803654         //assert(hashtable.isEmpty());
35813655         
3582
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3656
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35833657         {
3584
-            tab.graphs[i] = null;
3658
+            //tab.user[i] = false;
3659
+            copy.versions[i] = null;
35853660         }
35863661 
35873662         SetUndoStates();
....@@ -3591,7 +3666,7 @@
35913666         {
35923667             try
35933668             {
3594
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3669
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35953670                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35963671 
35973672                 p.writeObject(copy);
....@@ -3604,6 +3679,8 @@
36043679                 e.printStackTrace();
36053680             }
36063681         }
3682
+        
3683
+        return !thesame;
36073684     }
36083685 
36093686     void CopyChanged(Object3D obj)
....@@ -3613,7 +3690,7 @@
36133690         boolean temp = CameraPane.SWITCH;
36143691         CameraPane.SWITCH = false;
36153692         
3616
-        copy.ExtractBigData(hashtable);
3693
+        copy.ExtractBigData(versiontable);
36173694         
36183695         copy.clear();
36193696         
....@@ -3622,7 +3699,7 @@
36223699             copy.add(obj.get(i));
36233700         }
36243701         
3625
-        copy.RestoreBigData(hashtable);
3702
+        copy.RestoreBigData(versiontable);
36263703         
36273704         CameraPane.SWITCH = temp;
36283705         
....@@ -3650,52 +3727,102 @@
36503727     }
36513728     
36523729     cButton undoButton;
3730
+    cButton restoreButton;
3731
+    cButton replaceButton;
36533732     cButton redoButton;
36543733         
36553734     void SetUndoStates()
36563735     {
36573736         cRadio tab = GetCurrentTab();
36583737         
3659
-        undoButton.setEnabled(tab.undoindex > 0);
3660
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3738
+        restoreButton.setEnabled(copy.versionindex != -1);
3739
+        replaceButton.setEnabled(copy.versionindex != -1);
3740
+        undoButton.setEnabled(copy.versionindex > 0);
3741
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
36613742     }
36623743     
3663
-    public void Undo()
3744
+    public boolean Undo()
36643745     {
36653746         System.err.println("Undo");
36663747         
36673748         cRadio tab = GetCurrentTab();
36683749         
3669
-        if (tab.undoindex == 0)
3750
+        if (copy.versionindex == 0)
36703751         {
36713752             java.awt.Toolkit.getDefaultToolkit().beep();
3672
-            return;
3753
+            return false;
36733754         }
36743755 
3675
-        if (tab.graphs[tab.undoindex] == null)
3756
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3757
+//        {
3758
+//            if (Save(false))
3759
+//                tab.versionindex -= 1;
3760
+//            else
3761
+//            {
3762
+//                if (tab.versionindex <= 0)
3763
+//                    return false;
3764
+//                else
3765
+//                    tab.versionindex -= 1;
3766
+//            }
3767
+//        }
3768
+
3769
+        copy.versionindex -= 1;
3770
+
3771
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3772
+        
3773
+        return true;
3774
+    }
3775
+
3776
+    public boolean Restore()
3777
+    {
3778
+        System.err.println("Restore");
3779
+        
3780
+        cRadio tab = GetCurrentTab();
3781
+        
3782
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36763783         {
3677
-            Save();
3678
-            tab.undoindex -= 1;
3784
+            java.awt.Toolkit.getDefaultToolkit().beep();
3785
+            return false;
36793786         }
36803787 
3681
-        tab.undoindex -= 1;
3788
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3789
+        
3790
+        return true;
3791
+    }
36823792 
3683
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3793
+    public boolean Replace()
3794
+    {
3795
+        System.err.println("Replace");
3796
+        
3797
+        cRadio tab = GetCurrentTab();
3798
+        
3799
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3800
+        {
3801
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3802
+            return false;
3803
+        }
3804
+
3805
+        copy.versions[copy.versionindex] = CompressCopy();
3806
+        
3807
+        return true;
36843808     }
36853809 
36863810     public void Redo()
36873811     {
36883812         cRadio tab = GetCurrentTab();
36893813         
3690
-        if (tab.graphs[tab.undoindex + 1] == null)
3814
+        if (copy.versions[copy.versionindex + 1] == null)
36913815         {
36923816             java.awt.Toolkit.getDefaultToolkit().beep();
36933817             return;
36943818         }
36953819 
3696
-        tab.undoindex += 1;
3820
+        copy.versionindex += 1;
36973821 
3698
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3822
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3823
+        
3824
+        //if (!tab.user[tab.versionindex])
3825
+        //    tab.graphs[tab.versionindex] = null;
36993826     }
37003827 
37013828         void ImportGFD()
....@@ -3991,9 +4118,22 @@
39914118         //copy.Touch();
39924119     }
39934120 
4121
+    cNumberSlider versionField;
4122
+    
39944123     public void stateChanged(ChangeEvent e)
39954124     {
39964125         //    assert(false);
4126
+        if (e.getSource() == versionField)
4127
+        {
4128
+            int version = versionField.getInteger();
4129
+            
4130
+            if (copy.versions[version] != null)
4131
+            {
4132
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4133
+            }
4134
+            
4135
+            return;
4136
+        }
39974137 
39984138         if (freezematerial)
39994139         {
....@@ -4342,7 +4482,7 @@
43424482 
43434483     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43444484     {
4345
-        if (Globals.SAVEONMAKE) // && resetmodel)
4485
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43464486             Save();
43474487         //Tween.set(thing, 0).target(1).start(tweenManager);
43484488         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4658,8 +4798,8 @@
46584798         
46594799         if (readobj != null)
46604800         {
4661
-        if (Globals.SAVEONMAKE)
4662
-            Save();
4801
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4802
+        //    Save();
46634803             try
46644804             {
46654805                 //readobj.deepCopySelf(copy);
....@@ -4714,13 +4854,18 @@
47144854                 c.addChild(csg);
47154855             }
47164856 
4857
+            copy.versions = readobj.versions;
4858
+            copy.versionindex = readobj.versionindex;
4859
+            
4860
+            SetUndoStates();
4861
+            
47174862             ResetModel();
47184863             copy.HardTouch(); // recompile?
47194864             refreshContents();
47204865         }
47214866     }
47224867 
4723
-    void load() // throws ClassNotFoundException
4868
+    void Open() // throws ClassNotFoundException
47244869     {
47254870         if (Grafreed.standAlone)
47264871         {
....@@ -5005,7 +5150,7 @@
50055150     MenuBar menuBar;
50065151     Menu fileMenu;
50075152     MenuItem newItem;
5008
-    MenuItem loadItem;
5153
+    MenuItem openItem;
50095154     MenuItem saveItem;
50105155     MenuItem saveAsItem;
50115156     MenuItem exportAsItem;
....@@ -5028,6 +5173,7 @@
50285173     CheckboxMenuItem toggleSwitchItem;
50295174     CheckboxMenuItem toggleRootItem;
50305175     CheckboxMenuItem animationItem;
5176
+    MenuItem archiveItem;
50315177     CheckboxMenuItem toggleHandleItem;
50325178     CheckboxMenuItem togglePaintItem;
50335179     JSplitPane mainPanel;