blame | history | patch | commit | commitdiff
Normand Briere
2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8 
 ObjEditor.java
....@@ -4,6 +4,7 @@
44 
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620 
1721 //import javax.media.opengl.GLCanvas;
1822 
....@@ -37,6 +41,65 @@
3741     JFrame frame;
3842     
3943     static ObjEditor theFrame;
44
+    
45
+    cButton GetButton(String name, boolean border)
46
+    {
47
+        try
48
+        {
49
+            ImageIcon icon = GetIcon(name);
50
+            return new cButton(icon, border);
51
+        }
52
+        catch (Exception e)
53
+        {
54
+            return new cButton(name, border);
55
+        }
56
+    }
57
+
58
+    cToggleButton GetToggleButton(String name, boolean border)
59
+    {
60
+        try
61
+        {
62
+            ImageIcon icon = GetIcon(name);
63
+            return new cToggleButton(icon, border);
64
+        }
65
+        catch (Exception e)
66
+        {
67
+            return new cToggleButton(name, border);
68
+        }
69
+    }
70
+
71
+    cCheckBox GetCheckBox(String name, boolean border)
72
+    {
73
+        try
74
+        {
75
+            ImageIcon icon = GetIcon(name);
76
+            return new cCheckBox(icon, border);
77
+        }
78
+        catch (Exception e)
79
+        {
80
+            return new cCheckBox(name, border);
81
+        }
82
+    }
83
+
84
+    private ImageIcon GetIcon(String name) throws IOException
85
+    {
86
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
+        
88
+        if (image.getWidth() != 24 && image.getHeight() != 24)
89
+        {
90
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
+            Graphics2D g = resized.createGraphics();
92
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
+            g.dispose();
96
+            
97
+            image = resized;
98
+        }
99
+        
100
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
+        return icon;
102
+    }
40103     
41104     // SCRIPT
42105     
....@@ -147,7 +210,7 @@
147210         
148211         objEditor.ctrlPanel.remove(namePanel);
149212         
150
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
151214             return;
152215         
153216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -277,6 +340,11 @@
277340         return frame.action(event, obj);
278341     }
279342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
280348     void SetupMenu()
281349     {
282350         frame.setMenuBar(menuBar = new MenuBar());
....@@ -323,6 +391,32 @@
323391         closeItem.addActionListener(this);
324392 
325393         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
+    
326420         toolbarPanel = new JPanel();
327421         toolbarPanel.setName("Toolbar");
328422         treePanel = new cGridBag();
....@@ -337,9 +431,12 @@
337431         editPanel.add(editCommandsPanel);
338432         editPanel.add(ctrlPanel);
339433                 
340
-        materialPanel = new cGridBag().setVertical(true);
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
341436         
437
+        materialPanel = new cGridBag().setVertical(true);
342438         materialPanel.setName("Material");
439
+        
343440         /*JTextPane*/
344441         infoarea = createTextPane();
345442         doc = infoarea.getStyledDocument();
....@@ -352,7 +449,7 @@
352449 // TEXTAREA           infoarea.setLineWrap(true);
353450 // TEXTAREA           infoarea.setWrapStyleWord(true);
354451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        //infoPanel.setPreferredSize(new Dimension(50, 200));
356453         infoPanel.setName("Info");
357454         //infoPanel.setLayout(new BorderLayout());
358455         //infoPanel.add(createTextPane());
....@@ -364,7 +461,14 @@
364461         mainPanel.setDividerSize(9);
365462         mainPanel.setDividerLocation(0.5); //1.0);
366463         mainPanel.setResizeWeight(0.5);
367
-
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
+    
368472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369473         //mainPanel.setLayout(new GridBagLayout());
370474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -612,13 +716,24 @@
612716         
613717         boolean maximized;
614718     
719
+        cButton fullscreenLayout;
720
+
615721         void Minimize()
616722         {
617723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
618725         }
619726         
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={}
620730         void Maximize()
621731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
622737             if (maximized)
623738             {
624739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -633,13 +748,23 @@
633748             }
634749             
635750             maximized ^= true;
751
+            
752
+            frame.validate();
636753         }
754
+        
755
+	cButton minButton;
756
+	cButton maxButton;
757
+	cButton fullButton;
637758         
638759         void ToggleFullScreen()
639760         {
640
-                if (CameraPane.FULLSCREEN)
761
+                cameraView.ToggleFullScreen();
762
+                
763
+                if (!CameraPane.FULLSCREEN)
641764                 {
642765                     device.setFullScreenWindow(null);
766
+            frame.validate();
767
+                    
643768                     //frame.setVisible(false);
644769 //                frame.removeNotify();
645770 //                frame.setUndecorated(false);
....@@ -665,6 +790,7 @@
665790 //                        frame.getToolkit().getScreenSize().height);
666791                     //frame.setVisible(false);
667792                     device.setFullScreenWindow(frame);
793
+            frame.validate();
668794 //                frame.removeNotify();
669795 //                frame.setUndecorated(true);
670796 //                frame.addNotify();
....@@ -673,12 +799,11 @@
673799 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
674800                     framePanel.setDividerLocation(0);
675801 
676
-                    radio.layout = twoButton;
802
+                    radio.layout = fullscreenLayout;
677803                     radio.layout.doClick();
678804                     //frame.setVisible(true);
679805                 }
680
-                
681
-                cameraView.ToggleFullScreen();
806
+            frame.validate();
682807         }
683808 
684809     private JTextPane createTextPane()
....@@ -819,7 +944,12 @@
819944     JCheckBox speedupCB;
820945     JCheckBox rewindCB;
821946     JCheckBox flipVCB;
947
+    
948
+    cCheckBox toggleTextureCB;
949
+    cCheckBox toggleSwitchCB;
950
+        
822951     JComboBox texresMenu;
952
+    
823953     JButton resetButton;
824954     JButton stepButton;
825955     JButton stepAllButton;
....@@ -1006,12 +1136,12 @@
10061136             namePanel = new cGridBag();
10071137             
10081138         nameField = AddText(namePanel, copy.GetName());
1009
-        namePanel.add(nameField);
1139
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
10101140         oe.ctrlPanel.add(namePanel);
10111141         
10121142         oe.ctrlPanel.Return();
10131143         
1014
-        if (!GroupEditor.allparams)
1144
+        if (!allparams)
10151145             return;
10161146 
10171147             setupPanel = new cGridBag().setVertical(false);
....@@ -1024,15 +1154,15 @@
10241154         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10251155                 hideCB.setToolTipText("Hide object");
10261156         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027
-        markCB.setToolTipText("Set the animation target transform");
1157
+        markCB.setToolTipText("As animation target transform");
10281158         
10291159             setupPanel2 = new cGridBag().setVertical(false);
10301160             
10311161         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
10321162         rewindCB.setToolTipText("Rewind animation");
10331163         
1034
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1164
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1165
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10361166 
10371167         if (Globals.ADVANCED)
10381168         {
....@@ -1354,6 +1484,7 @@
13541484 //        objectPanel.add(north);
13551485         objectPanel.add(editPanel);
13561486         objectPanel.add(infoPanel);
1487
+        objectPanel.add(toolboxPanel);
13571488 
13581489         /*
13591490         aConstraints.gridx = 0;
....@@ -1362,7 +1493,7 @@
13621493         aConstraints.gridy += 1;
13631494         aConstraints.gridwidth = 1;
13641495         mainPanel.add(objectPanel, aConstraints);
1365
-         */
1496
+        */
13661497 
13671498         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13681499                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1379,9 +1510,7 @@
13791510         JTabbedPane tabbedPane = new JTabbedPane();
13801511         tabbedPane.add(scrollpane);
13811512 
1382
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1383
-
1384
-        optionsPanel = new cGridBag().setVertical(true);
1513
+        optionsPanel = new cGridBag().setVertical(false);
13851514 
13861515         optionsPanel.setName("Options");
13871516         
....@@ -1389,6 +1518,8 @@
13891518         
13901519         tabbedPane.add(optionsPanel);
13911520         
1521
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1522
+
13921523         scenePanel.add(tabbedPane);
13931524 
13941525         /*
....@@ -1481,6 +1612,8 @@
14811612 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14821613 
14831614         frame.setSize(1280, 860);
1615
+        
1616
+        frame.validate();
14841617         frame.setVisible(true);
14851618 
14861619                     cameraView.requestFocusInWindow();
....@@ -1572,24 +1705,6 @@
15721705                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
15731706         colorSection.add(texture);
15741707 
1575
-        cGridBag anisoU = new cGridBag();
1576
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579
-        colorSection.add(anisoU);
1580
-
1581
-        cGridBag anisoV = new cGridBag();
1582
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585
-        colorSection.add(anisoV);
1586
-
1587
-        cGridBag shadowbias = new cGridBag();
1588
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591
-        colorSection.add(shadowbias);
1592
-
15931708         panel.add(new JSeparator());
15941709         
15951710         panel.add(colorSection);
....@@ -1639,6 +1754,12 @@
16391754                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16401755                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
16411756         diffuseSection.add(fakedepth);
1757
+
1758
+        cGridBag shadowbias = new cGridBag();
1759
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1760
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1761
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1762
+        diffuseSection.add(shadowbias);
16421763 
16431764         panel.add(new JSeparator());
16441765         
....@@ -1690,6 +1811,18 @@
16901811 //		aConstraints.gridy += 1;
16911812 //		aConstraints.gridwidth = 1;
16921813 
1814
+        cGridBag anisoU = new cGridBag();
1815
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1816
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818
+        specularSection.add(anisoU);
1819
+
1820
+        cGridBag anisoV = new cGridBag();
1821
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1822
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1823
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1824
+        specularSection.add(anisoV);
1825
+
16931826 
16941827         panel.add(new JSeparator());
16951828         
....@@ -1697,35 +1830,35 @@
16971830         
16981831         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16991832         
1700
-        cGridBag globalSection = new cGridBag().setVertical(true);
1833
+        //cGridBag globalSection = new cGridBag().setVertical(true);
17011834 
17021835         cGridBag camera = new cGridBag();
17031836                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
17041837                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17051838                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706
-        globalSection.add(camera);
1839
+        colorSection.add(camera);
17071840 
17081841         cGridBag ambient = new cGridBag();
17091842                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
17101843                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17111844                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712
-        globalSection.add(ambient);
1845
+        colorSection.add(ambient);
17131846 
17141847         cGridBag backlit = new cGridBag();
17151848                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
17161849                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17171850                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718
-        globalSection.add(backlit);
1851
+        colorSection.add(backlit);
17191852 
17201853         cGridBag opacity = new cGridBag();
17211854                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
17221855                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17231856                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724
-        globalSection.add(opacity);
1857
+        colorSection.add(opacity);
17251858 
1726
-        panel.add(new JSeparator());
1859
+        //panel.add(new JSeparator());
17271860         
1728
-        panel.add(globalSection);
1861
+        //panel.add(globalSection);
17291862         
17301863         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17311864         
....@@ -2800,6 +2933,8 @@
28002933 
28012934     void SetMaterial(Object3D object)
28022935     {
2936
+        latestObject = object;
2937
+        
28032938         cMaterial mat = object.material;
28042939 
28052940         if (mat == null)
....@@ -2911,12 +3046,17 @@
29113046 //                }
29123047 
29133048         /**/
2914
-        if (deselect)
3049
+        if (deselect || child == null)
29153050         {
29163051             //group.deselectAll();
29173052             //freeze = true;
29183053             GetTree().clearSelection();
29193054             //freeze = false;
3055
+            
3056
+            if (child == null)
3057
+            {
3058
+                return;
3059
+            }
29203060         }
29213061 
29223062         //group.addSelectee(child);
....@@ -2985,7 +3125,7 @@
29853125             cameraView.ToggleDL();
29863126             cameraView.repaint();
29873127             return;
2988
-        } else if (event.getSource() == toggleTextureItem)
3128
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29893129         {
29903130             cameraView.ToggleTexture();
29913131             // june 2013           copy.HardTouch();
....@@ -3024,7 +3164,7 @@
30243164             frame.validate();
30253165 
30263166             return;
3027
-        } else if (event.getSource() == toggleSwitchItem)
3167
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30283168         {
30293169             cameraView.ToggleSwitch();
30303170             cameraView.repaint();
....@@ -3408,6 +3548,8 @@
34083548     
34093549     public void Save()
34103550     {
3551
+        System.err.println("Save");
3552
+        
34113553         cRadio tab = GetCurrentTab();
34123554         
34133555         boolean temp = CameraPane.SWITCH;
....@@ -3415,8 +3557,10 @@
34153557         
34163558         copy.ExtractBigData(hashtable);
34173559         
3560
+        byte[] compress = Compress(copy);
3561
+        
34183562         //EditorFrame.m_MainFrame.requestFocusInWindow();
3419
-        tab.graphs[tab.undoindex++] = Compress(copy);
3563
+        tab.graphs[tab.undoindex++] = compress;
34203564 
34213565         copy.RestoreBigData(hashtable);
34223566 
....@@ -3429,6 +3573,8 @@
34293573             tab.graphs[i] = null;
34303574         }
34313575 
3576
+        SetUndoStates();
3577
+        
34323578         // test save
34333579         if (false)
34343580         {
....@@ -3451,6 +3597,8 @@
34513597 
34523598     void CopyChanged(Object3D obj)
34533599     {
3600
+        SetUndoStates();
3601
+        
34543602         boolean temp = CameraPane.SWITCH;
34553603         CameraPane.SWITCH = false;
34563604         
....@@ -3490,8 +3638,21 @@
34903638         refreshContents();
34913639     }
34923640     
3641
+    cButton undoButton;
3642
+    cButton redoButton;
3643
+        
3644
+    void SetUndoStates()
3645
+    {
3646
+        cRadio tab = GetCurrentTab();
3647
+        
3648
+        undoButton.setEnabled(tab.undoindex > 0);
3649
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3650
+    }
3651
+    
34933652     public void Undo()
34943653     {
3654
+        System.err.println("Undo");
3655
+        
34953656         cRadio tab = GetCurrentTab();
34963657         
34973658         if (tab.undoindex == 0)
....@@ -3675,7 +3836,7 @@
36753836         assert false;
36763837     }
36773838 
3678
-    void EditSelection()
3839
+    void EditSelection(boolean newWindow)
36793840     {
36803841     }
36813842 
....@@ -4170,7 +4331,8 @@
41704331 
41714332     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41724333     {
4173
-        Save();
4334
+        if (Globals.SAVEONMAKE) // && resetmodel)
4335
+            Save();
41744336         //Tween.set(thing, 0).target(1).start(tweenManager);
41754337         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41764338 //            if (thing instanceof GenericJointDemo)
....@@ -4257,6 +4419,12 @@
42574419         {
42584420             ResetModel();
42594421             Select(thing.GetTreePath(), true, false); // unselect... false);
4422
+            
4423
+        if (thing.Size() == 0)
4424
+        {
4425
+            //EditSelection(false);
4426
+        }
4427
+        
42604428             refreshContents();
42614429         }
42624430 
....@@ -4479,6 +4647,7 @@
44794647         
44804648         if (readobj != null)
44814649         {
4650
+        if (Globals.SAVEONMAKE)
44824651             Save();
44834652             try
44844653             {
....@@ -4657,6 +4826,8 @@
46574826             String filename = browser.getFile();
46584827             if (filename != null && filename.length() > 0)
46594828             {
4829
+                if (!filename.endsWith(".gfd"))
4830
+                    filename += ".gfd";
46604831                 lastname = browser.getDirectory() + filename;
46614832                 save();
46624833             }
....@@ -4850,18 +5021,31 @@
48505021     CheckboxMenuItem togglePaintItem;
48515022     JSplitPane mainPanel;
48525023     JScrollPane scrollpane;
5024
+    
48535025     JPanel toolbarPanel;
5026
+    
48545027     cGridBag treePanel;
5028
+    
48555029     JPanel radioPanel;
48565030     ButtonGroup buttonGroup;
4857
-    cGridBag ctrlPanel;
5031
+    
5032
+    cGridBag toolboxPanel;
48585033     cGridBag materialPanel;
5034
+    cGridBag ctrlPanel;
5035
+    
48595036     JScrollPane infoPanel;
5037
+    
48605038     cGridBag optionsPanel;
5039
+    
48615040     JTabbedPane objectPanel;
5041
+    boolean materialFlushed;
5042
+    Object3D latestObject;
5043
+    
48625044     cGridBag XYZPanel;
5045
+    
48635046     JSplitPane gridPanel;
48645047     JSplitPane bigPanel;
5048
+    
48655049     cGridBag bigThree;
48665050     cGridBag scenePanel;
48675051     cGridBag centralPanel;
....@@ -4976,7 +5160,7 @@
49765160     cNumberSlider fogField;
49775161     JLabel opacityPowerLabel;
49785162     cNumberSlider opacityPowerField;
4979
-    JTree jTree;
5163
+    cTree jTree;
49805164     //ObjectUI parent;
49815165     
49825166     cNumberSlider normalpushField;