blame | history | patch | commit | commitdiff
Normand Briere
2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e 
 ObjEditor.java
....@@ -15,6 +15,9 @@
1515 //import javax.swing.plaf.ColorUIResource;
1616 //import javax.swing.plaf.metal.DefaultMetalTheme;
1717 
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1821 //import javax.media.opengl.GLCanvas;
1922 
2023 import //weka.core.
....@@ -207,7 +210,7 @@
207210         
208211         objEditor.ctrlPanel.remove(namePanel);
209212         
210
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
211214             return;
212215         
213216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -306,7 +309,7 @@
306309         //localCopy.parent = null;
307310 
308311         frame = new JFrame();
309
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
310313         objEditor = this;
311314         this.callee = callee;
312315 
....@@ -337,12 +340,17 @@
337340         return frame.action(event, obj);
338341     }
339342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
340348     void SetupMenu()
341349     {
342350         frame.setMenuBar(menuBar = new MenuBar());
343351         menuBar.add(fileMenu = new Menu("File"));
344352         fileMenu.add(newItem = new MenuItem("New"));
345
-        fileMenu.add(loadItem = new MenuItem("Open..."));
353
+        fileMenu.add(openItem = new MenuItem("Open..."));
346354         
347355                 //oe.menuBar.add(menu = new Menu("Include"));
348356         Menu menu = new Menu("Import");
....@@ -374,7 +382,7 @@
374382         }
375383 
376384         newItem.addActionListener(this);
377
-        loadItem.addActionListener(this);
385
+        openItem.addActionListener(this);
378386         saveItem.addActionListener(this);
379387         saveAsItem.addActionListener(this);
380388         exportAsItem.addActionListener(this);
....@@ -383,6 +391,32 @@
383391         closeItem.addActionListener(this);
384392 
385393         objectPanel = new JTabbedPane();
394
+        
395
+        ChangeListener changeListener = new ChangeListener()
396
+        {
397
+            public void stateChanged(ChangeEvent changeEvent)
398
+            {
399
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+//                {
401
+//                    if (latestObject != null)
402
+//                    {
403
+//                        refreshContents(true);
404
+//                        SetMaterial(latestObject);
405
+//                    }
406
+//                    
407
+//                    materialFlushed = true;
408
+//                }
409
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+//                {
411
+//                    if (listUI.size() == 0)
412
+//                        EditSelection(false);
413
+//                }
414
+
415
+                refreshContents(false); // To refresh Info tab
416
+            }
417
+        };
418
+        objectPanel.addChangeListener(changeListener);
419
+    
386420         toolbarPanel = new JPanel();
387421         toolbarPanel.setName("Toolbar");
388422         treePanel = new cGridBag();
....@@ -415,7 +449,7 @@
415449 // TEXTAREA           infoarea.setLineWrap(true);
416450 // TEXTAREA           infoarea.setWrapStyleWord(true);
417451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        infoPanel.setPreferredSize(new Dimension(1, 1));
419453         infoPanel.setName("Info");
420454         //infoPanel.setLayout(new BorderLayout());
421455         //infoPanel.add(createTextPane());
....@@ -427,7 +461,14 @@
427461         mainPanel.setDividerSize(9);
428462         mainPanel.setDividerLocation(0.5); //1.0);
429463         mainPanel.setResizeWeight(0.5);
430
-
464
+        
465
+//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!"));    
469
+    
470
+    mainPanel.setUI(new BasicSplitPaneUI());
471
+    
431472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432473         //mainPanel.setLayout(new GridBagLayout());
433474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -658,8 +699,8 @@
658699         }
659700     }
660701 
661
-static GraphicsDevice device = GraphicsEnvironment
662
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
663704 
664705     Rectangle keeprect;
665706         cRadio radio;
....@@ -680,10 +721,19 @@
680721         void Minimize()
681722         {
682723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
683725         }
684726         
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={}
685730         void Maximize()
686731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
687737             if (maximized)
688738             {
689739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -691,20 +741,36 @@
691741             else
692742             {
693743                 keeprect = frame.getBounds();
694
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695
-                Dimension rect2 = frame.getToolkit().getScreenSize();
696
-                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);
697747 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698749             }
699750             
700751             maximized ^= true;
752
+            
753
+            frame.validate();
701754         }
755
+        
756
+	cButton minButton;
757
+	cButton maxButton;
758
+	cButton fullButton;
702759         
703760         void ToggleFullScreen()
704761         {
705
-                if (CameraPane.FULLSCREEN)
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
764
+                cameraView.ToggleFullScreen();
765
+                
766
+                if (!CameraPane.FULLSCREEN)
706767                 {
707768                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
771
+            frame.validate();
772
+                    frame.setVisible(true);
773
+                    
708774                     //frame.setVisible(false);
709775 //                frame.removeNotify();
710776 //                frame.setUndecorated(false);
....@@ -714,7 +780,7 @@
714780 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
715781 // X                   framePanel.add(bigThree);
716782 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
717
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
718784                     
719785                     //frame.setVisible(true);
720786                     radio.layout = keepButton;
....@@ -729,7 +795,12 @@
729795 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730796 //                        frame.getToolkit().getScreenSize().height);
731797                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
732801                     device.setFullScreenWindow(frame);
802
+            frame.validate();
803
+                    frame.setVisible(true);
733804 //                frame.removeNotify();
734805 //                frame.setUndecorated(true);
735806 //                frame.addNotify();
....@@ -742,8 +813,7 @@
742813                     radio.layout.doClick();
743814                     //frame.setVisible(true);
744815                 }
745
-                
746
-                cameraView.ToggleFullScreen();
816
+            frame.validate();
747817         }
748818 
749819     private JTextPane createTextPane()
....@@ -884,7 +954,12 @@
884954     JCheckBox speedupCB;
885955     JCheckBox rewindCB;
886956     JCheckBox flipVCB;
957
+    
958
+    cCheckBox toggleTextureCB;
959
+    cCheckBox toggleSwitchCB;
960
+        
887961     JComboBox texresMenu;
962
+    
888963     JButton resetButton;
889964     JButton stepButton;
890965     JButton stepAllButton;
....@@ -1071,12 +1146,12 @@
10711146             namePanel = new cGridBag();
10721147             
10731148         nameField = AddText(namePanel, copy.GetName());
1074
-        namePanel.add(nameField);
1149
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
10751150         oe.ctrlPanel.add(namePanel);
10761151         
10771152         oe.ctrlPanel.Return();
10781153         
1079
-        if (!GroupEditor.allparams)
1154
+        if (!allparams)
10801155             return;
10811156 
10821157             setupPanel = new cGridBag().setVertical(false);
....@@ -1089,15 +1164,15 @@
10891164         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10901165                 hideCB.setToolTipText("Hide object");
10911166         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092
-        markCB.setToolTipText("Set the animation target transform");
1167
+        markCB.setToolTipText("As animation target transform");
10931168         
10941169             setupPanel2 = new cGridBag().setVertical(false);
10951170             
10961171         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
10971172         rewindCB.setToolTipText("Rewind animation");
10981173         
1099
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1174
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11011176 
11021177         if (Globals.ADVANCED)
11031178         {
....@@ -1412,14 +1487,17 @@
14121487 
14131488         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14141489         //tmp.setName("Edit");
1415
-        objectPanel.add(toolboxPanel);
14161490         objectPanel.add(materialPanel);
14171491 //        JPanel north = new JPanel(new BorderLayout());
14181492 //        north.setName("Edit");
14191493 //        north.add(ctrlPanel, BorderLayout.NORTH);
14201494 //        objectPanel.add(north);
14211495         objectPanel.add(editPanel);
1422
-        objectPanel.add(infoPanel);
1496
+        
1497
+        //if (Globals.ADVANCED)
1498
+            objectPanel.add(infoPanel);
1499
+        
1500
+        objectPanel.add(toolboxPanel);
14231501 
14241502         /*
14251503         aConstraints.gridx = 0;
....@@ -1428,7 +1506,7 @@
14281506         aConstraints.gridy += 1;
14291507         aConstraints.gridwidth = 1;
14301508         mainPanel.add(objectPanel, aConstraints);
1431
-         */
1509
+        */
14321510 
14331511         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14341512                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1445,9 +1523,7 @@
14451523         JTabbedPane tabbedPane = new JTabbedPane();
14461524         tabbedPane.add(scrollpane);
14471525 
1448
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1449
-
1450
-        optionsPanel = new cGridBag().setVertical(true);
1526
+        optionsPanel = new cGridBag().setVertical(false);
14511527 
14521528         optionsPanel.setName("Options");
14531529         
....@@ -1455,6 +1531,8 @@
14551531         
14561532         tabbedPane.add(optionsPanel);
14571533         
1534
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1535
+
14581536         scenePanel.add(tabbedPane);
14591537 
14601538         /*
....@@ -1527,9 +1605,9 @@
15271605 //		aConstraints.gridheight = 1;
15281606 
15291607         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530
-        framePanel.setContinuousLayout(true);
1531
-        framePanel.setOneTouchExpandable(true);
1532
-        framePanel.setDividerLocation(0.8);
1608
+        framePanel.setContinuousLayout(false);
1609
+        framePanel.setOneTouchExpandable(false);
1610
+        //.setDividerLocation(0.8);
15331611         //framePanel.setDividerSize(15);
15341612         //framePanel.setResizeWeight(0.15);
15351613         framePanel.setName("Frame");
....@@ -1547,11 +1625,14 @@
15471625 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15481626 
15491627         frame.setSize(1280, 860);
1550
-        frame.setVisible(true);
1551
-
1628
+        
15521629                     cameraView.requestFocusInWindow();
15531630                     
15541631         gridPanel.setDividerLocation(1.0);
1632
+        
1633
+        frame.validate();
1634
+
1635
+        frame.setVisible(true);
15551636 
15561637         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
15571638         frame.addWindowListener(new WindowAdapter()
....@@ -1638,24 +1719,6 @@
16381719                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16391720         colorSection.add(texture);
16401721 
1641
-        cGridBag anisoU = new cGridBag();
1642
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645
-        colorSection.add(anisoU);
1646
-
1647
-        cGridBag anisoV = new cGridBag();
1648
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651
-        colorSection.add(anisoV);
1652
-
1653
-        cGridBag shadowbias = new cGridBag();
1654
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657
-        colorSection.add(shadowbias);
1658
-
16591722         panel.add(new JSeparator());
16601723         
16611724         panel.add(colorSection);
....@@ -1705,6 +1768,12 @@
17051768                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17061769                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17071770         diffuseSection.add(fakedepth);
1771
+
1772
+        cGridBag shadowbias = new cGridBag();
1773
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1774
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776
+        diffuseSection.add(shadowbias);
17081777 
17091778         panel.add(new JSeparator());
17101779         
....@@ -1756,6 +1825,18 @@
17561825 //		aConstraints.gridy += 1;
17571826 //		aConstraints.gridwidth = 1;
17581827 
1828
+        cGridBag anisoU = new cGridBag();
1829
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1830
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1832
+        specularSection.add(anisoU);
1833
+
1834
+        cGridBag anisoV = new cGridBag();
1835
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1836
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838
+        specularSection.add(anisoV);
1839
+
17591840 
17601841         panel.add(new JSeparator());
17611842         
....@@ -1763,35 +1844,35 @@
17631844         
17641845         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17651846         
1766
-        cGridBag globalSection = new cGridBag().setVertical(true);
1847
+        //cGridBag globalSection = new cGridBag().setVertical(true);
17671848 
17681849         cGridBag camera = new cGridBag();
17691850                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
17701851                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17711852                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772
-        globalSection.add(camera);
1853
+        colorSection.add(camera);
17731854 
17741855         cGridBag ambient = new cGridBag();
17751856                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
17761857                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17771858                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778
-        globalSection.add(ambient);
1859
+        colorSection.add(ambient);
17791860 
17801861         cGridBag backlit = new cGridBag();
17811862                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
17821863                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17831864                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784
-        globalSection.add(backlit);
1865
+        colorSection.add(backlit);
17851866 
17861867         cGridBag opacity = new cGridBag();
17871868                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
17881869                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17891870                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790
-        globalSection.add(opacity);
1871
+        colorSection.add(opacity);
17911872 
1792
-        panel.add(new JSeparator());
1873
+        //panel.add(new JSeparator());
17931874         
1794
-        panel.add(globalSection);
1875
+        //panel.add(globalSection);
17951876         
17961877         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17971878         
....@@ -2866,6 +2947,8 @@
28662947 
28672948     void SetMaterial(Object3D object)
28682949     {
2950
+        latestObject = object;
2951
+        
28692952         cMaterial mat = object.material;
28702953 
28712954         if (mat == null)
....@@ -2977,12 +3060,17 @@
29773060 //                }
29783061 
29793062         /**/
2980
-        if (deselect)
3063
+        if (deselect || child == null)
29813064         {
29823065             //group.deselectAll();
29833066             //freeze = true;
29843067             GetTree().clearSelection();
29853068             //freeze = false;
3069
+            
3070
+            if (child == null)
3071
+            {
3072
+                return;
3073
+            }
29863074         }
29873075 
29883076         //group.addSelectee(child);
....@@ -3051,7 +3139,7 @@
30513139             cameraView.ToggleDL();
30523140             cameraView.repaint();
30533141             return;
3054
-        } else if (event.getSource() == toggleTextureItem)
3142
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30553143         {
30563144             cameraView.ToggleTexture();
30573145             // june 2013           copy.HardTouch();
....@@ -3090,7 +3178,7 @@
30903178             frame.validate();
30913179 
30923180             return;
3093
-        } else if (event.getSource() == toggleSwitchItem)
3181
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30943182         {
30953183             cameraView.ToggleSwitch();
30963184             cameraView.repaint();
....@@ -3306,9 +3394,9 @@
33063394         {
33073395             Close();
33083396             //return true;
3309
-        } else if (source == loadItem)
3397
+        } else if (source == openItem)
33103398         {
3311
-            load();
3399
+            Open();
33123400             //return true;
33133401         } else if (source == newItem)
33143402         {
....@@ -3333,6 +3421,10 @@
33333421         {
33343422             generatePOV();
33353423             //return true;
3424
+        } else if (event.getSource() == archiveItem)
3425
+        {
3426
+            cTools.Archive(frame);
3427
+            return;
33363428         } else if (source == zBufferItem)
33373429         {
33383430             try
....@@ -3483,8 +3575,10 @@
34833575         
34843576         copy.ExtractBigData(hashtable);
34853577         
3578
+        byte[] compress = Compress(copy);
3579
+        
34863580         //EditorFrame.m_MainFrame.requestFocusInWindow();
3487
-        tab.graphs[tab.undoindex++] = Compress(copy);
3581
+        tab.graphs[tab.undoindex++] = compress;
34883582 
34893583         copy.RestoreBigData(hashtable);
34903584 
....@@ -3497,6 +3591,8 @@
34973591             tab.graphs[i] = null;
34983592         }
34993593 
3594
+        SetUndoStates();
3595
+        
35003596         // test save
35013597         if (false)
35023598         {
....@@ -3519,6 +3615,8 @@
35193615 
35203616     void CopyChanged(Object3D obj)
35213617     {
3618
+        SetUndoStates();
3619
+        
35223620         boolean temp = CameraPane.SWITCH;
35233621         CameraPane.SWITCH = false;
35243622         
....@@ -3556,6 +3654,17 @@
35563654         }
35573655         
35583656         refreshContents();
3657
+    }
3658
+    
3659
+    cButton undoButton;
3660
+    cButton redoButton;
3661
+        
3662
+    void SetUndoStates()
3663
+    {
3664
+        cRadio tab = GetCurrentTab();
3665
+        
3666
+        undoButton.setEnabled(tab.undoindex > 0);
3667
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
35593668     }
35603669     
35613670     public void Undo()
....@@ -4618,7 +4727,7 @@
46184727         }
46194728     }
46204729 
4621
-    void load() // throws ClassNotFoundException
4730
+    void Open() // throws ClassNotFoundException
46224731     {
46234732         if (Grafreed.standAlone)
46244733         {
....@@ -4735,6 +4844,8 @@
47354844             String filename = browser.getFile();
47364845             if (filename != null && filename.length() > 0)
47374846             {
4847
+                if (!filename.endsWith(".gfd"))
4848
+                    filename += ".gfd";
47384849                 lastname = browser.getDirectory() + filename;
47394850                 save();
47404851             }
....@@ -4901,7 +5012,7 @@
49015012     MenuBar menuBar;
49025013     Menu fileMenu;
49035014     MenuItem newItem;
4904
-    MenuItem loadItem;
5015
+    MenuItem openItem;
49055016     MenuItem saveItem;
49065017     MenuItem saveAsItem;
49075018     MenuItem exportAsItem;
....@@ -4924,6 +5035,7 @@
49245035     CheckboxMenuItem toggleSwitchItem;
49255036     CheckboxMenuItem toggleRootItem;
49265037     CheckboxMenuItem animationItem;
5038
+    MenuItem archiveItem;
49275039     CheckboxMenuItem toggleHandleItem;
49285040     CheckboxMenuItem togglePaintItem;
49295041     JSplitPane mainPanel;
....@@ -4945,6 +5057,8 @@
49455057     cGridBag optionsPanel;
49465058     
49475059     JTabbedPane objectPanel;
5060
+    boolean materialFlushed;
5061
+    Object3D latestObject;
49485062     
49495063     cGridBag XYZPanel;
49505064