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());
....@@ -463,10 +463,11 @@
463463         mainPanel.setResizeWeight(0.5);
464464         
465465 //mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
-//    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
-//    divider.setDividerSize(15);
468
-//    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
466
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+    divider.setDividerSize(15);
468
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469469     
470
+    mainPanel.setUI(new BasicSplitPaneUI());
470471     
471472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472473         //mainPanel.setLayout(new GridBagLayout());
....@@ -698,8 +699,8 @@
698699         }
699700     }
700701 
701
-static GraphicsDevice device = GraphicsEnvironment
702
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
703704 
704705     Rectangle keeprect;
705706         cRadio radio;
....@@ -720,10 +721,19 @@
720721         void Minimize()
721722         {
722723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
723725         }
724726         
727
+//        artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
728
+//        artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
729
+//        artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
725730         void Maximize()
726731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
727737             if (maximized)
728738             {
729739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -731,22 +741,36 @@
731741             else
732742             {
733743                 keeprect = frame.getBounds();
734
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735
-                Dimension rect2 = frame.getToolkit().getScreenSize();
736
-                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);
737747 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
738749             }
739750             
740751             maximized ^= true;
752
+            
753
+            frame.validate();
741754         }
755
+        
756
+	cButton minButton;
757
+	cButton maxButton;
758
+	cButton fullButton;
742759         
743760         void ToggleFullScreen()
744761         {
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
745764                 cameraView.ToggleFullScreen();
746765                 
747766                 if (!CameraPane.FULLSCREEN)
748767                 {
749768                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
771
+            frame.validate();
772
+                    frame.setVisible(true);
773
+                    
750774                     //frame.setVisible(false);
751775 //                frame.removeNotify();
752776 //                frame.setUndecorated(false);
....@@ -756,7 +780,7 @@
756780 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
757781 // X                   framePanel.add(bigThree);
758782 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
759
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
760784                     
761785                     //frame.setVisible(true);
762786                     radio.layout = keepButton;
....@@ -771,7 +795,12 @@
771795 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772796 //                        frame.getToolkit().getScreenSize().height);
773797                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
774801                     device.setFullScreenWindow(frame);
802
+            frame.validate();
803
+                    frame.setVisible(true);
775804 //                frame.removeNotify();
776805 //                frame.setUndecorated(true);
777806 //                frame.addNotify();
....@@ -784,6 +813,7 @@
784813                     radio.layout.doClick();
785814                     //frame.setVisible(true);
786815                 }
816
+            frame.validate();
787817         }
788818 
789819     private JTextPane createTextPane()
....@@ -1116,7 +1146,7 @@
11161146             namePanel = new cGridBag();
11171147             
11181148         nameField = AddText(namePanel, copy.GetName());
1119
-        namePanel.add(nameField);
1149
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11201150         oe.ctrlPanel.add(namePanel);
11211151         
11221152         oe.ctrlPanel.Return();
....@@ -1141,13 +1171,14 @@
11411171         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11421172         rewindCB.setToolTipText("Rewind animation");
11431173         
1144
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1174
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11451175         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11461176 
1177
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1178
+        link2masterCB.setToolTipText("Attach to support");
1179
+        
11471180         if (Globals.ADVANCED)
11481181         {
1149
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1150
-                link2masterCB.setToolTipText("Attach to support");
11511182                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11521183                 speedupCB.setToolTipText("Option motion capture");
11531184         }
....@@ -1463,7 +1494,10 @@
14631494 //        north.add(ctrlPanel, BorderLayout.NORTH);
14641495 //        objectPanel.add(north);
14651496         objectPanel.add(editPanel);
1466
-        objectPanel.add(infoPanel);
1497
+        
1498
+        //if (Globals.ADVANCED)
1499
+            objectPanel.add(infoPanel);
1500
+        
14671501         objectPanel.add(toolboxPanel);
14681502 
14691503         /*
....@@ -1572,9 +1606,9 @@
15721606 //		aConstraints.gridheight = 1;
15731607 
15741608         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1575
-        framePanel.setContinuousLayout(true);
1576
-        framePanel.setOneTouchExpandable(true);
1577
-        framePanel.setDividerLocation(0.8);
1609
+        framePanel.setContinuousLayout(false);
1610
+        framePanel.setOneTouchExpandable(false);
1611
+        //.setDividerLocation(0.8);
15781612         //framePanel.setDividerSize(15);
15791613         //framePanel.setResizeWeight(0.15);
15801614         framePanel.setName("Frame");
....@@ -1593,12 +1627,13 @@
15931627 
15941628         frame.setSize(1280, 860);
15951629         
1596
-        frame.validate();
1597
-        frame.setVisible(true);
1598
-
15991630                     cameraView.requestFocusInWindow();
16001631                     
16011632         gridPanel.setDividerLocation(1.0);
1633
+        
1634
+        frame.validate();
1635
+
1636
+        frame.setVisible(true);
16021637 
16031638         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16041639         frame.addWindowListener(new WindowAdapter()
....@@ -1685,24 +1720,6 @@
16851720                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16861721         colorSection.add(texture);
16871722 
1688
-        cGridBag anisoU = new cGridBag();
1689
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692
-        colorSection.add(anisoU);
1693
-
1694
-        cGridBag anisoV = new cGridBag();
1695
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698
-        colorSection.add(anisoV);
1699
-
1700
-        cGridBag shadowbias = new cGridBag();
1701
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704
-        colorSection.add(shadowbias);
1705
-
17061723         panel.add(new JSeparator());
17071724         
17081725         panel.add(colorSection);
....@@ -1752,6 +1769,12 @@
17521769                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17531770                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17541771         diffuseSection.add(fakedepth);
1772
+
1773
+        cGridBag shadowbias = new cGridBag();
1774
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1775
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1776
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777
+        diffuseSection.add(shadowbias);
17551778 
17561779         panel.add(new JSeparator());
17571780         
....@@ -1803,6 +1826,18 @@
18031826 //		aConstraints.gridy += 1;
18041827 //		aConstraints.gridwidth = 1;
18051828 
1829
+        cGridBag anisoU = new cGridBag();
1830
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1831
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1832
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1833
+        specularSection.add(anisoU);
1834
+
1835
+        cGridBag anisoV = new cGridBag();
1836
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1837
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1838
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1839
+        specularSection.add(anisoV);
1840
+
18061841 
18071842         panel.add(new JSeparator());
18081843         
....@@ -1810,35 +1845,35 @@
18101845         
18111846         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18121847         
1813
-        cGridBag globalSection = new cGridBag().setVertical(true);
1848
+        //cGridBag globalSection = new cGridBag().setVertical(true);
18141849 
18151850         cGridBag camera = new cGridBag();
18161851                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18171852                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18181853                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819
-        globalSection.add(camera);
1854
+        colorSection.add(camera);
18201855 
18211856         cGridBag ambient = new cGridBag();
18221857                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18231858                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18241859                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825
-        globalSection.add(ambient);
1860
+        colorSection.add(ambient);
18261861 
18271862         cGridBag backlit = new cGridBag();
18281863                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18291864                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18301865                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831
-        globalSection.add(backlit);
1866
+        colorSection.add(backlit);
18321867 
18331868         cGridBag opacity = new cGridBag();
18341869                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
18351870                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18361871                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837
-        globalSection.add(opacity);
1872
+        colorSection.add(opacity);
18381873 
1839
-        panel.add(new JSeparator());
1874
+        //panel.add(new JSeparator());
18401875         
1841
-        panel.add(globalSection);
1876
+        //panel.add(globalSection);
18421877         
18431878         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18441879         
....@@ -1945,8 +1980,9 @@
19451980             // 3D models
19461981             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19471982             {
1948
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1949
-                LoadFile(filename, lastConverter);
1983
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
1984
+                //LoadFile(filename, lastConverter);
1985
+                LoadObjFile(filename); // New 3ds loader
19501986                 continue;
19511987             }
19521988             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2672,6 +2708,7 @@
26722708                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26732709                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26742710             }
2711
+            
26752712             //cJME.count++;
26762713             //cJME.count %= 12;
26772714             if (gc)
....@@ -2855,6 +2892,7 @@
28552892             }
28562893         }
28572894     }
2895
+    
28582896     cFileSystemPane FSPane;
28592897 
28602898     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2908,6 +2946,7 @@
29082946                 }
29092947             }
29102948         }
2949
+        
29112950         freezematerial = false;
29122951     }
29132952 
....@@ -3360,9 +3399,9 @@
33603399         {
33613400             Close();
33623401             //return true;
3363
-        } else if (source == loadItem)
3402
+        } else if (source == openItem)
33643403         {
3365
-            load();
3404
+            Open();
33663405             //return true;
33673406         } else if (source == newItem)
33683407         {
....@@ -3387,6 +3426,10 @@
33873426         {
33883427             generatePOV();
33893428             //return true;
3429
+        } else if (event.getSource() == archiveItem)
3430
+        {
3431
+            cTools.Archive(frame);
3432
+            return;
33903433         } else if (source == zBufferItem)
33913434         {
33923435             try
....@@ -3438,8 +3481,8 @@
34383481         try
34393482         {
34403483             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3484
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3485
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34433486 
34443487         Object3D parent = o.parent;
34453488         o.parent = null;
....@@ -3450,10 +3493,14 @@
34503493         
34513494             out.flush();
34523495 
3453
-            zstream.close();
3496
+            baos //zstream
3497
+                    .close();
34543498             out.close();
34553499             
3456
-            return baos.toByteArray();
3500
+            byte[] bytes = baos.toByteArray();
3501
+            
3502
+        System.out.println("save #bytes = " + bytes.length);
3503
+            return bytes;
34573504         } catch (Exception e)
34583505         {
34593506             System.err.println(e);
....@@ -3463,13 +3510,16 @@
34633510 
34643511     static public Object Uncompress(byte[] bytes)
34653512     {
3466
-        System.out.println("#bytes = " + bytes.length);
3513
+        System.out.println("restore #bytes = " + bytes.length);
34673514         try
34683515         {
34693516             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471
-            ObjectInputStream in = new ObjectInputStream(istream);
3517
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3518
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34723519             Object obj = in.readObject();
3520
+            
3521
+            bais //istream
3522
+                    .close();
34733523             in.close();
34743524             
34753525             return obj;
....@@ -3528,6 +3578,27 @@
35283578     
35293579     public void Save()
35303580     {
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
+    {
35313602         System.err.println("Save");
35323603         
35333604         cRadio tab = GetCurrentTab();
....@@ -3537,18 +3608,38 @@
35373608         
35383609         copy.ExtractBigData(hashtable);
35393610         
3540
-        //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
-        tab.graphs[tab.undoindex++] = Compress(copy);
3542
-
3543
-        copy.RestoreBigData(hashtable);
3611
+        byte[] compress = Compress(copy);
35443612 
35453613         CameraPane.SWITCH = temp;
35463614         
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
+
35473637         //assert(hashtable.isEmpty());
35483638         
35493639         for (int i = tab.undoindex; i < tab.graphs.length; i++)
35503640         {
3551
-            tab.graphs[i] = null;
3641
+            //tab.user[i] = false;
3642
+        //    tab.graphs[i] = null;
35523643         }
35533644 
35543645         SetUndoStates();
....@@ -3571,6 +3662,8 @@
35713662                 e.printStackTrace();
35723663             }
35733664         }
3665
+        
3666
+        return !thesame;
35743667     }
35753668 
35763669     void CopyChanged(Object3D obj)
....@@ -3627,7 +3720,7 @@
36273720         redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
36283721     }
36293722     
3630
-    public void Undo()
3723
+    public boolean Undo()
36313724     {
36323725         System.err.println("Undo");
36333726         
....@@ -3636,18 +3729,27 @@
36363729         if (tab.undoindex == 0)
36373730         {
36383731             java.awt.Toolkit.getDefaultToolkit().beep();
3639
-            return;
3732
+            return false;
36403733         }
36413734 
3642
-        if (tab.graphs[tab.undoindex] == null)
3735
+        if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
36433736         {
3644
-            Save();
3645
-            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
+            }
36463746         }
36473747 
36483748         tab.undoindex -= 1;
36493749 
36503750         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3751
+        
3752
+        return true;
36513753     }
36523754 
36533755     public void Redo()
....@@ -3663,6 +3765,9 @@
36633765         tab.undoindex += 1;
36643766 
36653767         CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3768
+        
3769
+        //if (!tab.user[tab.undoindex])
3770
+        //    tab.graphs[tab.undoindex] = null;
36663771     }
36673772 
36683773         void ImportGFD()
....@@ -4625,8 +4730,8 @@
46254730         
46264731         if (readobj != null)
46274732         {
4628
-        if (Globals.SAVEONMAKE)
4629
-            Save();
4733
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4734
+        //    Save();
46304735             try
46314736             {
46324737                 //readobj.deepCopySelf(copy);
....@@ -4687,7 +4792,7 @@
46874792         }
46884793     }
46894794 
4690
-    void load() // throws ClassNotFoundException
4795
+    void Open() // throws ClassNotFoundException
46914796     {
46924797         if (Grafreed.standAlone)
46934798         {
....@@ -4972,7 +5077,7 @@
49725077     MenuBar menuBar;
49735078     Menu fileMenu;
49745079     MenuItem newItem;
4975
-    MenuItem loadItem;
5080
+    MenuItem openItem;
49765081     MenuItem saveItem;
49775082     MenuItem saveAsItem;
49785083     MenuItem exportAsItem;
....@@ -4995,6 +5100,7 @@
49955100     CheckboxMenuItem toggleSwitchItem;
49965101     CheckboxMenuItem toggleRootItem;
49975102     CheckboxMenuItem animationItem;
5103
+    MenuItem archiveItem;
49985104     CheckboxMenuItem toggleHandleItem;
49995105     CheckboxMenuItem togglePaintItem;
50005106     JSplitPane mainPanel;