Fix flush UI.

Normand Briere

2019-05-02 a76491b66a2e304d9ae27a162f407b98c70fbafa

 ObjEditor.java
..
..
@@ -19,6 +19,8 @@
19
19
 import //weka.core.
20
20
         matrix.Matrix;
21
21
 
22
+import grafeme.ui.*;
23
+
22
24
 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
23
25
         ActionListener, ChangeListener,
24
26
         InputMethodListener,
..
..
@@ -124,7 +126,7 @@
124
126
     void keyPressed(int key, int modifiers)
125
127
     {
126
128
     System.out.println("KEY PRESSED");
127
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
128
130
     }
129
131
      */
130
132
 
..
..
@@ -136,34 +138,41 @@
136
138
     public void closeUI()
137
139
     {
138
140
         //new Exception().printStackTrace();
139
-        System.out.println("this = " + this);
140
-        System.out.println("objEditor = " + objEditor);
141
+//        System.out.println("this = " + this);
142
+//        System.out.println("objEditor = " + objEditor);
141
143
         //nameField.removeActionListener(this);
142
-        objEditor.ctrlPanel.remove(nameField);
144
+//        objEditor.ctrlPanel.remove(nameField);
145
+        
146
+        objEditor.ctrlPanel.remove(namePanel);
143
147
         
144
148
         if (!GroupEditor.allparams)
145
149
             return;
146
150
         
147
-        objEditor.ctrlPanel.remove(liveCB);
148
-        objEditor.ctrlPanel.remove(hideCB);
149
-        objEditor.ctrlPanel.remove(markCB);
150
-
151
-        objEditor.ctrlPanel.remove(randomCB);
152
-        objEditor.ctrlPanel.remove(speedupCB);
153
-        objEditor.ctrlPanel.remove(rewindCB);
154
-
155
-        objEditor.ctrlPanel.remove(resetButton);
156
-        objEditor.ctrlPanel.remove(stepButton);
157
-//                objEditor.ctrlPanel.remove(stepAllButton);
158
-//                objEditor.ctrlPanel.remove(resetAllButton);
159
-        objEditor.ctrlPanel.remove(link2masterCB);
160
-        //objEditor.ctrlPanel.remove(flipVCB);
161
-        //objEditor.ctrlPanel.remove(texresMenu);
162
-        objEditor.ctrlPanel.remove(slowerButton);
163
-        objEditor.ctrlPanel.remove(fasterButton);
164
-        objEditor.ctrlPanel.remove(remarkButton);
151
+//        objEditor.ctrlPanel.remove(liveCB);
152
+//        objEditor.ctrlPanel.remove(hideCB);
153
+//        objEditor.ctrlPanel.remove(markCB);
154
+//
155
+//        objEditor.ctrlPanel.remove(randomCB);
156
+//        objEditor.ctrlPanel.remove(speedupCB);
157
+//        objEditor.ctrlPanel.remove(rewindCB);
158
+//
159
+//        objEditor.ctrlPanel.remove(resetButton);
160
+//        objEditor.ctrlPanel.remove(stepButton);
161
+////                objEditor.ctrlPanel.remove(stepAllButton);
162
+////                objEditor.ctrlPanel.remove(resetAllButton);
163
+//        objEditor.ctrlPanel.remove(link2masterCB);
164
+//        //objEditor.ctrlPanel.remove(flipVCB);
165
+//        //objEditor.ctrlPanel.remove(texresMenu);
166
+//        objEditor.ctrlPanel.remove(slowerButton);
167
+//        objEditor.ctrlPanel.remove(fasterButton);
168
+//        objEditor.ctrlPanel.remove(remarkButton);
165
169
         
166
-        Remove(normalpushField);
170
+        objEditor.ctrlPanel.remove(setupPanel);
171
+        objEditor.ctrlPanel.remove(commandsPanel);
172
+        objEditor.ctrlPanel.remove(pushPanel);
173
+        //objEditor.ctrlPanel.remove(fillPanel);
174
+        
175
+        //Remove(normalpushField);
167
176
     }
168
177
 
169
178
     public ObjEditor GetEditor()
..
..
@@ -351,21 +360,23 @@
351
360
         objectPanel = new JTabbedPane();
352
361
         toolbarPanel = new JPanel();
353
362
         toolbarPanel.setName("Toolbar");
354
-        treePanel = new JPanel();
363
+        treePanel = new cGridBag();
355
364
         treePanel.setName("Tree");
356
-        ctrlPanel = new JPanel(); // new GridBagLayout());
365
+        ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
357
366
         ctrlPanel.setName("Edit");
358
-        materialPanel = new JPanel();
367
+        materialPanel = new cGridBag().setVertical(true);
359
368
         materialPanel.setName("Material");
360
369
         /*JTextPane*/
361
370
         infoarea = createTextPane();
371
+        doc = infoarea.getStyledDocument();
372
+
362
373
         infoarea.setEditable(true);
363
374
         SetText();
364
375
 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365
376
 //            infoarea.setOpaque(false);
366
377
 //            //infoarea.setForeground(textcolor);
367
-            infoarea.setLineWrap(true);
368
-            infoarea.setWrapStyleWord(true);
378
+// TEXTAREA           infoarea.setLineWrap(true);
379
+// TEXTAREA           infoarea.setWrapStyleWord(true);
369
380
         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370
381
         infoPanel.setPreferredSize(new Dimension(50, 200));
371
382
         infoPanel.setName("Info");
..
..
@@ -376,16 +387,16 @@
376
387
         mainPanel.setName("Main");
377
388
         mainPanel.setContinuousLayout(true);
378
389
         mainPanel.setOneTouchExpandable(true);
379
-        mainPanel.setDividerLocation(1.0);
380
390
         mainPanel.setDividerSize(9);
381
-        mainPanel.setResizeWeight(0);
391
+        mainPanel.setDividerLocation(0.5); //1.0);
392
+        mainPanel.setResizeWeight(0.5);
382
393
 
383
394
         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384
395
         //mainPanel.setLayout(new GridBagLayout());
385
396
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386
-        treePanel.setLayout(new GridBagLayout());
387
-        ctrlPanel.setLayout(new GridBagLayout());
388
-        materialPanel.setLayout(new GridBagLayout());
397
+//        treePanel.setLayout(new GridBagLayout());
398
+        //ctrlPanel.setLayout(new GridBagLayout());
399
+        //materialPanel.setLayout(new GridBagLayout());
389
400
 
390
401
         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391
402
                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..
..
@@ -424,7 +435,7 @@
424
435
     static String newline = "\n";
425
436
     protected static final String buttonString = "JButton";
426
437
     StyledDocument doc;
427
-    JTextArea infoarea;
438
+    JTextPane infoarea;
428
439
 
429
440
     void ClearInfo()
430
441
     {
..
..
@@ -491,7 +502,10 @@
491
502
                 }
492
503
 
493
504
         if (full)
494
-            si.SendInfo("    BBox: " + minima + " - " + maxima, "regular");
505
+        {
506
+            si.SendInfo("    BBox min: " + minima, "regular");
507
+            si.SendInfo("    BBox max: " + maxima, "regular");
508
+        }
495
509
         
496
510
                 if (sel.bRep != null)
497
511
                 {
..
..
@@ -589,6 +603,9 @@
589
603
             {
590
604
                 CameraPane.pointflow = (PointFlow) sel;
591
605
             }
606
+            
607
+            si.SendInfo("_____________________", "regular");
608
+            si.SendInfo("", "regular");
592
609
         }
593
610
     }
594
611
 
..
..
@@ -620,52 +637,52 @@
620
637
                 cameraView.ToggleFullScreen();
621
638
         }
622
639
 
623
-    private JTextArea createTextPane()
640
+    private JTextPane createTextPane()
624
641
     {
625
-        String[] initString =
626
-        {
627
-            "This is an editable JTextPane, ", //regular
628
-            "another ", //italic
629
-            "styled ", //bold
630
-            "text ", //small
631
-            "component, ", //large
632
-            "which supports embedded components..." + newline,//regular
633
-            " " + newline, //button
634
-            "...and embedded icons..." + newline, //regular
635
-            " ", //icon
636
-            newline + "JTextPane is a subclass of JEditorPane that "
637
-            + "uses a StyledEditorKit and StyledDocument, and provides "
638
-            + "cover methods for interacting with those objects."
639
-        };
642
+// TEXTAREA       String[] initString =
643
+//        {
644
+//            "This is an editable JTextPane, ", //regular
645
+//            "another ", //italic
646
+//            "styled ", //bold
647
+//            "text ", //small
648
+//            "component, ", //large
649
+//            "which supports embedded components..." + newline,//regular
650
+//            " " + newline, //button
651
+//            "...and embedded icons..." + newline, //regular
652
+//            " ", //icon
653
+//            newline + "JTextPane is a subclass of JEditorPane that "
654
+//            + "uses a StyledEditorKit and StyledDocument, and provides "
655
+//            + "cover methods for interacting with those objects."
656
+//        };
657
+//
658
+//        String[] initStyles =
659
+//        {
660
+//            "regular", "italic", "bold", "small", "large",
661
+//            "regular", "button", "regular", "icon",
662
+//            "regular"
663
+//        };
664
+//
665
+//        JTextPane textPane = new JTextPane();
666
+//        textPane.setEditable(true);
667
+//        /*StyledDocument*/ doc = textPane.getStyledDocument();
668
+//        addStylesToDocument(doc);
669
+//
670
+//        try
671
+//        {
672
+//            for (int j = 0; j < 2; j++)
673
+//            {
674
+//                for (int i = 0; i < initString.length; i++)
675
+//                {
676
+//                    doc.insertString(doc.getLength(), initString[i],
677
+//                            doc.getStyle(initStyles[i]));
678
+//                }
679
+//            }
680
+//        } catch (BadLocationException ble)
681
+//        {
682
+//            System.err.println("Couldn't insert initial text into text pane.");
683
+//        }
640
684
 
641
-        String[] initStyles =
642
-        {
643
-            "regular", "italic", "bold", "small", "large",
644
-            "regular", "button", "regular", "icon",
645
-            "regular"
646
-        };
647
-
648
-        JTextPane textPane = new JTextPane();
649
-        textPane.setEditable(true);
650
-        /*StyledDocument*/ doc = textPane.getStyledDocument();
651
-        addStylesToDocument(doc);
652
-
653
-        try
654
-        {
655
-            for (int j = 0; j < 2; j++)
656
-            {
657
-                for (int i = 0; i < initString.length; i++)
658
-                {
659
-                    doc.insertString(doc.getLength(), initString[i],
660
-                            doc.getStyle(initStyles[i]));
661
-                }
662
-            }
663
-        } catch (BadLocationException ble)
664
-        {
665
-            System.err.println("Couldn't insert initial text into text pane.");
666
-        }
667
-
668
-        return new JTextArea(); // textPane;
685
+        return new JTextPane(); // textPane;
669
686
     }
670
687
 
671
688
     protected void addStylesToDocument(StyledDocument doc)
..
..
@@ -765,115 +782,83 @@
765
782
     JButton slowerButton;
766
783
     JButton fasterButton;
767
784
     JButton remarkButton;
785
+    
786
+    cGridBag namePanel;
787
+    cGridBag setupPanel;
788
+    cGridBag commandsPanel;
789
+    cGridBag pushPanel;
790
+    cGridBag fillPanel;
768
791
 
769
-    JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
792
+    JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770
793
     {
771
794
         JCheckBox cb;
772
795
 
773
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774
-        oe.aConstraints.gridwidth = 1; // 3;
775
-//        oe.aConstraints.weightx = 1;
776
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
777
-        oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
796
+        panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778
797
         cb.addItemListener(this);
779
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
780
-        oe.aConstraints.gridwidth = 1;
781
-        oe.aConstraints.gridx += 1;
782
798
 
783
799
         return cb;
784
800
     }
785
801
 
786
-    cButton AddButton(ObjEditor oe, String label)
802
+    cButton AddButton(cGridBag panel, String label)
787
803
     {
788
804
         cButton cb;
789
805
 
790
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791
-        oe.aConstraints.gridwidth = 1;
792
-//        oe.aConstraints.weightx = 1;
793
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
794
-        oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
806
+        panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795
807
         cb.addActionListener(this);
796
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
797
-        oe.aConstraints.gridwidth = 1;
798
-        oe.aConstraints.gridx += 1;
799
808
 
800
809
         return cb;
801
810
     }
802
811
 
803
-    JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
812
+    JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804
813
     {
805
814
         JComboBox combo;
806
815
 
807
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808
-        oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809
-        oe.aConstraints.gridx += 1;
816
+        panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810
817
         combo.addActionListener(this);
811
818
 
812
819
         return combo;
813
820
     }
814
821
 
815
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
822
+    cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816
823
     {
817
-        NumberSlider combo;
824
+        cGridBag control = new cGridBag();
825
+            
826
+        cNumberSlider combo;
818
827
 
819
828
         JLabel jlabel = new JLabel(label);
820
-
821
-        aConstraints.fill = GridBagConstraints.VERTICAL;
822
829
         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
-        aConstraints.gridwidth = 1;
824
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
-        aConstraints.gridx += 1;
826
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
-        aConstraints.gridx += 1;
830
-        aConstraints.gridwidth = 1;
831
-
830
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832
832
         combo.setFloat(current);
833
-
834
-        combo.label = jlabel;
835
-
836
-        combo.addChangeListener(this);
837
-
838
-        return combo;
833
+        
834
+        panel.add(control);
835
+        
836
+        return control;
839
837
     }
840
838
 
841
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
839
+    cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842
840
     {
843
-        NumberSlider combo;
841
+        cGridBag control = new cGridBag();
842
+        
843
+        cNumberSlider combo;
844
844
 
845
845
         JLabel jlabel = new JLabel(label);
846
-
847
-        aConstraints.fill = GridBagConstraints.VERTICAL;
848
846
         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849
-        aConstraints.gridwidth = 2;
850
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851
-        aConstraints.gridx += 1;
852
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
853
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855
-        aConstraints.gridx += 1;
856
-        aConstraints.gridwidth = 1;
857
-
847
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848
+        control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858
849
         combo.setInteger(current);
859
850
 
860
-        combo.label = jlabel;
861
-
862
-        combo.addChangeListener(this);
863
-
864
-        return combo;
851
+        panel.add(control);
852
+        
853
+        return control;
865
854
     }
866
855
 
867
-    JTextArea AddText(JPanel ctrlPanel, String name)
856
+    JTextArea AddText(cGridBag ctrlPanel, String name)
868
857
     {
869
858
         JTextArea text;
870
859
 
871
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
872
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874
861
         text.addCaretListener(this);
875
-        aConstraints.gridx += 1;
876
-        aConstraints.gridwidth = 1;
877
862
 
878
863
         return text;
879
864
     }
..
..
@@ -903,9 +888,16 @@
903
888
         objEditor.ctrlPanel.remove(j);
904
889
     }
905
890
 
891
+    void Remove(cNumberSlider j)
892
+    {
893
+        j.removeChangeListener(this);
894
+        //objEditor.ctrlPanel.remove(j.label);
895
+        objEditor.ctrlPanel.remove(j);
896
+    }
897
+
906
898
     /*
907
899
      */
908
-    void Return() // ObjEditor oe)
900
+    void Return0() // ObjEditor oe)
909
901
     {
910
902
         aConstraints.gridy += 1;
911
903
         aConstraints.gridx = 0;
..
..
@@ -960,37 +952,70 @@
960
952
 
961
953
     void SetupUI2(ObjEditor oe)
962
954
     {
963
-//            oe.aConstraints.weightx = 0;
964
-//            oe.aConstraints.weighty = 0;
965
-//            oe.aConstraints.gridx = 0;
966
-//            oe.aConstraints.gridy = 0;
967
-        SetupName(oe);
955
+        //SetupName(oe);
956
+        
957
+            namePanel = new cGridBag();
958
+            
959
+        nameField = AddText(namePanel, copy.GetName());
960
+        namePanel.add(nameField);
961
+        oe.ctrlPanel.add(namePanel);
962
+        
963
+        oe.ctrlPanel.Return();
968
964
         
969
965
         if (!GroupEditor.allparams)
970
966
             return;
971
967
 
972
-        liveCB = AddCheckBox(oe, "Live", copy.live);
973
-        link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974
-        hideCB = AddCheckBox(oe, "Hide", copy.hide);
968
+            setupPanel = new cGridBag().setVertical(false);
969
+            
970
+        liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971
+                liveCB.setToolTipText("Animate object");
972
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973
+                hideCB.setToolTipText("Hide object");
975
974
 //            Return();
976
-        markCB = AddCheckBox(oe, "Mark", copy.marked);
977
-        rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978
-        randomCB = AddCheckBox(oe, "Rand", copy.random);
979
-        Return();
980
-        resetButton = AddButton(oe, "Reset");
981
-        stepButton = AddButton(oe, "Step");
975
+        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976
+        markCB.setToolTipText("Set the animation target transform");
977
+        
978
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
979
+        rewindCB.setToolTipText("Rewind animation");
980
+        
981
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982
+        randomCB.setToolTipText("Option for switch node");
983
+
984
+        if (Globals.ADVANCED)
985
+        {
986
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
987
+                link2masterCB.setToolTipText("Attach to support");
988
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
989
+                speedupCB.setToolTipText("Option motion capture");
990
+        }
991
+        
992
+        oe.ctrlPanel.add(setupPanel);
993
+        oe.ctrlPanel.Return();
994
+        
995
+            commandsPanel = new cGridBag().setVertical(false);
996
+        
997
+        resetButton = AddButton(commandsPanel, "Reset");
998
+        resetButton.setToolTipText("Jump to frame zero");
999
+        stepButton = AddButton(commandsPanel, "Step");
1000
+        stepButton.setToolTipText("Step one frame");
982
1001
 //            resetAllButton = AddButton(oe, "Reset All");
983
1002
 //            stepAllButton = AddButton(oe, "Step All");
984
-        speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985
1003
 //            Return();
986
-        slowerButton = AddButton(oe, "Slow");
987
-        fasterButton = AddButton(oe, "Fast");
988
-        remarkButton = AddButton(oe, "Rem");
1004
+        slowerButton = AddButton(commandsPanel, "Slow");
1005
+        slowerButton.setToolTipText("Decrease animation speed");
1006
+        fasterButton = AddButton(commandsPanel, "Fast");
1007
+        fasterButton.setToolTipText("Increase animation speed");
1008
+        remarkButton = AddButton(commandsPanel, "Remark");
1009
+        remarkButton.setToolTipText("Set the current transform as the target");
989
1010
 
990
-        Return();
1011
+        oe.ctrlPanel.add(commandsPanel);
1012
+        oe.ctrlPanel.Return();
991
1013
 
992
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
-    Return();
1014
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1015
+    normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016
+    //Return();
1017
+
1018
+        oe.ctrlPanel.Return();
994
1019
             
995
1020
 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996
1021
 //        ObjEditor.aConstraints.gridx += 1;
..
..
@@ -1085,7 +1110,7 @@
1085
1110
         oe.aConstraints.gridwidth = 1;
1086
1111
         /**/
1087
1112
         nameField = AddText(oe.ctrlPanel, copy.GetName());
1088
-        Return();
1113
+        oe.ctrlPanel.Return();
1089
1114
 
1090
1115
         //ctrlPanel.add(textureButton = new Button("Texture..."));
1091
1116
         //textureButton.setEnabled(false);
..
..
@@ -1187,7 +1212,8 @@
1187
1212
         //JPanel worldPanel =
1188
1213
         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189
1214
         //worldPanel.setName("World");
1190
-	centralPanel = new JPanel(new BorderLayout());
1215
+	centralPanel = new cGridBag();
1216
+        centralPanel.preferredWidth = 20;
1191
1217
 	timelinePanel = new JPanel(new BorderLayout());
1192
1218
         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193
1219
 
..
..
@@ -1217,12 +1243,13 @@
1217
1243
         //frontView.object = copy;
1218
1244
         //sideView.object = copy;
1219
1245
 
1220
-        XYZPanel = new JPanel();
1221
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1246
+        XYZPanel = new cGridBag().setVertical(true);
1247
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222
1248
 
1223
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1249
+        XYZPanel.preferredWidth = 5;
1250
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1251
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1252
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1226
1253
 
1227
1254
         /*
1228
1255
         gridPanel = new JPanel(); //new BorderLayout());
..
..
@@ -1260,10 +1287,11 @@
1260
1287
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261
1288
         //tmp.setName("Edit");
1262
1289
         objectPanel.add(materialPanel);
1263
-        JPanel north = new JPanel(new BorderLayout());
1264
-        north.setName("Edit");
1265
-        north.add(ctrlPanel, BorderLayout.NORTH);
1266
-        objectPanel.add(north);
1290
+//        JPanel north = new JPanel(new BorderLayout());
1291
+//        north.setName("Edit");
1292
+//        north.add(ctrlPanel, BorderLayout.NORTH);
1293
+//        objectPanel.add(north);
1294
+        objectPanel.add(ctrlPanel);
1267
1295
         objectPanel.add(infoPanel);
1268
1296
 
1269
1297
         /*
..
..
@@ -1284,16 +1312,23 @@
1284
1312
         scrollpane.setWheelScrollingEnabled(true);
1285
1313
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1286
1314
 
1287
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
-        scenePanel.add(scrollpane);
1315
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1316
+        scenePanel.preferredWidth = 7;
1317
+        
1318
+        JTabbedPane tabbedPane = new JTabbedPane();
1319
+        tabbedPane.add(scrollpane);
1289
1320
 
1290
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1321
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1291
1322
 
1292
-        optionsPanel = new JPanel(new GridBagLayout());
1323
+        optionsPanel = new cGridBag().setVertical(true);
1293
1324
 
1294
1325
         optionsPanel.setName("Options");
1295
-        scenePanel.add(optionsPanel);
1296
-
1326
+        
1327
+        AddOptions(optionsPanel); //, aConstraints);
1328
+        
1329
+        tabbedPane.add(optionsPanel);
1330
+        
1331
+        scenePanel.add(tabbedPane);
1297
1332
 
1298
1333
         /*
1299
1334
         cTree jTree = new cTree(null);
..
..
@@ -1327,6 +1362,7 @@
1327
1362
         //bigPanel.setSize(new Dimension(10,10));
1328
1363
         //bigPanel.add(ctrlPanel);
1329
1364
         //bigPanel.add(gridPanel);
1365
+        /**
1330
1366
         bigThree = new JPanel();
1331
1367
         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332
1368
         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..
..
@@ -1350,7 +1386,13 @@
1350
1386
         //	aConstraints.gridheight = 3;
1351
1387
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352
1388
         bigThree.add(XYZPanel, aWindowConstraints);
1389
+        /**/
1353
1390
 
1391
+        bigThree = new cGridBag();
1392
+        bigThree.addComponent(scenePanel);
1393
+        bigThree.addComponent(centralPanel);
1394
+        bigThree.addComponent(XYZPanel);
1395
+        
1354
1396
 //                // SIDE EFFECT!!!
1355
1397
 //		aConstraints.gridx = 0;
1356
1398
 //		aConstraints.gridy = 0;
..
..
@@ -1393,6 +1435,10 @@
1393
1435
         });
1394
1436
     }
1395
1437
 
1438
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1439
+    {
1440
+    }
1441
+    
1396
1442
     JTree GetTree()
1397
1443
     {
1398
1444
         return objEditor.jTree;
..
..
@@ -1404,260 +1450,170 @@
1404
1450
         ctrlPanel.removeAll();
1405
1451
     }
1406
1452
 
1407
-    void SetupMaterial(JPanel ctrlPanel)
1453
+    void SetupMaterial(cGridBag panel)
1408
1454
     {
1409
-        aConstraints.weighty = 0;
1410
-        //aConstraints.weightx = 1;
1411
-                /*
1455
+         /*
1412
1456
         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413
1457
         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415
-        aConstraints.gridx += 1;
1416
1458
          */
1417
1459
 
1418
-        aConstraints.gridwidth = 1;
1419
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420
-        aConstraints.gridx += 1;
1421
-        aConstraints.weighty = 0;
1422
-        aConstraints.gridwidth = 1;
1460
+        cGridBag editBar = new cGridBag().setVertical(false);
1461
+            
1462
+        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1463
+                createMaterialButton.setToolTipText("Create material");
1423
1464
 
1424
1465
         /*
1425
1466
         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426
-        aConstraints.gridx += 1;
1427
-        aConstraints.weighty = 0;
1428
-        aConstraints.gridwidth = 1;
1429
1467
          */
1430
1468
 
1431
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432
-        aConstraints.gridx += 1;
1469
+        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1470
+                clearMaterialButton.setToolTipText("Clear material");
1471
+        
1472
+        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473
+        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474
+        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1433
1475
 
1434
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435
-
1436
-        aConstraints.gridx += 1;
1437
-
1438
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439
-
1440
-        aConstraints.gridx += 1;
1441
-
1442
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443
-
1444
-        aConstraints.gridx = 0;
1445
-        aConstraints.gridy += 1;
1446
-        aConstraints.weighty = 0;
1447
-        aConstraints.gridwidth = 1;
1476
+        editBar.preferredHeight = 15;
1477
+        
1478
+        panel.add(editBar);
1479
+        
1448
1480
         /**/
1449
1481
         //aConstraints.weighty = 0;
1450
1482
         ////aConstraints.weightx = 1;
1451
1483
         //aConstraints.weighty = 1;
1452
1484
         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453
1485
         //aConstraints.gridx += 1;
1454
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455
-        aConstraints.weighty = 0;
1456
-        aConstraints.gridx = 0;
1457
-        aConstraints.gridy += 1;
1458
-        aConstraints.gridwidth = 1;
1486
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459
1487
 
1460
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
-        aConstraints.gridx += 1;
1464
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
-        //aConstraints.weightx = 0;
1466
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
-        aConstraints.gridx = 0;
1468
-        aConstraints.gridy += 1;
1469
-        aConstraints.gridwidth = 1;
1488
+        cGridBag colorSection = new cGridBag().setVertical(true);
1489
+        
1490
+        cGridBag color = new cGridBag();
1491
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1492
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1494
+        //colorField.preferredWidth = 200;
1495
+        colorSection.add(color);
1470
1496
 
1471
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
-        aConstraints.gridx += 1;
1475
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
-        aConstraints.gridx = 0;
1478
-        aConstraints.gridy += 1;
1479
-        aConstraints.gridwidth = 1;
1497
+        cGridBag modulation = new cGridBag();
1498
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1499
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1501
+        colorSection.add(modulation);
1480
1502
 
1481
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
-        aConstraints.gridx += 1;
1485
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
-        aConstraints.gridx = 0;
1488
-        aConstraints.gridy += 1;
1489
-        aConstraints.gridwidth = 1;
1503
+        cGridBag texture = new cGridBag();
1504
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1505
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507
+        colorSection.add(texture);
1490
1508
 
1491
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
-        aConstraints.gridx += 1;
1495
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
-        aConstraints.gridx = 0;
1498
-        aConstraints.gridy += 1;
1499
-        aConstraints.gridwidth = 1;
1509
+        cGridBag anisoU = new cGridBag();
1510
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1511
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1513
+        colorSection.add(anisoU);
1500
1514
 
1501
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
-        aConstraints.gridx += 1;
1505
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507
-        aConstraints.gridx = 0;
1508
-        aConstraints.gridy += 1;
1509
-        aConstraints.gridwidth = 1;
1515
+        cGridBag anisoV = new cGridBag();
1516
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1517
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1518
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1519
+        colorSection.add(anisoV);
1510
1520
 
1511
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514
-        aConstraints.gridx += 1;
1515
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517
-        aConstraints.gridx = 0;
1518
-        aConstraints.gridy += 1;
1519
-        aConstraints.gridwidth = 1;
1521
+        cGridBag shadowbias = new cGridBag();
1522
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1523
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1524
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1525
+        colorSection.add(shadowbias);
1520
1526
 
1521
-        //aConstraints.weighty = 1;
1522
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523
-        //aConstraints.gridx += 1;
1524
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525
-        aConstraints.weighty = 0;
1526
-        aConstraints.gridx = 0;
1527
-        aConstraints.gridy += 1;
1528
-        aConstraints.gridwidth = 1;
1527
+        panel.add(new JSeparator());
1528
+        
1529
+        panel.add(colorSection);
1530
+        
1531
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1532
+        
1533
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1534
+        
1535
+        cGridBag diffuse = new cGridBag();
1536
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1537
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1538
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1539
+        diffuseSection.add(diffuse);
1529
1540
 
1530
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
-        aConstraints.gridx += 1;
1534
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
-        aConstraints.gridx = 0;
1537
-        aConstraints.gridy += 1;
1538
-        aConstraints.gridwidth = 1;
1541
+        cGridBag diffuseness = new cGridBag();
1542
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1543
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1544
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1545
+        diffuseSection.add(diffuseness);
1539
1546
 
1540
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
-        aConstraints.gridx += 1;
1544
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
-        aConstraints.gridx = 0;
1547
-        aConstraints.gridy += 1;
1548
-        aConstraints.gridwidth = 1;
1547
+        cGridBag selfshadow = new cGridBag();
1548
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1549
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1550
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1551
+        diffuseSection.add(selfshadow);
1549
1552
 
1550
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
-        aConstraints.gridx += 1;
1554
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
-        aConstraints.gridx = 0;
1557
-        aConstraints.gridy += 1;
1558
-        aConstraints.gridwidth = 1;
1553
+        cGridBag sheen = new cGridBag();
1554
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1555
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1556
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1557
+        diffuseSection.add(sheen);
1559
1558
 
1560
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
-        aConstraints.gridx += 1;
1564
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566
-        aConstraints.gridx = 0;
1567
-        aConstraints.gridy += 1;
1568
-        aConstraints.gridwidth = 1;
1559
+        cGridBag subsurface = new cGridBag();
1560
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1561
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1563
+        diffuseSection.add(subsurface);
1569
1564
 
1570
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
-        aConstraints.gridx += 1;
1574
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576
-        aConstraints.gridx = 0;
1577
-        aConstraints.gridy += 1;
1578
-        aConstraints.gridwidth = 1;
1565
+        cGridBag shadow = new cGridBag();
1566
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1567
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1569
+        diffuseSection.add(shadow);
1579
1570
 
1580
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
-        aConstraints.gridx += 1;
1584
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
-        aConstraints.gridx = 0;
1587
-        aConstraints.gridy += 1;
1588
-        aConstraints.gridwidth = 1;
1571
+        cGridBag fakedepth = new cGridBag();
1572
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1573
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575
+        diffuseSection.add(fakedepth);
1589
1576
 
1590
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593
-        aConstraints.gridx += 1;
1594
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596
-        aConstraints.gridx = 0;
1597
-        aConstraints.gridy += 1;
1598
-        aConstraints.gridwidth = 1;
1577
+        panel.add(new JSeparator());
1578
+        
1579
+        panel.add(diffuseSection);
1580
+        
1581
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1582
+        
1583
+        cGridBag specularSection = new cGridBag().setVertical(true);
1599
1584
 
1600
-        //aConstraints.weighty = 1;
1601
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602
-        //aConstraints.gridx += 1;
1603
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604
-        aConstraints.weighty = 0;
1605
-        aConstraints.gridx = 0;
1606
-        aConstraints.gridy += 1;
1607
-        aConstraints.gridwidth = 1;
1585
+        cGridBag specular = new cGridBag();
1586
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1587
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1589
+        specularSection.add(specular);
1608
1590
 
1609
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
-        aConstraints.gridx += 1;
1613
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
-        aConstraints.gridx = 0;
1616
-        aConstraints.gridy += 1;
1617
-        aConstraints.gridwidth = 1;
1591
+        cGridBag lightarea = new cGridBag();
1592
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1593
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1595
+        specularSection.add(lightarea);
1618
1596
 
1619
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
-        aConstraints.gridx += 1;
1623
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
-        aConstraints.gridx = 0;
1626
-        aConstraints.gridy += 1;
1627
-        aConstraints.gridwidth = 1;
1597
+        cGridBag shininess = new cGridBag();
1598
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1599
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1601
+        specularSection.add(shininess);
1628
1602
 
1629
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
-        aConstraints.gridx += 1;
1633
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635
-        aConstraints.gridx = 0;
1636
-        aConstraints.gridy += 1;
1637
-        aConstraints.gridwidth = 1;
1603
+        cGridBag metalness = new cGridBag();
1604
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1605
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1607
+        specularSection.add(metalness);
1638
1608
 
1639
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
-        aConstraints.gridx += 1;
1643
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645
-        aConstraints.gridx = 0;
1646
-        aConstraints.gridy += 1;
1647
-        aConstraints.gridwidth = 1;
1609
+        cGridBag velvet = new cGridBag();
1610
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1611
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
+        specularSection.add(velvet);
1648
1614
 
1649
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
-        aConstraints.gridx += 1;
1653
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
-        aConstraints.gridx = 0;
1656
-        aConstraints.gridy += 1;
1657
-        aConstraints.gridwidth = 1;
1658
-
1659
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660
-        Return();
1615
+        shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1616
+        //Return();
1661
1617
 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662
1618
 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663
1619
 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
..
..
@@ -1668,130 +1624,93 @@
1668
1624
 //		aConstraints.gridy += 1;
1669
1625
 //		aConstraints.gridwidth = 1;
1670
1626
 
1671
-        //aConstraints.weighty = 1;
1672
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673
-        //aConstraints.gridx += 1;
1674
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675
-        aConstraints.weighty = 0;
1676
-        aConstraints.gridx = 0;
1677
-        aConstraints.gridy += 1;
1678
-        aConstraints.gridwidth = 1;
1679
1627
 
1680
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
-        aConstraints.gridx += 1;
1684
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
-        aConstraints.gridx = 0;
1687
-        aConstraints.gridy += 1;
1688
-        aConstraints.gridwidth = 1;
1628
+        panel.add(new JSeparator());
1629
+        
1630
+        panel.add(specularSection);
1631
+        
1632
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633
+        
1634
+        cGridBag globalSection = new cGridBag().setVertical(true);
1689
1635
 
1690
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
-        aConstraints.gridx += 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
-        aConstraints.gridx = 0;
1697
-        aConstraints.gridy += 1;
1698
-        aConstraints.gridwidth = 1;
1636
+        cGridBag camera = new cGridBag();
1637
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640
+        globalSection.add(camera);
1699
1641
 
1700
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
-        aConstraints.gridx += 1;
1704
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706
-        aConstraints.gridx = 0;
1707
-        aConstraints.gridy += 1;
1708
-        aConstraints.gridwidth = 1;
1642
+        cGridBag ambient = new cGridBag();
1643
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646
+        globalSection.add(ambient);
1709
1647
 
1710
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
-        aConstraints.gridx += 1;
1714
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716
-        aConstraints.gridx = 0;
1717
-        aConstraints.gridy += 1;
1718
-        aConstraints.gridwidth = 1;
1719
-        aConstraints.weighty = 0;
1648
+        cGridBag backlit = new cGridBag();
1649
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652
+        globalSection.add(backlit);
1720
1653
 
1721
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
-        aConstraints.gridx += 1;
1725
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727
-        aConstraints.gridx = 0;
1728
-        aConstraints.gridy += 1;
1729
-        aConstraints.gridwidth = 1;
1654
+        cGridBag opacity = new cGridBag();
1655
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658
+        globalSection.add(opacity);
1730
1659
 
1731
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
-        aConstraints.gridx += 1;
1735
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1737
-        aConstraints.gridx = 0;
1738
-        aConstraints.gridy += 1;
1739
-        aConstraints.gridwidth = 1;
1660
+        panel.add(new JSeparator());
1661
+        
1662
+        panel.add(globalSection);
1663
+        
1664
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665
+        
1666
+        cGridBag textureSection = new cGridBag().setVertical(true);
1740
1667
 
1741
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
-        aConstraints.gridx += 1;
1745
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747
-        aConstraints.gridx = 0;
1748
-        aConstraints.gridy += 1;
1749
-        aConstraints.gridwidth = 1;
1668
+        cGridBag bump = new cGridBag();
1669
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1670
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1672
+        textureSection.add(bump);
1750
1673
 
1751
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
-        aConstraints.gridx += 1;
1755
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757
-        aConstraints.gridx = 0;
1758
-        aConstraints.gridy += 1;
1759
-        aConstraints.gridwidth = 1;
1674
+        cGridBag noise = new cGridBag();
1675
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1676
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1678
+        textureSection.add(noise);
1760
1679
 
1761
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
-        aConstraints.gridx += 1;
1765
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767
-        aConstraints.gridx = 0;
1768
-        aConstraints.gridy += 1;
1769
-        aConstraints.gridwidth = 1;
1680
+        cGridBag power = new cGridBag();
1681
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1682
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1683
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1684
+        textureSection.add(power);
1770
1685
 
1771
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774
-        aConstraints.gridx += 1;
1775
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1777
-        aConstraints.gridx = 0;
1778
-        aConstraints.gridy += 1;
1779
-        aConstraints.gridwidth = 1;
1686
+        cGridBag borderfade = new cGridBag();
1687
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1688
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1690
+        textureSection.add(borderfade);
1780
1691
 
1781
-        //aConstraints.weighty = 1;
1782
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783
-        //aConstraints.gridx += 1;
1784
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785
-        aConstraints.weighty = 0;
1692
+        cGridBag fog = new cGridBag();
1693
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1694
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1696
+        textureSection.add(fog);
1786
1697
 
1787
-        aConstraints.gridx = 0;
1788
-        aConstraints.gridy = 0;
1789
-        aConstraints.gridwidth = 1;
1698
+        cGridBag opacityPower = new cGridBag();
1699
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1700
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1701
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1702
+        textureSection.add(opacityPower);
1703
+
1704
+        panel.add(new JSeparator());
1705
+        
1706
+        panel.add(textureSection);
1707
+        
1708
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1790
1709
 
1791
1710
         SetMaterial(copy); // .GetMaterial());
1792
1711
 
1793
-        colorField.addChangeListener(this);
1794
-        modulationField.addChangeListener(this);
1712
+        //colorField.addChangeListener(this);
1713
+//        modulationField.addChangeListener(this);
1795
1714
         metalnessField.addChangeListener(this);
1796
1715
         diffuseField.addChangeListener(this);
1797
1716
         specularField.addChangeListener(this);
..
..
@@ -2603,6 +2522,7 @@
2603
2522
                 }
2604
2523
                 if (input == null)
2605
2524
                 {
2525
+                new Exception().printStackTrace();
2606
2526
                     System.exit(0);
2607
2527
                 }
2608
2528
 
..
..
@@ -3077,6 +2997,7 @@
3077
2997
         if (event.getSource() == randomCB)
3078
2998
         {
3079
2999
             copy.random ^= true;
3000
+            objEditor.refreshContents();
3080
3001
             return;
3081
3002
         }
3082
3003
         if (event.getSource() == speedupCB)
..
..
@@ -3297,25 +3218,25 @@
3297
3218
 
3298
3219
     void ToggleAnimation()
3299
3220
     {
3300
-        if (!CameraPane.ANIMATION)
3221
+        if (!Globals.ANIMATION)
3301
3222
         {
3302
3223
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3303
-            browser.show();
3224
+            browser.setVisible(true);
3304
3225
             String filename = browser.getFile();
3305
3226
             if (filename != null && filename.length() > 0)
3306
3227
             {
3307
-                CameraPane.filename = browser.getDirectory() + filename;
3228
+                Globals.filename = browser.getDirectory() + filename;
3308
3229
                 //CameraPane.framecount = 0;
3309
-                CameraPane.imagecount = 0;
3230
+                Globals.imagecount = 0;
3310
3231
 
3311
-                CameraPane.ANIMATION ^= true;
3232
+                Globals.ANIMATION ^= true;
3312
3233
 
3313
3234
                 GrafreeD.wav.cursor = 0;
3314
3235
                 GrafreeD.wav.loop = 0;
3315
3236
             }
3316
3237
         } else
3317
3238
         {
3318
-            CameraPane.ANIMATION ^= true;
3239
+            Globals.ANIMATION ^= true;
3319
3240
         }
3320
3241
     }
3321
3242
 
..
..
@@ -3332,6 +3253,7 @@
3332
3253
             callee.refreshContents();
3333
3254
         } else
3334
3255
         {
3256
+                new Exception().printStackTrace();
3335
3257
             System.exit(0);
3336
3258
         }
3337
3259
     }
..
..
@@ -3494,7 +3416,7 @@
3494
3416
             current.fakedepth = (float) fakedepthField.getFloat();
3495
3417
             current.shadowbias = (float) shadowbiasField.getFloat();
3496
3418
 
3497
-            if (!NumberSlider.frozen)
3419
+            if (!cNumberSlider.frozen)
3498
3420
             {
3499
3421
                 //System.out.println("Propagate = " + propagate);
3500
3422
                 copy.UpdateMaterial(anchor, current, propagate);
..
..
@@ -3542,6 +3464,7 @@
3542
3464
                 || e.getSource() == apertureField
3543
3465
                 || e.getSource() == shadowblurField)
3544
3466
         {
3467
+                new Exception().printStackTrace();
3545
3468
             System.exit(0);
3546
3469
             cameraView.options1[0] = (float) focusField.getFloat() * 10;
3547
3470
             cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..
..
@@ -3867,7 +3790,7 @@
3867
3790
 
3868
3791
             radioPanel.revalidate();
3869
3792
             radioPanel.repaint();
3870
-            ctrlPanel.revalidate(); // ? new
3793
+            ctrlPanel.validate(); // ? new
3871
3794
             ctrlPanel.repaint();
3872
3795
         }
3873
3796
     }
..
..
@@ -4513,8 +4436,8 @@
4513
4436
     //MenuItem normalLensItem;
4514
4437
     MenuItem editCameraItem;
4515
4438
     MenuItem revertCameraItem;
4516
-    CheckboxMenuItem toggleLiveItem;
4517
4439
     MenuItem stepItem;
4440
+    CheckboxMenuItem toggleLiveItem;
4518
4441
     CheckboxMenuItem toggleFullScreenItem;
4519
4442
     CheckboxMenuItem toggleTimelineItem;
4520
4443
     CheckboxMenuItem toggleRenderItem;
..
..
@@ -4531,20 +4454,20 @@
4531
4454
     JSplitPane mainPanel;
4532
4455
     JScrollPane scrollpane;
4533
4456
     JPanel toolbarPanel;
4534
-    JPanel treePanel;
4457
+    cGridBag treePanel;
4535
4458
     JPanel radioPanel;
4536
4459
     ButtonGroup buttonGroup;
4537
-    JPanel ctrlPanel;
4538
-    JPanel materialPanel;
4460
+    cGridBag ctrlPanel;
4461
+    cGridBag materialPanel;
4539
4462
     JScrollPane infoPanel;
4540
-    JPanel optionsPanel;
4463
+    cGridBag optionsPanel;
4541
4464
     JTabbedPane objectPanel;
4542
-    JPanel XYZPanel;
4465
+    cGridBag XYZPanel;
4543
4466
     JSplitPane gridPanel;
4544
4467
     JSplitPane bigPanel;
4545
-    JPanel bigThree;
4546
-    JTabbedPane scenePanel;
4547
-    JPanel centralPanel;
4468
+    cGridBag bigThree;
4469
+    cGridBag scenePanel;
4470
+    cGridBag centralPanel;
4548
4471
     JSplitPane cameraPanel;
4549
4472
     JPanel timelinePanel;
4550
4473
     JMenuBar timelineMenubar;
..
..
@@ -4597,67 +4520,67 @@
4597
4520
     // MATERIAL
4598
4521
     JLabel materialLabel;
4599
4522
     JLabel colorLabel;
4600
-    NumberSlider colorField;
4523
+    cNumberSlider colorField;
4601
4524
     JLabel modulationLabel;
4602
-    NumberSlider modulationField;
4525
+    cNumberSlider modulationField;
4603
4526
     JLabel metalnessLabel;
4604
-    NumberSlider metalnessField;
4527
+    cNumberSlider metalnessField;
4605
4528
     JLabel diffuseLabel;
4606
-    NumberSlider diffuseField;
4529
+    cNumberSlider diffuseField;
4607
4530
     JLabel specularLabel;
4608
-    NumberSlider specularField;
4531
+    cNumberSlider specularField;
4609
4532
     JLabel shininessLabel;
4610
-    NumberSlider shininessField;
4533
+    cNumberSlider shininessField;
4611
4534
     JLabel shiftLabel;
4612
-    NumberSlider shiftField;
4535
+    cNumberSlider shiftField;
4613
4536
     JLabel ambientLabel;
4614
-    NumberSlider ambientField;
4537
+    cNumberSlider ambientField;
4615
4538
     JLabel lightareaLabel;
4616
-    NumberSlider lightareaField;
4539
+    cNumberSlider lightareaField;
4617
4540
     JLabel diffusenessLabel;
4618
-    NumberSlider diffusenessField;
4541
+    cNumberSlider diffusenessField;
4619
4542
     JLabel velvetLabel;
4620
-    NumberSlider velvetField;
4543
+    cNumberSlider velvetField;
4621
4544
     JLabel sheenLabel;
4622
-    NumberSlider sheenField;
4545
+    cNumberSlider sheenField;
4623
4546
     JLabel subsurfaceLabel;
4624
-    NumberSlider subsurfaceField;
4547
+    cNumberSlider subsurfaceField;
4625
4548
     //JLabel bumpLabel;
4626
4549
     //NumberSlider bumpField;
4627
4550
     JLabel backlitLabel;
4628
-    NumberSlider backlitField;
4551
+    cNumberSlider backlitField;
4629
4552
     JLabel anisoLabel;
4630
-    NumberSlider anisoField;
4553
+    cNumberSlider anisoField;
4631
4554
     JLabel anisoVLabel;
4632
-    NumberSlider anisoVField;
4555
+    cNumberSlider anisoVField;
4633
4556
     JLabel cameraLabel;
4634
-    NumberSlider cameraField;
4557
+    cNumberSlider cameraField;
4635
4558
     JLabel selfshadowLabel;
4636
-    NumberSlider selfshadowField;
4559
+    cNumberSlider selfshadowField;
4637
4560
     JLabel shadowLabel;
4638
-    NumberSlider shadowField;
4561
+    cNumberSlider shadowField;
4639
4562
     JLabel textureLabel;
4640
-    NumberSlider textureField;
4563
+    cNumberSlider textureField;
4641
4564
     JLabel opacityLabel;
4642
-    NumberSlider opacityField;
4565
+    cNumberSlider opacityField;
4643
4566
     JLabel fakedepthLabel;
4644
-    NumberSlider fakedepthField;
4567
+    cNumberSlider fakedepthField;
4645
4568
     JLabel shadowbiasLabel;
4646
-    NumberSlider shadowbiasField;
4569
+    cNumberSlider shadowbiasField;
4647
4570
     JLabel bumpLabel;
4648
-    NumberSlider bumpField;
4571
+    cNumberSlider bumpField;
4649
4572
     JLabel noiseLabel;
4650
-    NumberSlider noiseField;
4573
+    cNumberSlider noiseField;
4651
4574
     JLabel powerLabel;
4652
-    NumberSlider powerField;
4575
+    cNumberSlider powerField;
4653
4576
     JLabel borderfadeLabel;
4654
-    NumberSlider borderfadeField;
4577
+    cNumberSlider borderfadeField;
4655
4578
     JLabel fogLabel;
4656
-    NumberSlider fogField;
4579
+    cNumberSlider fogField;
4657
4580
     JLabel opacityPowerLabel;
4658
-    NumberSlider opacityPowerField;
4581
+    cNumberSlider opacityPowerField;
4659
4582
     JTree jTree;
4660
4583
     //ObjectUI parent;
4661
4584
     
4662
-    NumberSlider normalpushField;
4585
+    cNumberSlider normalpushField;
4663
4586
 }