blame | history | patch | commit | commitdiff
Normand Briere
2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd 
 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.
....@@ -49,6 +52,19 @@
4952         catch (Exception e)
5053         {
5154             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);
5268         }
5369     }
5470 
....@@ -194,7 +210,7 @@
194210         
195211         objEditor.ctrlPanel.remove(namePanel);
196212         
197
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
198214             return;
199215         
200216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -293,7 +309,7 @@
293309         //localCopy.parent = null;
294310 
295311         frame = new JFrame();
296
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
297313         objEditor = this;
298314         this.callee = callee;
299315 
....@@ -323,6 +339,11 @@
323339     {
324340         return frame.action(event, obj);
325341     }
342
+
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
326347 
327348     void SetupMenu()
328349     {
....@@ -370,6 +391,32 @@
370391         closeItem.addActionListener(this);
371392 
372393         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
+    
373420         toolbarPanel = new JPanel();
374421         toolbarPanel.setName("Toolbar");
375422         treePanel = new cGridBag();
....@@ -384,9 +431,12 @@
384431         editPanel.add(editCommandsPanel);
385432         editPanel.add(ctrlPanel);
386433                 
387
-        materialPanel = new cGridBag().setVertical(true);
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
388436         
437
+        materialPanel = new cGridBag().setVertical(true);
389438         materialPanel.setName("Material");
439
+        
390440         /*JTextPane*/
391441         infoarea = createTextPane();
392442         doc = infoarea.getStyledDocument();
....@@ -399,7 +449,7 @@
399449 // TEXTAREA           infoarea.setLineWrap(true);
400450 // TEXTAREA           infoarea.setWrapStyleWord(true);
401451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        //infoPanel.setPreferredSize(new Dimension(50, 200));
403453         infoPanel.setName("Info");
404454         //infoPanel.setLayout(new BorderLayout());
405455         //infoPanel.add(createTextPane());
....@@ -411,7 +461,14 @@
411461         mainPanel.setDividerSize(9);
412462         mainPanel.setDividerLocation(0.5); //1.0);
413463         mainPanel.setResizeWeight(0.5);
414
-
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
+    
415472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416473         //mainPanel.setLayout(new GridBagLayout());
417474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -642,8 +699,8 @@
642699         }
643700     }
644701 
645
-static GraphicsDevice device = GraphicsEnvironment
646
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
647704 
648705     Rectangle keeprect;
649706         cRadio radio;
....@@ -659,13 +716,24 @@
659716         
660717         boolean maximized;
661718     
719
+        cButton fullscreenLayout;
720
+
662721         void Minimize()
663722         {
664723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
665725         }
666726         
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={}
667730         void Maximize()
668731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
669737             if (maximized)
670738             {
671739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -673,20 +741,36 @@
673741             else
674742             {
675743                 keeprect = frame.getBounds();
676
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677
-                Dimension rect2 = frame.getToolkit().getScreenSize();
678
-                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);
679747 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680749             }
681750             
682751             maximized ^= true;
752
+            
753
+            frame.validate();
683754         }
755
+        
756
+	cButton minButton;
757
+	cButton maxButton;
758
+	cButton fullButton;
684759         
685760         void ToggleFullScreen()
686761         {
687
-                if (CameraPane.FULLSCREEN)
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
764
+                cameraView.ToggleFullScreen();
765
+                
766
+                if (!CameraPane.FULLSCREEN)
688767                 {
689768                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
771
+            frame.validate();
772
+                    frame.setVisible(true);
773
+                    
690774                     //frame.setVisible(false);
691775 //                frame.removeNotify();
692776 //                frame.setUndecorated(false);
....@@ -711,7 +795,12 @@
711795 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712796 //                        frame.getToolkit().getScreenSize().height);
713797                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
714801                     device.setFullScreenWindow(frame);
802
+            frame.validate();
803
+                    frame.setVisible(true);
715804 //                frame.removeNotify();
716805 //                frame.setUndecorated(true);
717806 //                frame.addNotify();
....@@ -720,12 +809,11 @@
720809 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721810                     framePanel.setDividerLocation(0);
722811 
723
-                    radio.layout = twoButton;
812
+                    radio.layout = fullscreenLayout;
724813                     radio.layout.doClick();
725814                     //frame.setVisible(true);
726815                 }
727
-                
728
-                cameraView.ToggleFullScreen();
816
+            frame.validate();
729817         }
730818 
731819     private JTextPane createTextPane()
....@@ -866,7 +954,12 @@
866954     JCheckBox speedupCB;
867955     JCheckBox rewindCB;
868956     JCheckBox flipVCB;
957
+    
958
+    cCheckBox toggleTextureCB;
959
+    cCheckBox toggleSwitchCB;
960
+        
869961     JComboBox texresMenu;
962
+    
870963     JButton resetButton;
871964     JButton stepButton;
872965     JButton stepAllButton;
....@@ -1053,12 +1146,12 @@
10531146             namePanel = new cGridBag();
10541147             
10551148         nameField = AddText(namePanel, copy.GetName());
1056
-        namePanel.add(nameField);
1149
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
10571150         oe.ctrlPanel.add(namePanel);
10581151         
10591152         oe.ctrlPanel.Return();
10601153         
1061
-        if (!GroupEditor.allparams)
1154
+        if (!allparams)
10621155             return;
10631156 
10641157             setupPanel = new cGridBag().setVertical(false);
....@@ -1071,15 +1164,15 @@
10711164         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10721165                 hideCB.setToolTipText("Hide object");
10731166         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074
-        markCB.setToolTipText("Set the animation target transform");
1167
+        markCB.setToolTipText("As animation target transform");
10751168         
10761169             setupPanel2 = new cGridBag().setVertical(false);
10771170             
10781171         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
10791172         rewindCB.setToolTipText("Rewind animation");
10801173         
1081
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082
-        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)");
10831176 
10841177         if (Globals.ADVANCED)
10851178         {
....@@ -1401,6 +1494,7 @@
14011494 //        objectPanel.add(north);
14021495         objectPanel.add(editPanel);
14031496         objectPanel.add(infoPanel);
1497
+        objectPanel.add(toolboxPanel);
14041498 
14051499         /*
14061500         aConstraints.gridx = 0;
....@@ -1409,7 +1503,7 @@
14091503         aConstraints.gridy += 1;
14101504         aConstraints.gridwidth = 1;
14111505         mainPanel.add(objectPanel, aConstraints);
1412
-         */
1506
+        */
14131507 
14141508         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14151509                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1426,9 +1520,7 @@
14261520         JTabbedPane tabbedPane = new JTabbedPane();
14271521         tabbedPane.add(scrollpane);
14281522 
1429
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1430
-
1431
-        optionsPanel = new cGridBag().setVertical(true);
1523
+        optionsPanel = new cGridBag().setVertical(false);
14321524 
14331525         optionsPanel.setName("Options");
14341526         
....@@ -1436,6 +1528,8 @@
14361528         
14371529         tabbedPane.add(optionsPanel);
14381530         
1531
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1532
+
14391533         scenePanel.add(tabbedPane);
14401534 
14411535         /*
....@@ -1528,11 +1622,14 @@
15281622 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15291623 
15301624         frame.setSize(1280, 860);
1531
-        frame.setVisible(true);
1532
-
1625
+        
15331626                     cameraView.requestFocusInWindow();
15341627                     
15351628         gridPanel.setDividerLocation(1.0);
1629
+        
1630
+        frame.validate();
1631
+
1632
+        frame.setVisible(true);
15361633 
15371634         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
15381635         frame.addWindowListener(new WindowAdapter()
....@@ -1619,24 +1716,6 @@
16191716                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16201717         colorSection.add(texture);
16211718 
1622
-        cGridBag anisoU = new cGridBag();
1623
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626
-        colorSection.add(anisoU);
1627
-
1628
-        cGridBag anisoV = new cGridBag();
1629
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632
-        colorSection.add(anisoV);
1633
-
1634
-        cGridBag shadowbias = new cGridBag();
1635
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638
-        colorSection.add(shadowbias);
1639
-
16401719         panel.add(new JSeparator());
16411720         
16421721         panel.add(colorSection);
....@@ -1686,6 +1765,12 @@
16861765                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16871766                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
16881767         diffuseSection.add(fakedepth);
1768
+
1769
+        cGridBag shadowbias = new cGridBag();
1770
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1771
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1772
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1773
+        diffuseSection.add(shadowbias);
16891774 
16901775         panel.add(new JSeparator());
16911776         
....@@ -1737,6 +1822,18 @@
17371822 //		aConstraints.gridy += 1;
17381823 //		aConstraints.gridwidth = 1;
17391824 
1825
+        cGridBag anisoU = new cGridBag();
1826
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1827
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1828
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1829
+        specularSection.add(anisoU);
1830
+
1831
+        cGridBag anisoV = new cGridBag();
1832
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1833
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1834
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1835
+        specularSection.add(anisoV);
1836
+
17401837 
17411838         panel.add(new JSeparator());
17421839         
....@@ -1744,35 +1841,35 @@
17441841         
17451842         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17461843         
1747
-        cGridBag globalSection = new cGridBag().setVertical(true);
1844
+        //cGridBag globalSection = new cGridBag().setVertical(true);
17481845 
17491846         cGridBag camera = new cGridBag();
17501847                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
17511848                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17521849                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753
-        globalSection.add(camera);
1850
+        colorSection.add(camera);
17541851 
17551852         cGridBag ambient = new cGridBag();
17561853                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
17571854                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17581855                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759
-        globalSection.add(ambient);
1856
+        colorSection.add(ambient);
17601857 
17611858         cGridBag backlit = new cGridBag();
17621859                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
17631860                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17641861                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765
-        globalSection.add(backlit);
1862
+        colorSection.add(backlit);
17661863 
17671864         cGridBag opacity = new cGridBag();
17681865                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
17691866                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17701867                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771
-        globalSection.add(opacity);
1868
+        colorSection.add(opacity);
17721869 
1773
-        panel.add(new JSeparator());
1870
+        //panel.add(new JSeparator());
17741871         
1775
-        panel.add(globalSection);
1872
+        //panel.add(globalSection);
17761873         
17771874         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17781875         
....@@ -2847,6 +2944,8 @@
28472944 
28482945     void SetMaterial(Object3D object)
28492946     {
2947
+        latestObject = object;
2948
+        
28502949         cMaterial mat = object.material;
28512950 
28522951         if (mat == null)
....@@ -2958,12 +3057,17 @@
29583057 //                }
29593058 
29603059         /**/
2961
-        if (deselect)
3060
+        if (deselect || child == null)
29623061         {
29633062             //group.deselectAll();
29643063             //freeze = true;
29653064             GetTree().clearSelection();
29663065             //freeze = false;
3066
+            
3067
+            if (child == null)
3068
+            {
3069
+                return;
3070
+            }
29673071         }
29683072 
29693073         //group.addSelectee(child);
....@@ -3032,7 +3136,7 @@
30323136             cameraView.ToggleDL();
30333137             cameraView.repaint();
30343138             return;
3035
-        } else if (event.getSource() == toggleTextureItem)
3139
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30363140         {
30373141             cameraView.ToggleTexture();
30383142             // june 2013           copy.HardTouch();
....@@ -3071,7 +3175,7 @@
30713175             frame.validate();
30723176 
30733177             return;
3074
-        } else if (event.getSource() == toggleSwitchItem)
3178
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30753179         {
30763180             cameraView.ToggleSwitch();
30773181             cameraView.repaint();
....@@ -3464,8 +3568,10 @@
34643568         
34653569         copy.ExtractBigData(hashtable);
34663570         
3571
+        byte[] compress = Compress(copy);
3572
+        
34673573         //EditorFrame.m_MainFrame.requestFocusInWindow();
3468
-        tab.graphs[tab.undoindex++] = Compress(copy);
3574
+        tab.graphs[tab.undoindex++] = compress;
34693575 
34703576         copy.RestoreBigData(hashtable);
34713577 
....@@ -3478,6 +3584,8 @@
34783584             tab.graphs[i] = null;
34793585         }
34803586 
3587
+        SetUndoStates();
3588
+        
34813589         // test save
34823590         if (false)
34833591         {
....@@ -3500,6 +3608,8 @@
35003608 
35013609     void CopyChanged(Object3D obj)
35023610     {
3611
+        SetUndoStates();
3612
+        
35033613         boolean temp = CameraPane.SWITCH;
35043614         CameraPane.SWITCH = false;
35053615         
....@@ -3537,6 +3647,17 @@
35373647         }
35383648         
35393649         refreshContents();
3650
+    }
3651
+    
3652
+    cButton undoButton;
3653
+    cButton redoButton;
3654
+        
3655
+    void SetUndoStates()
3656
+    {
3657
+        cRadio tab = GetCurrentTab();
3658
+        
3659
+        undoButton.setEnabled(tab.undoindex > 0);
3660
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
35403661     }
35413662     
35423663     public void Undo()
....@@ -3726,7 +3847,7 @@
37263847         assert false;
37273848     }
37283849 
3729
-    void EditSelection()
3850
+    void EditSelection(boolean newWindow)
37303851     {
37313852     }
37323853 
....@@ -4221,7 +4342,7 @@
42214342 
42224343     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42234344     {
4224
-        if (Globals.SAVEONMAKE)
4345
+        if (Globals.SAVEONMAKE) // && resetmodel)
42254346             Save();
42264347         //Tween.set(thing, 0).target(1).start(tweenManager);
42274348         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4309,6 +4430,12 @@
43094430         {
43104431             ResetModel();
43114432             Select(thing.GetTreePath(), true, false); // unselect... false);
4433
+            
4434
+        if (thing.Size() == 0)
4435
+        {
4436
+            //EditSelection(false);
4437
+        }
4438
+        
43124439             refreshContents();
43134440         }
43144441 
....@@ -4710,6 +4837,8 @@
47104837             String filename = browser.getFile();
47114838             if (filename != null && filename.length() > 0)
47124839             {
4840
+                if (!filename.endsWith(".gfd"))
4841
+                    filename += ".gfd";
47134842                 lastname = browser.getDirectory() + filename;
47144843                 save();
47154844             }
....@@ -4903,18 +5032,31 @@
49035032     CheckboxMenuItem togglePaintItem;
49045033     JSplitPane mainPanel;
49055034     JScrollPane scrollpane;
5035
+    
49065036     JPanel toolbarPanel;
5037
+    
49075038     cGridBag treePanel;
5039
+    
49085040     JPanel radioPanel;
49095041     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
5042
+    
5043
+    cGridBag toolboxPanel;
49115044     cGridBag materialPanel;
5045
+    cGridBag ctrlPanel;
5046
+    
49125047     JScrollPane infoPanel;
5048
+    
49135049     cGridBag optionsPanel;
5050
+    
49145051     JTabbedPane objectPanel;
5052
+    boolean materialFlushed;
5053
+    Object3D latestObject;
5054
+    
49155055     cGridBag XYZPanel;
5056
+    
49165057     JSplitPane gridPanel;
49175058     JSplitPane bigPanel;
5059
+    
49185060     cGridBag bigThree;
49195061     cGridBag scenePanel;
49205062     cGridBag centralPanel;
....@@ -5029,7 +5171,7 @@
50295171     cNumberSlider fogField;
50305172     JLabel opacityPowerLabel;
50315173     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5174
+    cTree jTree;
50335175     //ObjectUI parent;
50345176     
50355177     cNumberSlider normalpushField;