blame | history | patch | commit | commitdiff
Normand Briere
2019-07-17 a5580a47d246c1272b10adba68070f6e13da5e41 
 ObjEditor.java
....@@ -309,7 +309,7 @@
309309         //localCopy.parent = null;
310310 
311311         frame = new JFrame();
312
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
313313         objEditor = this;
314314         this.callee = callee;
315315 
....@@ -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());
....@@ -699,8 +699,8 @@
699699         }
700700     }
701701 
702
-static GraphicsDevice device = GraphicsEnvironment
703
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704704 
705705     Rectangle keeprect;
706706         cRadio radio;
....@@ -741,10 +741,11 @@
741741             else
742742             {
743743                 keeprect = frame.getBounds();
744
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
-                Dimension rect2 = frame.getToolkit().getScreenSize();
746
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
744
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
746
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747747 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748749             }
749750             
750751             maximized ^= true;
....@@ -758,12 +759,17 @@
758759         
759760         void ToggleFullScreen()
760761         {
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
761764                 cameraView.ToggleFullScreen();
762765                 
763766                 if (!CameraPane.FULLSCREEN)
764767                 {
765768                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
766771             frame.validate();
772
+                    frame.setVisible(true);
767773                     
768774                     //frame.setVisible(false);
769775 //                frame.removeNotify();
....@@ -774,7 +780,7 @@
774780 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
775781 // X                   framePanel.add(bigThree);
776782 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
777
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
778784                     
779785                     //frame.setVisible(true);
780786                     radio.layout = keepButton;
....@@ -789,8 +795,12 @@
789795 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790796 //                        frame.getToolkit().getScreenSize().height);
791797                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
792801                     device.setFullScreenWindow(frame);
793802             frame.validate();
803
+                    frame.setVisible(true);
794804 //                frame.removeNotify();
795805 //                frame.setUndecorated(true);
796806 //                frame.addNotify();
....@@ -805,6 +815,28 @@
805815                 }
806816             frame.validate();
807817         }
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
+    }
808840 
809841     private JTextPane createTextPane()
810842     {
....@@ -1164,10 +1196,11 @@
11641196         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11651197         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11661198 
1199
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1200
+        link2masterCB.setToolTipText("Attach to support");
1201
+        
11671202         if (Globals.ADVANCED)
11681203         {
1169
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170
-                link2masterCB.setToolTipText("Attach to support");
11711204                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11721205                 speedupCB.setToolTipText("Option motion capture");
11731206         }
....@@ -1483,7 +1516,10 @@
14831516 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841517 //        objectPanel.add(north);
14851518         objectPanel.add(editPanel);
1486
-        objectPanel.add(infoPanel);
1519
+        
1520
+        //if (Globals.ADVANCED)
1521
+            objectPanel.add(infoPanel);
1522
+        
14871523         objectPanel.add(toolboxPanel);
14881524 
14891525         /*
....@@ -1592,9 +1628,9 @@
15921628 //		aConstraints.gridheight = 1;
15931629 
15941630         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1631
+        framePanel.setContinuousLayout(false);
1632
+        framePanel.setOneTouchExpandable(false);
1633
+        //.setDividerLocation(0.8);
15981634         //framePanel.setDividerSize(15);
15991635         //framePanel.setResizeWeight(0.15);
16001636         framePanel.setName("Frame");
....@@ -1613,12 +1649,13 @@
16131649 
16141650         frame.setSize(1280, 860);
16151651         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191652                     cameraView.requestFocusInWindow();
16201653                     
16211654         gridPanel.setDividerLocation(1.0);
1655
+        
1656
+        frame.validate();
1657
+
1658
+        frame.setVisible(true);
16221659 
16231660         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241661         frame.addWindowListener(new WindowAdapter()
....@@ -1965,8 +2002,9 @@
19652002             // 3D models
19662003             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19672004             {
1968
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1969
-                LoadFile(filename, lastConverter);
2005
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2006
+                //LoadFile(filename, lastConverter);
2007
+                LoadObjFile(filename); // New 3ds loader
19702008                 continue;
19712009             }
19722010             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2692,6 +2730,7 @@
26922730                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26932731                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26942732             }
2733
+            
26952734             //cJME.count++;
26962735             //cJME.count %= 12;
26972736             if (gc)
....@@ -2875,6 +2914,7 @@
28752914             }
28762915         }
28772916     }
2917
+    
28782918     cFileSystemPane FSPane;
28792919 
28802920     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2928,6 +2968,7 @@
29282968                 }
29292969             }
29302970         }
2971
+        
29312972         freezematerial = false;
29322973     }
29332974 
....@@ -3380,9 +3421,9 @@
33803421         {
33813422             Close();
33823423             //return true;
3383
-        } else if (source == loadItem)
3424
+        } else if (source == openItem)
33843425         {
3385
-            load();
3426
+            Open();
33863427             //return true;
33873428         } else if (source == newItem)
33883429         {
....@@ -3407,6 +3448,10 @@
34073448         {
34083449             generatePOV();
34093450             //return true;
3451
+        } else if (event.getSource() == archiveItem)
3452
+        {
3453
+            cTools.Archive(frame);
3454
+            return;
34103455         } else if (source == zBufferItem)
34113456         {
34123457             try
....@@ -3458,8 +3503,8 @@
34583503         try
34593504         {
34603505             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3506
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3507
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34633508 
34643509         Object3D parent = o.parent;
34653510         o.parent = null;
....@@ -3470,10 +3515,14 @@
34703515         
34713516             out.flush();
34723517 
3473
-            zstream.close();
3518
+            baos //zstream
3519
+                    .close();
34743520             out.close();
34753521             
3476
-            return baos.toByteArray();
3522
+            byte[] bytes = baos.toByteArray();
3523
+            
3524
+        System.out.println("save #bytes = " + bytes.length);
3525
+            return bytes;
34773526         } catch (Exception e)
34783527         {
34793528             System.err.println(e);
....@@ -3483,13 +3532,16 @@
34833532 
34843533     static public Object Uncompress(byte[] bytes)
34853534     {
3486
-        System.out.println("#bytes = " + bytes.length);
3535
+        System.out.println("restore #bytes = " + bytes.length);
34873536         try
34883537         {
34893538             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491
-            ObjectInputStream in = new ObjectInputStream(istream);
3539
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3540
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34923541             Object obj = in.readObject();
3542
+            
3543
+            bais //istream
3544
+                    .close();
34933545             in.close();
34943546             
34953547             return obj;
....@@ -3544,33 +3596,67 @@
35443596         return null;
35453597     }
35463598     
3547
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35483599     
35493600     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)
35503625     {
35513626         System.err.println("Save");
35523627         
35533628         cRadio tab = GetCurrentTab();
35543629         
3555
-        boolean temp = CameraPane.SWITCH;
3556
-        CameraPane.SWITCH = false;
3630
+        byte[] compress = CompressCopy();
35573631         
3558
-        copy.ExtractBigData(hashtable);
3632
+        boolean thesame = false;
35593633         
3560
-        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
+        }
35613639         
35623640         //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
-        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
+        }
35643651 
3565
-        copy.RestoreBigData(hashtable);
3652
+        //copy.RestoreBigData(versiontable);
35663653 
3567
-        CameraPane.SWITCH = temp;
3568
-        
35693654         //assert(hashtable.isEmpty());
35703655         
3571
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3656
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35723657         {
3573
-            tab.graphs[i] = null;
3658
+            //tab.user[i] = false;
3659
+            copy.versions[i] = null;
35743660         }
35753661 
35763662         SetUndoStates();
....@@ -3580,7 +3666,7 @@
35803666         {
35813667             try
35823668             {
3583
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3669
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35843670                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35853671 
35863672                 p.writeObject(copy);
....@@ -3593,6 +3679,8 @@
35933679                 e.printStackTrace();
35943680             }
35953681         }
3682
+        
3683
+        return !thesame;
35963684     }
35973685 
35983686     void CopyChanged(Object3D obj)
....@@ -3602,7 +3690,7 @@
36023690         boolean temp = CameraPane.SWITCH;
36033691         CameraPane.SWITCH = false;
36043692         
3605
-        copy.ExtractBigData(hashtable);
3693
+        copy.ExtractBigData(versiontable);
36063694         
36073695         copy.clear();
36083696         
....@@ -3611,7 +3699,7 @@
36113699             copy.add(obj.get(i));
36123700         }
36133701         
3614
-        copy.RestoreBigData(hashtable);
3702
+        copy.RestoreBigData(versiontable);
36153703         
36163704         CameraPane.SWITCH = temp;
36173705         
....@@ -3639,52 +3727,102 @@
36393727     }
36403728     
36413729     cButton undoButton;
3730
+    cButton restoreButton;
3731
+    cButton replaceButton;
36423732     cButton redoButton;
36433733         
36443734     void SetUndoStates()
36453735     {
36463736         cRadio tab = GetCurrentTab();
36473737         
3648
-        undoButton.setEnabled(tab.undoindex > 0);
3649
-        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);
36503742     }
36513743     
3652
-    public void Undo()
3744
+    public boolean Undo()
36533745     {
36543746         System.err.println("Undo");
36553747         
36563748         cRadio tab = GetCurrentTab();
36573749         
3658
-        if (tab.undoindex == 0)
3750
+        if (copy.versionindex == 0)
36593751         {
36603752             java.awt.Toolkit.getDefaultToolkit().beep();
3661
-            return;
3753
+            return false;
36623754         }
36633755 
3664
-        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)
36653783         {
3666
-            Save();
3667
-            tab.undoindex -= 1;
3784
+            java.awt.Toolkit.getDefaultToolkit().beep();
3785
+            return false;
36683786         }
36693787 
3670
-        tab.undoindex -= 1;
3788
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3789
+        
3790
+        return true;
3791
+    }
36713792 
3672
-        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;
36733808     }
36743809 
36753810     public void Redo()
36763811     {
36773812         cRadio tab = GetCurrentTab();
36783813         
3679
-        if (tab.graphs[tab.undoindex + 1] == null)
3814
+        if (copy.versions[copy.versionindex + 1] == null)
36803815         {
36813816             java.awt.Toolkit.getDefaultToolkit().beep();
36823817             return;
36833818         }
36843819 
3685
-        tab.undoindex += 1;
3820
+        copy.versionindex += 1;
36863821 
3687
-        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;
36883826     }
36893827 
36903828         void ImportGFD()
....@@ -3980,9 +4118,22 @@
39804118         //copy.Touch();
39814119     }
39824120 
4121
+    cNumberSlider versionField;
4122
+    
39834123     public void stateChanged(ChangeEvent e)
39844124     {
39854125         //    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
+        }
39864137 
39874138         if (freezematerial)
39884139         {
....@@ -4331,7 +4482,7 @@
43314482 
43324483     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43334484     {
4334
-        if (Globals.SAVEONMAKE) // && resetmodel)
4485
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43354486             Save();
43364487         //Tween.set(thing, 0).target(1).start(tweenManager);
43374488         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4647,8 +4798,8 @@
46474798         
46484799         if (readobj != null)
46494800         {
4650
-        if (Globals.SAVEONMAKE)
4651
-            Save();
4801
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4802
+        //    Save();
46524803             try
46534804             {
46544805                 //readobj.deepCopySelf(copy);
....@@ -4703,13 +4854,18 @@
47034854                 c.addChild(csg);
47044855             }
47054856 
4857
+            copy.versions = readobj.versions;
4858
+            copy.versionindex = readobj.versionindex;
4859
+            
4860
+            SetUndoStates();
4861
+            
47064862             ResetModel();
47074863             copy.HardTouch(); // recompile?
47084864             refreshContents();
47094865         }
47104866     }
47114867 
4712
-    void load() // throws ClassNotFoundException
4868
+    void Open() // throws ClassNotFoundException
47134869     {
47144870         if (Grafreed.standAlone)
47154871         {
....@@ -4994,7 +5150,7 @@
49945150     MenuBar menuBar;
49955151     Menu fileMenu;
49965152     MenuItem newItem;
4997
-    MenuItem loadItem;
5153
+    MenuItem openItem;
49985154     MenuItem saveItem;
49995155     MenuItem saveAsItem;
50005156     MenuItem exportAsItem;
....@@ -5017,6 +5173,7 @@
50175173     CheckboxMenuItem toggleSwitchItem;
50185174     CheckboxMenuItem toggleRootItem;
50195175     CheckboxMenuItem animationItem;
5176
+    MenuItem archiveItem;
50205177     CheckboxMenuItem toggleHandleItem;
50215178     CheckboxMenuItem togglePaintItem;
50225179     JSplitPane mainPanel;