blame | history | patch | commit | commitdiff
Normand Briere
2019-07-07 46dbce888e7c3eff8969f1ddbe22e144410b67f4 
 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();
....@@ -1483,7 +1493,10 @@
14831493 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841494 //        objectPanel.add(north);
14851495         objectPanel.add(editPanel);
1486
-        objectPanel.add(infoPanel);
1496
+        
1497
+        //if (Globals.ADVANCED)
1498
+            objectPanel.add(infoPanel);
1499
+        
14871500         objectPanel.add(toolboxPanel);
14881501 
14891502         /*
....@@ -1592,9 +1605,9 @@
15921605 //		aConstraints.gridheight = 1;
15931606 
15941607         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1608
+        framePanel.setContinuousLayout(false);
1609
+        framePanel.setOneTouchExpandable(false);
1610
+        //.setDividerLocation(0.8);
15981611         //framePanel.setDividerSize(15);
15991612         //framePanel.setResizeWeight(0.15);
16001613         framePanel.setName("Frame");
....@@ -1613,12 +1626,13 @@
16131626 
16141627         frame.setSize(1280, 860);
16151628         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191629                     cameraView.requestFocusInWindow();
16201630                     
16211631         gridPanel.setDividerLocation(1.0);
1632
+        
1633
+        frame.validate();
1634
+
1635
+        frame.setVisible(true);
16221636 
16231637         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241638         frame.addWindowListener(new WindowAdapter()
....@@ -1965,8 +1979,9 @@
19651979             // 3D models
19661980             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19671981             {
1968
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1969
-                LoadFile(filename, lastConverter);
1982
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
1983
+                //LoadFile(filename, lastConverter);
1984
+                LoadObjFile(filename); // New 3ds loader
19701985                 continue;
19711986             }
19721987             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2692,6 +2707,7 @@
26922707                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26932708                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26942709             }
2710
+            
26952711             //cJME.count++;
26962712             //cJME.count %= 12;
26972713             if (gc)
....@@ -2875,6 +2891,7 @@
28752891             }
28762892         }
28772893     }
2894
+    
28782895     cFileSystemPane FSPane;
28792896 
28802897     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2928,6 +2945,7 @@
29282945                 }
29292946             }
29302947         }
2948
+        
29312949         freezematerial = false;
29322950     }
29332951 
....@@ -3380,9 +3398,9 @@
33803398         {
33813399             Close();
33823400             //return true;
3383
-        } else if (source == loadItem)
3401
+        } else if (source == openItem)
33843402         {
3385
-            load();
3403
+            Open();
33863404             //return true;
33873405         } else if (source == newItem)
33883406         {
....@@ -3407,6 +3425,10 @@
34073425         {
34083426             generatePOV();
34093427             //return true;
3428
+        } else if (event.getSource() == archiveItem)
3429
+        {
3430
+            cTools.Archive(frame);
3431
+            return;
34103432         } else if (source == zBufferItem)
34113433         {
34123434             try
....@@ -3548,6 +3570,28 @@
35483570     
35493571     public void Save()
35503572     {
3573
+        // Default reduces the probability of heuristics errors.
3574
+        Save(true);
3575
+    }
3576
+    
3577
+    private boolean Equal(byte[] compress, byte[] name)
3578
+    {
3579
+        if (compress.length != name.length)
3580
+        {
3581
+            return false;
3582
+        }
3583
+        
3584
+        for (int i=compress.length; --i>=0;)
3585
+        {
3586
+            if (compress[i] != name[i])
3587
+                return false;
3588
+        }
3589
+        
3590
+        return true;
3591
+    }
3592
+
3593
+    public boolean Save(boolean user)
3594
+    {
35513595         System.err.println("Save");
35523596         
35533597         cRadio tab = GetCurrentTab();
....@@ -3558,18 +3602,31 @@
35583602         copy.ExtractBigData(hashtable);
35593603         
35603604         byte[] compress = Compress(copy);
3561
-        
3562
-        //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
-        tab.graphs[tab.undoindex++] = compress;
3564
-
3565
-        copy.RestoreBigData(hashtable);
35663605 
35673606         CameraPane.SWITCH = temp;
35683607         
3608
+        boolean thesame = false;
3609
+        
3610
+        // 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]))
3612
+        {
3613
+            thesame = true;
3614
+        }
3615
+        
3616
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3617
+        if (!thesame)
3618
+        {
3619
+            tab.user[tab.undoindex] = user;
3620
+            tab.graphs[tab.undoindex++] = compress;
3621
+        }
3622
+
3623
+        copy.RestoreBigData(hashtable);
3624
+
35693625         //assert(hashtable.isEmpty());
35703626         
35713627         for (int i = tab.undoindex; i < tab.graphs.length; i++)
35723628         {
3629
+            tab.user[i] = false;
35733630             tab.graphs[i] = null;
35743631         }
35753632 
....@@ -3593,6 +3650,8 @@
35933650                 e.printStackTrace();
35943651             }
35953652         }
3653
+        
3654
+        return !thesame;
35963655     }
35973656 
35983657     void CopyChanged(Object3D obj)
....@@ -3649,7 +3708,7 @@
36493708         redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
36503709     }
36513710     
3652
-    public void Undo()
3711
+    public boolean Undo()
36533712     {
36543713         System.err.println("Undo");
36553714         
....@@ -3658,18 +3717,27 @@
36583717         if (tab.undoindex == 0)
36593718         {
36603719             java.awt.Toolkit.getDefaultToolkit().beep();
3661
-            return;
3720
+            return false;
36623721         }
36633722 
3664
-        if (tab.graphs[tab.undoindex] == null)
3723
+        if (tab.graphs[tab.undoindex] == null || !tab.user[tab.undoindex])
36653724         {
3666
-            Save();
3667
-            tab.undoindex -= 1;
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
+            }
36683734         }
36693735 
36703736         tab.undoindex -= 1;
36713737 
36723738         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3739
+        
3740
+        return true;
36733741     }
36743742 
36753743     public void Redo()
....@@ -3685,6 +3753,9 @@
36853753         tab.undoindex += 1;
36863754 
36873755         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3756
+        
3757
+        if (!tab.user[tab.undoindex])
3758
+            tab.graphs[tab.undoindex] = null;
36883759     }
36893760 
36903761         void ImportGFD()
....@@ -4709,7 +4780,7 @@
47094780         }
47104781     }
47114782 
4712
-    void load() // throws ClassNotFoundException
4783
+    void Open() // throws ClassNotFoundException
47134784     {
47144785         if (Grafreed.standAlone)
47154786         {
....@@ -4994,7 +5065,7 @@
49945065     MenuBar menuBar;
49955066     Menu fileMenu;
49965067     MenuItem newItem;
4997
-    MenuItem loadItem;
5068
+    MenuItem openItem;
49985069     MenuItem saveItem;
49995070     MenuItem saveAsItem;
50005071     MenuItem exportAsItem;
....@@ -5017,6 +5088,7 @@
50175088     CheckboxMenuItem toggleSwitchItem;
50185089     CheckboxMenuItem toggleRootItem;
50195090     CheckboxMenuItem animationItem;
5091
+    MenuItem archiveItem;
50205092     CheckboxMenuItem toggleHandleItem;
50215093     CheckboxMenuItem togglePaintItem;
50225094     JSplitPane mainPanel;