blame | history | patch | commit | commitdiff
Normand Briere
2019-07-14 bc829f47837b5a001f911542140b0b8e63c2bb0c 
 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();
....@@ -1164,10 +1174,11 @@
11641174         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11651175         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11661176 
1177
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1178
+        link2masterCB.setToolTipText("Attach to support");
1179
+        
11671180         if (Globals.ADVANCED)
11681181         {
1169
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170
-                link2masterCB.setToolTipText("Attach to support");
11711182                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11721183                 speedupCB.setToolTipText("Option motion capture");
11731184         }
....@@ -1483,7 +1494,10 @@
14831494 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841495 //        objectPanel.add(north);
14851496         objectPanel.add(editPanel);
1486
-        objectPanel.add(infoPanel);
1497
+        
1498
+        //if (Globals.ADVANCED)
1499
+            objectPanel.add(infoPanel);
1500
+        
14871501         objectPanel.add(toolboxPanel);
14881502 
14891503         /*
....@@ -1592,9 +1606,9 @@
15921606 //		aConstraints.gridheight = 1;
15931607 
15941608         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1609
+        framePanel.setContinuousLayout(false);
1610
+        framePanel.setOneTouchExpandable(false);
1611
+        //.setDividerLocation(0.8);
15981612         //framePanel.setDividerSize(15);
15991613         //framePanel.setResizeWeight(0.15);
16001614         framePanel.setName("Frame");
....@@ -1613,12 +1627,13 @@
16131627 
16141628         frame.setSize(1280, 860);
16151629         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191630                     cameraView.requestFocusInWindow();
16201631                     
16211632         gridPanel.setDividerLocation(1.0);
1633
+        
1634
+        frame.validate();
1635
+
1636
+        frame.setVisible(true);
16221637 
16231638         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241639         frame.addWindowListener(new WindowAdapter()
....@@ -1965,8 +1980,9 @@
19651980             // 3D models
19661981             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19671982             {
1968
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1969
-                LoadFile(filename, lastConverter);
1983
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
1984
+                //LoadFile(filename, lastConverter);
1985
+                LoadObjFile(filename); // New 3ds loader
19701986                 continue;
19711987             }
19721988             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2692,6 +2708,7 @@
26922708                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26932709                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26942710             }
2711
+            
26952712             //cJME.count++;
26962713             //cJME.count %= 12;
26972714             if (gc)
....@@ -2875,6 +2892,7 @@
28752892             }
28762893         }
28772894     }
2895
+    
28782896     cFileSystemPane FSPane;
28792897 
28802898     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2928,6 +2946,7 @@
29282946                 }
29292947             }
29302948         }
2949
+        
29312950         freezematerial = false;
29322951     }
29332952 
....@@ -3380,9 +3399,9 @@
33803399         {
33813400             Close();
33823401             //return true;
3383
-        } else if (source == loadItem)
3402
+        } else if (source == openItem)
33843403         {
3385
-            load();
3404
+            Open();
33863405             //return true;
33873406         } else if (source == newItem)
33883407         {
....@@ -3407,6 +3426,10 @@
34073426         {
34083427             generatePOV();
34093428             //return true;
3429
+        } else if (event.getSource() == archiveItem)
3430
+        {
3431
+            cTools.Archive(frame);
3432
+            return;
34103433         } else if (source == zBufferItem)
34113434         {
34123435             try
....@@ -3458,8 +3481,8 @@
34583481         try
34593482         {
34603483             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3484
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3485
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34633486 
34643487         Object3D parent = o.parent;
34653488         o.parent = null;
....@@ -3470,10 +3493,14 @@
34703493         
34713494             out.flush();
34723495 
3473
-            zstream.close();
3496
+            baos //zstream
3497
+                    .close();
34743498             out.close();
34753499             
3476
-            return baos.toByteArray();
3500
+            byte[] bytes = baos.toByteArray();
3501
+            
3502
+        System.out.println("save #bytes = " + bytes.length);
3503
+            return bytes;
34773504         } catch (Exception e)
34783505         {
34793506             System.err.println(e);
....@@ -3483,13 +3510,16 @@
34833510 
34843511     static public Object Uncompress(byte[] bytes)
34853512     {
3486
-        System.out.println("#bytes = " + bytes.length);
3513
+        System.out.println("restore #bytes = " + bytes.length);
34873514         try
34883515         {
34893516             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491
-            ObjectInputStream in = new ObjectInputStream(istream);
3517
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3518
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34923519             Object obj = in.readObject();
3520
+            
3521
+            bais //istream
3522
+                    .close();
34933523             in.close();
34943524             
34953525             return obj;
....@@ -3548,6 +3578,27 @@
35483578     
35493579     public void Save()
35503580     {
3581
+        Save(true);
3582
+    }
3583
+    
3584
+    private boolean Equal(byte[] compress, byte[] name)
3585
+    {
3586
+        if (compress.length != name.length)
3587
+        {
3588
+            return false;
3589
+        }
3590
+        
3591
+        for (int i=compress.length; --i>=0;)
3592
+        {
3593
+            if (compress[i] != name[i])
3594
+                return false;
3595
+        }
3596
+        
3597
+        return true;
3598
+    }
3599
+
3600
+    public boolean Save(boolean user)
3601
+    {
35513602         System.err.println("Save");
35523603         
35533604         cRadio tab = GetCurrentTab();
....@@ -3558,19 +3609,37 @@
35583609         copy.ExtractBigData(hashtable);
35593610         
35603611         byte[] compress = Compress(copy);
3561
-        
3562
-        //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
-        tab.graphs[tab.undoindex++] = compress;
3564
-
3565
-        copy.RestoreBigData(hashtable);
35663612 
35673613         CameraPane.SWITCH = temp;
35683614         
3615
+        boolean thesame = false;
3616
+        
3617
+        // Quick heuristic using length. Works only when stream is compressed.
3618
+        if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3619
+        {
3620
+            thesame = true;
3621
+        }
3622
+        
3623
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3624
+        if (!thesame)
3625
+        {
3626
+            //tab.user[tab.undoindex] = user;
3627
+            boolean increment = tab.graphs[tab.undoindex] == null;
3628
+            
3629
+            tab.graphs[tab.undoindex] = compress;
3630
+            
3631
+            if (increment)
3632
+                tab.undoindex++;
3633
+        }
3634
+
3635
+        copy.RestoreBigData(hashtable);
3636
+
35693637         //assert(hashtable.isEmpty());
35703638         
35713639         for (int i = tab.undoindex; i < tab.graphs.length; i++)
35723640         {
3573
-            tab.graphs[i] = null;
3641
+            //tab.user[i] = false;
3642
+        //    tab.graphs[i] = null;
35743643         }
35753644 
35763645         SetUndoStates();
....@@ -3593,6 +3662,8 @@
35933662                 e.printStackTrace();
35943663             }
35953664         }
3665
+        
3666
+        return !thesame;
35963667     }
35973668 
35983669     void CopyChanged(Object3D obj)
....@@ -3649,7 +3720,7 @@
36493720         redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
36503721     }
36513722     
3652
-    public void Undo()
3723
+    public boolean Undo()
36533724     {
36543725         System.err.println("Undo");
36553726         
....@@ -3658,18 +3729,27 @@
36583729         if (tab.undoindex == 0)
36593730         {
36603731             java.awt.Toolkit.getDefaultToolkit().beep();
3661
-            return;
3732
+            return false;
36623733         }
36633734 
3664
-        if (tab.graphs[tab.undoindex] == null)
3735
+        if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
36653736         {
3666
-            Save();
3667
-            tab.undoindex -= 1;
3737
+            if (Save(false))
3738
+                tab.undoindex -= 1;
3739
+            else
3740
+            {
3741
+                if (tab.undoindex <= 0)
3742
+                    return false;
3743
+                else
3744
+                    tab.undoindex -= 1;
3745
+            }
36683746         }
36693747 
36703748         tab.undoindex -= 1;
36713749 
36723750         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3751
+        
3752
+        return true;
36733753     }
36743754 
36753755     public void Redo()
....@@ -3685,6 +3765,9 @@
36853765         tab.undoindex += 1;
36863766 
36873767         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3768
+        
3769
+        //if (!tab.user[tab.undoindex])
3770
+        //    tab.graphs[tab.undoindex] = null;
36883771     }
36893772 
36903773         void ImportGFD()
....@@ -4647,8 +4730,8 @@
46474730         
46484731         if (readobj != null)
46494732         {
4650
-        if (Globals.SAVEONMAKE)
4651
-            Save();
4733
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4734
+        //    Save();
46524735             try
46534736             {
46544737                 //readobj.deepCopySelf(copy);
....@@ -4709,7 +4792,7 @@
47094792         }
47104793     }
47114794 
4712
-    void load() // throws ClassNotFoundException
4795
+    void Open() // throws ClassNotFoundException
47134796     {
47144797         if (Grafreed.standAlone)
47154798         {
....@@ -4994,7 +5077,7 @@
49945077     MenuBar menuBar;
49955078     Menu fileMenu;
49965079     MenuItem newItem;
4997
-    MenuItem loadItem;
5080
+    MenuItem openItem;
49985081     MenuItem saveItem;
49995082     MenuItem saveAsItem;
50005083     MenuItem exportAsItem;
....@@ -5017,6 +5100,7 @@
50175100     CheckboxMenuItem toggleSwitchItem;
50185101     CheckboxMenuItem toggleRootItem;
50195102     CheckboxMenuItem animationItem;
5103
+    MenuItem archiveItem;
50205104     CheckboxMenuItem toggleHandleItem;
50215105     CheckboxMenuItem togglePaintItem;
50225106     JSplitPane mainPanel;