blame | history | patch | commit | commitdiff
Normand Briere
2019-05-01 b1585b5b2b60c4165be400636c787fae24428c6a 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -31,6 +33,9 @@
3133         boolean timeline;
3234         boolean wasFullScreen;
3335 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
3439     // SCRIPT
3540     
3641     transient JFrame textpanel = null;
....@@ -121,47 +126,52 @@
121126     void keyPressed(int key, int modifiers)
122127     {
123128     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
125130     }
126131      */
127132 
128133     static GridBagConstraints aConstraints;
129134     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
135
+
132136     static int GRIDWIDTH = 100; // 4;
133137 
134138     public void closeUI()
135139     {
136140         //new Exception().printStackTrace();
137
-        System.out.println("this = " + this);
138
-        System.out.println("objEditor = " + objEditor);
141
+//        System.out.println("this = " + this);
142
+//        System.out.println("objEditor = " + objEditor);
139143         //nameField.removeActionListener(this);
140
-        objEditor.ctrlPanel.remove(nameField);
144
+//        objEditor.ctrlPanel.remove(nameField);
141145         
142146         if (!GroupEditor.allparams)
143147             return;
144148         
145
-        objEditor.ctrlPanel.remove(liveCB);
146
-        objEditor.ctrlPanel.remove(hideCB);
147
-        objEditor.ctrlPanel.remove(markCB);
148
-
149
-        objEditor.ctrlPanel.remove(randomCB);
150
-        objEditor.ctrlPanel.remove(speedupCB);
151
-        objEditor.ctrlPanel.remove(rewindCB);
152
-
153
-        objEditor.ctrlPanel.remove(resetButton);
154
-        objEditor.ctrlPanel.remove(stepButton);
155
-//                objEditor.ctrlPanel.remove(stepAllButton);
156
-//                objEditor.ctrlPanel.remove(resetAllButton);
157
-        objEditor.ctrlPanel.remove(link2masterCB);
158
-        //objEditor.ctrlPanel.remove(flipVCB);
159
-        //objEditor.ctrlPanel.remove(texresMenu);
160
-        objEditor.ctrlPanel.remove(slowerButton);
161
-        objEditor.ctrlPanel.remove(fasterButton);
162
-        objEditor.ctrlPanel.remove(remarkButton);
149
+//        objEditor.ctrlPanel.remove(liveCB);
150
+//        objEditor.ctrlPanel.remove(hideCB);
151
+//        objEditor.ctrlPanel.remove(markCB);
152
+//
153
+//        objEditor.ctrlPanel.remove(randomCB);
154
+//        objEditor.ctrlPanel.remove(speedupCB);
155
+//        objEditor.ctrlPanel.remove(rewindCB);
156
+//
157
+//        objEditor.ctrlPanel.remove(resetButton);
158
+//        objEditor.ctrlPanel.remove(stepButton);
159
+////                objEditor.ctrlPanel.remove(stepAllButton);
160
+////                objEditor.ctrlPanel.remove(resetAllButton);
161
+//        objEditor.ctrlPanel.remove(link2masterCB);
162
+//        //objEditor.ctrlPanel.remove(flipVCB);
163
+//        //objEditor.ctrlPanel.remove(texresMenu);
164
+//        objEditor.ctrlPanel.remove(slowerButton);
165
+//        objEditor.ctrlPanel.remove(fasterButton);
166
+//        objEditor.ctrlPanel.remove(remarkButton);
163167         
164
-        Remove(normalpushField);
168
+        objEditor.ctrlPanel.remove(namePanel);
169
+        objEditor.ctrlPanel.remove(setupPanel);
170
+        objEditor.ctrlPanel.remove(commandsPanel);
171
+        objEditor.ctrlPanel.remove(pushPanel);
172
+        //objEditor.ctrlPanel.remove(fillPanel);
173
+        
174
+        //Remove(normalpushField);
165175     }
166176 
167177     public ObjEditor GetEditor()
....@@ -309,7 +319,7 @@
309319         toggleTextureItem.setState(CameraPane.textureon);
310320         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311321         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
322
+        toggleLiveItem.setState(Globals.isLIVE());
313323         cameraMenu.add(stepItem = new MenuItem("Step"));
314324         stepItem.addActionListener(this);
315325 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -349,21 +359,23 @@
349359         objectPanel = new JTabbedPane();
350360         toolbarPanel = new JPanel();
351361         toolbarPanel.setName("Toolbar");
352
-        treePanel = new JPanel();
362
+        treePanel = new cGridBag();
353363         treePanel.setName("Tree");
354
-        ctrlPanel = new JPanel(); // new GridBagLayout());
364
+        ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355365         ctrlPanel.setName("Edit");
356
-        materialPanel = new JPanel();
366
+        materialPanel = new cGridBag().setVertical(true);
357367         materialPanel.setName("Material");
358368         /*JTextPane*/
359369         infoarea = createTextPane();
370
+        doc = infoarea.getStyledDocument();
371
+
360372         infoarea.setEditable(true);
361373         SetText();
362374 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363375 //            infoarea.setOpaque(false);
364376 //            //infoarea.setForeground(textcolor);
365
-            infoarea.setLineWrap(true);
366
-            infoarea.setWrapStyleWord(true);
377
+// TEXTAREA           infoarea.setLineWrap(true);
378
+// TEXTAREA           infoarea.setWrapStyleWord(true);
367379         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368380         infoPanel.setPreferredSize(new Dimension(50, 200));
369381         infoPanel.setName("Info");
....@@ -374,16 +386,16 @@
374386         mainPanel.setName("Main");
375387         mainPanel.setContinuousLayout(true);
376388         mainPanel.setOneTouchExpandable(true);
377
-        mainPanel.setDividerLocation(1.0);
378389         mainPanel.setDividerSize(9);
379
-        mainPanel.setResizeWeight(0);
390
+        mainPanel.setDividerLocation(0.5); //1.0);
391
+        mainPanel.setResizeWeight(0.5);
380392 
381393         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382394         //mainPanel.setLayout(new GridBagLayout());
383395         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384
-        treePanel.setLayout(new GridBagLayout());
385
-        ctrlPanel.setLayout(new GridBagLayout());
386
-        materialPanel.setLayout(new GridBagLayout());
396
+//        treePanel.setLayout(new GridBagLayout());
397
+        //ctrlPanel.setLayout(new GridBagLayout());
398
+        //materialPanel.setLayout(new GridBagLayout());
387399 
388400         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389401                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -422,7 +434,7 @@
422434     static String newline = "\n";
423435     protected static final String buttonString = "JButton";
424436     StyledDocument doc;
425
-    JTextArea infoarea;
437
+    JTextPane infoarea;
426438 
427439     void ClearInfo()
428440     {
....@@ -489,7 +501,10 @@
489501                 }
490502 
491503         if (full)
492
-            si.SendInfo("    BBox: " + minima + " - " + maxima, "regular");
504
+        {
505
+            si.SendInfo("    BBox min: " + minima, "regular");
506
+            si.SendInfo("    BBox max: " + maxima, "regular");
507
+        }
493508         
494509                 if (sel.bRep != null)
495510                 {
....@@ -587,6 +602,9 @@
587602             {
588603                 CameraPane.pointflow = (PointFlow) sel;
589604             }
605
+            
606
+            si.SendInfo("_____________________", "regular");
607
+            si.SendInfo("", "regular");
590608         }
591609     }
592610 
....@@ -618,52 +636,52 @@
618636                 cameraView.ToggleFullScreen();
619637         }
620638 
621
-    private JTextArea createTextPane()
639
+    private JTextPane createTextPane()
622640     {
623
-        String[] initString =
624
-        {
625
-            "This is an editable JTextPane, ", //regular
626
-            "another ", //italic
627
-            "styled ", //bold
628
-            "text ", //small
629
-            "component, ", //large
630
-            "which supports embedded components..." + newline,//regular
631
-            " " + newline, //button
632
-            "...and embedded icons..." + newline, //regular
633
-            " ", //icon
634
-            newline + "JTextPane is a subclass of JEditorPane that "
635
-            + "uses a StyledEditorKit and StyledDocument, and provides "
636
-            + "cover methods for interacting with those objects."
637
-        };
641
+// TEXTAREA       String[] initString =
642
+//        {
643
+//            "This is an editable JTextPane, ", //regular
644
+//            "another ", //italic
645
+//            "styled ", //bold
646
+//            "text ", //small
647
+//            "component, ", //large
648
+//            "which supports embedded components..." + newline,//regular
649
+//            " " + newline, //button
650
+//            "...and embedded icons..." + newline, //regular
651
+//            " ", //icon
652
+//            newline + "JTextPane is a subclass of JEditorPane that "
653
+//            + "uses a StyledEditorKit and StyledDocument, and provides "
654
+//            + "cover methods for interacting with those objects."
655
+//        };
656
+//
657
+//        String[] initStyles =
658
+//        {
659
+//            "regular", "italic", "bold", "small", "large",
660
+//            "regular", "button", "regular", "icon",
661
+//            "regular"
662
+//        };
663
+//
664
+//        JTextPane textPane = new JTextPane();
665
+//        textPane.setEditable(true);
666
+//        /*StyledDocument*/ doc = textPane.getStyledDocument();
667
+//        addStylesToDocument(doc);
668
+//
669
+//        try
670
+//        {
671
+//            for (int j = 0; j < 2; j++)
672
+//            {
673
+//                for (int i = 0; i < initString.length; i++)
674
+//                {
675
+//                    doc.insertString(doc.getLength(), initString[i],
676
+//                            doc.getStyle(initStyles[i]));
677
+//                }
678
+//            }
679
+//        } catch (BadLocationException ble)
680
+//        {
681
+//            System.err.println("Couldn't insert initial text into text pane.");
682
+//        }
638683 
639
-        String[] initStyles =
640
-        {
641
-            "regular", "italic", "bold", "small", "large",
642
-            "regular", "button", "regular", "icon",
643
-            "regular"
644
-        };
645
-
646
-        JTextPane textPane = new JTextPane();
647
-        textPane.setEditable(true);
648
-        /*StyledDocument*/ doc = textPane.getStyledDocument();
649
-        addStylesToDocument(doc);
650
-
651
-        try
652
-        {
653
-            for (int j = 0; j < 2; j++)
654
-            {
655
-                for (int i = 0; i < initString.length; i++)
656
-                {
657
-                    doc.insertString(doc.getLength(), initString[i],
658
-                            doc.getStyle(initStyles[i]));
659
-                }
660
-            }
661
-        } catch (BadLocationException ble)
662
-        {
663
-            System.err.println("Couldn't insert initial text into text pane.");
664
-        }
665
-
666
-        return new JTextArea(); // textPane;
684
+        return new JTextPane(); // textPane;
667685     }
668686 
669687     protected void addStylesToDocument(StyledDocument doc)
....@@ -763,115 +781,83 @@
763781     JButton slowerButton;
764782     JButton fasterButton;
765783     JButton remarkButton;
784
+    
785
+    cGridBag namePanel;
786
+    cGridBag setupPanel;
787
+    cGridBag commandsPanel;
788
+    cGridBag pushPanel;
789
+    cGridBag fillPanel;
766790 
767
-    JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
791
+    JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768792     {
769793         JCheckBox cb;
770794 
771
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772
-        oe.aConstraints.gridwidth = 1; // 3;
773
-//        oe.aConstraints.weightx = 1;
774
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
775
-        oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
795
+        panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776796         cb.addItemListener(this);
777
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
778
-        oe.aConstraints.gridwidth = 1;
779
-        oe.aConstraints.gridx += 1;
780797 
781798         return cb;
782799     }
783800 
784
-    cButton AddButton(ObjEditor oe, String label)
801
+    cButton AddButton(cGridBag panel, String label)
785802     {
786803         cButton cb;
787804 
788
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789
-        oe.aConstraints.gridwidth = 1;
790
-//        oe.aConstraints.weightx = 1;
791
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
792
-        oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
805
+        panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793806         cb.addActionListener(this);
794
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
795
-        oe.aConstraints.gridwidth = 1;
796
-        oe.aConstraints.gridx += 1;
797807 
798808         return cb;
799809     }
800810 
801
-    JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
811
+    JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802812     {
803813         JComboBox combo;
804814 
805
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806
-        oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807
-        oe.aConstraints.gridx += 1;
815
+        panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808816         combo.addActionListener(this);
809817 
810818         return combo;
811819     }
812820 
813
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
821
+    cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814822     {
815
-        NumberSlider combo;
823
+        cGridBag control = new cGridBag();
824
+            
825
+        cNumberSlider combo;
816826 
817827         JLabel jlabel = new JLabel(label);
818
-
819
-        aConstraints.fill = GridBagConstraints.VERTICAL;
820828         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821
-        aConstraints.gridwidth = 1;
822
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823
-        aConstraints.gridx += 1;
824
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
825
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827
-        aConstraints.gridx += 1;
828
-        aConstraints.gridwidth = 1;
829
-
829
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830831         combo.setFloat(current);
831
-
832
-        combo.label = jlabel;
833
-
834
-        combo.addChangeListener(this);
835
-
836
-        return combo;
832
+        
833
+        panel.add(control);
834
+        
835
+        return control;
837836     }
838837 
839
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
838
+    cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840839     {
841
-        NumberSlider combo;
840
+        cGridBag control = new cGridBag();
841
+        
842
+        cNumberSlider combo;
842843 
843844         JLabel jlabel = new JLabel(label);
844
-
845
-        aConstraints.fill = GridBagConstraints.VERTICAL;
846845         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847
-        aConstraints.gridwidth = 2;
848
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849
-        aConstraints.gridx += 1;
850
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
851
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853
-        aConstraints.gridx += 1;
854
-        aConstraints.gridwidth = 1;
855
-
846
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
847
+        control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856848         combo.setInteger(current);
857849 
858
-        combo.label = jlabel;
859
-
860
-        combo.addChangeListener(this);
861
-
862
-        return combo;
850
+        panel.add(control);
851
+        
852
+        return control;
863853     }
864854 
865
-    JTextArea AddText(JPanel ctrlPanel, String name)
855
+    JTextArea AddText(cGridBag ctrlPanel, String name)
866856     {
867857         JTextArea text;
868858 
869
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
870
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
859
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872860         text.addCaretListener(this);
873
-        aConstraints.gridx += 1;
874
-        aConstraints.gridwidth = 1;
875861 
876862         return text;
877863     }
....@@ -901,9 +887,16 @@
901887         objEditor.ctrlPanel.remove(j);
902888     }
903889 
890
+    void Remove(cNumberSlider j)
891
+    {
892
+        j.removeChangeListener(this);
893
+        //objEditor.ctrlPanel.remove(j.label);
894
+        objEditor.ctrlPanel.remove(j);
895
+    }
896
+
904897     /*
905898      */
906
-    void Return() // ObjEditor oe)
899
+    void Return0() // ObjEditor oe)
907900     {
908901         aConstraints.gridy += 1;
909902         aConstraints.gridx = 0;
....@@ -962,33 +955,52 @@
962955 //            oe.aConstraints.weighty = 0;
963956 //            oe.aConstraints.gridx = 0;
964957 //            oe.aConstraints.gridy = 0;
965
-        SetupName(oe);
958
+        //SetupName(oe);
959
+        
960
+            namePanel = new cGridBag();
961
+            
962
+        nameField = AddText(namePanel, copy.GetName());
963
+        namePanel.add(nameField);
964
+        oe.ctrlPanel.add(namePanel);
965
+        
966
+        oe.ctrlPanel.Return();
966967         
967968         if (!GroupEditor.allparams)
968969             return;
969970 
970
-        liveCB = AddCheckBox(oe, "Live", copy.live);
971
-        link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972
-        hideCB = AddCheckBox(oe, "Hide", copy.hide);
971
+            setupPanel = new cGridBag().setVertical(false);
972
+            
973
+        liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974
+        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973976 //            Return();
974
-        markCB = AddCheckBox(oe, "Mark", copy.marked);
975
-        rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976
-        randomCB = AddCheckBox(oe, "Rand", copy.random);
977
-        Return();
978
-        resetButton = AddButton(oe, "Reset");
979
-        stepButton = AddButton(oe, "Step");
977
+        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978
+        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979
+        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
980
+
981
+        oe.ctrlPanel.add(setupPanel);
982
+        oe.ctrlPanel.Return();
983
+        
984
+            commandsPanel = new cGridBag().setVertical(false);
985
+        
986
+        resetButton = AddButton(commandsPanel, "Reset");
987
+        stepButton = AddButton(commandsPanel, "Step");
980988 //            resetAllButton = AddButton(oe, "Reset All");
981989 //            stepAllButton = AddButton(oe, "Step All");
982
-        speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
990
+        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983991 //            Return();
984
-        slowerButton = AddButton(oe, "Slow");
985
-        fasterButton = AddButton(oe, "Fast");
986
-        remarkButton = AddButton(oe, "Rem");
992
+        slowerButton = AddButton(commandsPanel, "Slow");
993
+        fasterButton = AddButton(commandsPanel, "Fast");
994
+        remarkButton = AddButton(commandsPanel, "Remark");
987995 
988
-        Return();
996
+        oe.ctrlPanel.add(commandsPanel);
997
+        oe.ctrlPanel.Return();
989998 
990
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991
-    Return();
999
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1000
+    normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001
+    //Return();
1002
+
1003
+        oe.ctrlPanel.Return();
9921004             
9931005 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9941006 //        ObjEditor.aConstraints.gridx += 1;
....@@ -1083,7 +1095,7 @@
10831095         oe.aConstraints.gridwidth = 1;
10841096         /**/
10851097         nameField = AddText(oe.ctrlPanel, copy.GetName());
1086
-        Return();
1098
+        oe.ctrlPanel.Return();
10871099 
10881100         //ctrlPanel.add(textureButton = new Button("Texture..."));
10891101         //textureButton.setEnabled(false);
....@@ -1185,10 +1197,18 @@
11851197         //JPanel worldPanel =
11861198         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11871199         //worldPanel.setName("World");
1188
-	centralPanel = new JPanel(new BorderLayout());
1200
+	centralPanel = new cGridBag();
1201
+        centralPanel.preferredWidth = 20;
11891202 	timelinePanel = new JPanel(new BorderLayout());
11901203         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11911204 
1205
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206
+        cameraPanel.setContinuousLayout(true);
1207
+        cameraPanel.setOneTouchExpandable(true);
1208
+//        cameraPanel.setDividerLocation(0.9);
1209
+//        cameraPanel.setDividerSize(9);
1210
+        cameraPanel.setResizeWeight(1.0);
1211
+        
11921212         centralPanel.add(cameraView);
11931213         //frame.setJMenuBar(timelineMenubar);
11941214         //centralPanel.add(timelinePanel);
....@@ -1208,12 +1228,13 @@
12081228         //frontView.object = copy;
12091229         //sideView.object = copy;
12101230 
1211
-        XYZPanel = new JPanel();
1212
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1231
+        XYZPanel = new cGridBag().setVertical(true);
1232
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12131233 
1214
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1215
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1216
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1234
+        XYZPanel.preferredWidth = 5;
1235
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1236
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1237
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
12171238 
12181239         /*
12191240         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1251,10 +1272,11 @@
12511272         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12521273         //tmp.setName("Edit");
12531274         objectPanel.add(materialPanel);
1254
-        JPanel north = new JPanel(new BorderLayout());
1255
-        north.setName("Edit");
1256
-        north.add(ctrlPanel, BorderLayout.NORTH);
1257
-        objectPanel.add(north);
1275
+//        JPanel north = new JPanel(new BorderLayout());
1276
+//        north.setName("Edit");
1277
+//        north.add(ctrlPanel, BorderLayout.NORTH);
1278
+//        objectPanel.add(north);
1279
+        objectPanel.add(ctrlPanel);
12581280         objectPanel.add(infoPanel);
12591281 
12601282         /*
....@@ -1275,16 +1297,23 @@
12751297         scrollpane.setWheelScrollingEnabled(true);
12761298         scrollpane.addMouseWheelListener(this); // Default not fast enough
12771299 
1278
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1279
-        scenePanel.add(scrollpane);
1300
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1301
+        scenePanel.preferredWidth = 7;
1302
+        
1303
+        JTabbedPane tabbedPane = new JTabbedPane();
1304
+        tabbedPane.add(scrollpane);
12801305 
1281
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1306
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12821307 
1283
-        optionsPanel = new JPanel(new GridBagLayout());
1308
+        optionsPanel = new cGridBag().setVertical(true);
12841309 
12851310         optionsPanel.setName("Options");
1286
-        scenePanel.add(optionsPanel);
1287
-
1311
+        
1312
+        AddOptions(optionsPanel); //, aConstraints);
1313
+        
1314
+        tabbedPane.add(optionsPanel);
1315
+        
1316
+        scenePanel.add(tabbedPane);
12881317 
12891318         /*
12901319         cTree jTree = new cTree(null);
....@@ -1318,6 +1347,7 @@
13181347         //bigPanel.setSize(new Dimension(10,10));
13191348         //bigPanel.add(ctrlPanel);
13201349         //bigPanel.add(gridPanel);
1350
+        /**
13211351         bigThree = new JPanel();
13221352         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13231353         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1341,7 +1371,13 @@
13411371         //	aConstraints.gridheight = 3;
13421372         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13431373         bigThree.add(XYZPanel, aWindowConstraints);
1374
+        /**/
13441375 
1376
+        bigThree = new cGridBag();
1377
+        bigThree.addComponent(scenePanel);
1378
+        bigThree.addComponent(centralPanel);
1379
+        bigThree.addComponent(XYZPanel);
1380
+        
13451381 //                // SIDE EFFECT!!!
13461382 //		aConstraints.gridx = 0;
13471383 //		aConstraints.gridy = 0;
....@@ -1362,7 +1398,8 @@
13621398         //worldPane.add(bigPanel);
13631399         //worldPane.add(worldPanel);
13641400                 /**/
1365
-        frame.getContentPane().add(/*"Center",*/framePanel);
1401
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1402
+        frame.add(/*"Center",*/framePanel);
13661403         //frame.getContentPane().add(/*"Center",*/ worldPane);
13671404 
13681405 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1383,6 +1420,10 @@
13831420         });
13841421     }
13851422 
1423
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1424
+    {
1425
+    }
1426
+    
13861427     JTree GetTree()
13871428     {
13881429         return objEditor.jTree;
....@@ -1394,260 +1435,170 @@
13941435         ctrlPanel.removeAll();
13951436     }
13961437 
1397
-    void SetupMaterial(JPanel ctrlPanel)
1438
+    void SetupMaterial(cGridBag panel)
13981439     {
1399
-        aConstraints.weighty = 0;
1400
-        //aConstraints.weightx = 1;
1401
-                /*
1440
+         /*
14021441         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14031442         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405
-        aConstraints.gridx += 1;
14061443          */
14071444 
1408
-        aConstraints.gridwidth = 1;
1409
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410
-        aConstraints.gridx += 1;
1411
-        aConstraints.weighty = 0;
1412
-        aConstraints.gridwidth = 1;
1445
+        cGridBag editBar = new cGridBag().setVertical(false);
1446
+            
1447
+        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1448
+                createMaterialButton.setToolTipText("Create material");
14131449 
14141450         /*
14151451         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416
-        aConstraints.gridx += 1;
1417
-        aConstraints.weighty = 0;
1418
-        aConstraints.gridwidth = 1;
14191452          */
14201453 
1421
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422
-        aConstraints.gridx += 1;
1454
+        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455
+                clearMaterialButton.setToolTipText("Clear material");
1456
+        
1457
+        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458
+        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459
+        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14231460 
1424
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425
-
1426
-        aConstraints.gridx += 1;
1427
-
1428
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429
-
1430
-        aConstraints.gridx += 1;
1431
-
1432
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433
-
1434
-        aConstraints.gridx = 0;
1435
-        aConstraints.gridy += 1;
1436
-        aConstraints.weighty = 0;
1437
-        aConstraints.gridwidth = 1;
1461
+        editBar.preferredHeight = 15;
1462
+        
1463
+        panel.add(editBar);
1464
+        
14381465         /**/
14391466         //aConstraints.weighty = 0;
14401467         ////aConstraints.weightx = 1;
14411468         //aConstraints.weighty = 1;
14421469         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14431470         //aConstraints.gridx += 1;
1444
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445
-        aConstraints.weighty = 0;
1446
-        aConstraints.gridx = 0;
1447
-        aConstraints.gridy += 1;
1448
-        aConstraints.gridwidth = 1;
1471
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14491472 
1450
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453
-        aConstraints.gridx += 1;
1454
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
-        //aConstraints.weightx = 0;
1456
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457
-        aConstraints.gridx = 0;
1458
-        aConstraints.gridy += 1;
1459
-        aConstraints.gridwidth = 1;
1473
+        cGridBag colorSection = new cGridBag().setVertical(true);
1474
+        
1475
+        cGridBag color = new cGridBag();
1476
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1477
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479
+        //colorField.preferredWidth = 200;
1480
+        colorSection.add(color);
14601481 
1461
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464
-        aConstraints.gridx += 1;
1465
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
-        aConstraints.gridx = 0;
1468
-        aConstraints.gridy += 1;
1469
-        aConstraints.gridwidth = 1;
1482
+        cGridBag modulation = new cGridBag();
1483
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1484
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486
+        colorSection.add(modulation);
14701487 
1471
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
-        aConstraints.gridx += 1;
1475
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
-        aConstraints.gridx = 0;
1478
-        aConstraints.gridy += 1;
1479
-        aConstraints.gridwidth = 1;
1488
+        cGridBag texture = new cGridBag();
1489
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1490
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492
+        colorSection.add(texture);
14801493 
1481
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
-        aConstraints.gridx += 1;
1485
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
-        aConstraints.gridx = 0;
1488
-        aConstraints.gridy += 1;
1489
-        aConstraints.gridwidth = 1;
1494
+        cGridBag anisoU = new cGridBag();
1495
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1496
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1498
+        colorSection.add(anisoU);
14901499 
1491
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
-        aConstraints.gridx += 1;
1495
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
-        aConstraints.gridx = 0;
1498
-        aConstraints.gridy += 1;
1499
-        aConstraints.gridwidth = 1;
1500
+        cGridBag anisoV = new cGridBag();
1501
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1502
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1504
+        colorSection.add(anisoV);
15001505 
1501
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
-        aConstraints.gridx += 1;
1505
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507
-        aConstraints.gridx = 0;
1508
-        aConstraints.gridy += 1;
1509
-        aConstraints.gridwidth = 1;
1506
+        cGridBag shadowbias = new cGridBag();
1507
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1508
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1510
+        colorSection.add(shadowbias);
15101511 
1511
-        //aConstraints.weighty = 1;
1512
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513
-        //aConstraints.gridx += 1;
1514
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515
-        aConstraints.weighty = 0;
1516
-        aConstraints.gridx = 0;
1517
-        aConstraints.gridy += 1;
1518
-        aConstraints.gridwidth = 1;
1512
+        panel.add(new JSeparator());
1513
+        
1514
+        panel.add(colorSection);
1515
+        
1516
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1517
+        
1518
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1519
+        
1520
+        cGridBag diffuse = new cGridBag();
1521
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1522
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1524
+        diffuseSection.add(diffuse);
15191525 
1520
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523
-        aConstraints.gridx += 1;
1524
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526
-        aConstraints.gridx = 0;
1527
-        aConstraints.gridy += 1;
1528
-        aConstraints.gridwidth = 1;
1526
+        cGridBag diffuseness = new cGridBag();
1527
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1528
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1530
+        diffuseSection.add(diffuseness);
15291531 
1530
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
-        aConstraints.gridx += 1;
1534
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
-        aConstraints.gridx = 0;
1537
-        aConstraints.gridy += 1;
1538
-        aConstraints.gridwidth = 1;
1532
+        cGridBag selfshadow = new cGridBag();
1533
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1534
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1536
+        diffuseSection.add(selfshadow);
15391537 
1540
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
-        aConstraints.gridx += 1;
1544
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
-        aConstraints.gridx = 0;
1547
-        aConstraints.gridy += 1;
1548
-        aConstraints.gridwidth = 1;
1538
+        cGridBag sheen = new cGridBag();
1539
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1540
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
+        diffuseSection.add(sheen);
15491543 
1550
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
-        aConstraints.gridx += 1;
1554
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
-        aConstraints.gridx = 0;
1557
-        aConstraints.gridy += 1;
1558
-        aConstraints.gridwidth = 1;
1544
+        cGridBag subsurface = new cGridBag();
1545
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1546
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1548
+        diffuseSection.add(subsurface);
15591549 
1560
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
-        aConstraints.gridx += 1;
1564
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566
-        aConstraints.gridx = 0;
1567
-        aConstraints.gridy += 1;
1568
-        aConstraints.gridwidth = 1;
1550
+        cGridBag shadow = new cGridBag();
1551
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1552
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1553
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1554
+        diffuseSection.add(shadow);
15691555 
1570
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
-        aConstraints.gridx += 1;
1574
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576
-        aConstraints.gridx = 0;
1577
-        aConstraints.gridy += 1;
1578
-        aConstraints.gridwidth = 1;
1556
+        cGridBag fakedepth = new cGridBag();
1557
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1558
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1560
+        diffuseSection.add(fakedepth);
15791561 
1580
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
-        aConstraints.gridx += 1;
1584
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
-        aConstraints.gridx = 0;
1587
-        aConstraints.gridy += 1;
1588
-        aConstraints.gridwidth = 1;
1562
+        panel.add(new JSeparator());
1563
+        
1564
+        panel.add(diffuseSection);
1565
+        
1566
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1567
+        
1568
+        cGridBag specularSection = new cGridBag().setVertical(true);
15891569 
1590
-        //aConstraints.weighty = 1;
1591
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592
-        //aConstraints.gridx += 1;
1593
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594
-        aConstraints.weighty = 0;
1595
-        aConstraints.gridx = 0;
1596
-        aConstraints.gridy += 1;
1597
-        aConstraints.gridwidth = 1;
1570
+        cGridBag specular = new cGridBag();
1571
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1572
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1573
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1574
+        specularSection.add(specular);
15981575 
1599
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602
-        aConstraints.gridx += 1;
1603
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605
-        aConstraints.gridx = 0;
1606
-        aConstraints.gridy += 1;
1607
-        aConstraints.gridwidth = 1;
1576
+        cGridBag lightarea = new cGridBag();
1577
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1578
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1580
+        specularSection.add(lightarea);
16081581 
1609
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
-        aConstraints.gridx += 1;
1613
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
-        aConstraints.gridx = 0;
1616
-        aConstraints.gridy += 1;
1617
-        aConstraints.gridwidth = 1;
1582
+        cGridBag shininess = new cGridBag();
1583
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1584
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1585
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1586
+        specularSection.add(shininess);
16181587 
1619
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
-        aConstraints.gridx += 1;
1623
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
-        aConstraints.gridx = 0;
1626
-        aConstraints.gridy += 1;
1627
-        aConstraints.gridwidth = 1;
1588
+        cGridBag metalness = new cGridBag();
1589
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1590
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1592
+        specularSection.add(metalness);
16281593 
1629
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
-        aConstraints.gridx += 1;
1633
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635
-        aConstraints.gridx = 0;
1636
-        aConstraints.gridy += 1;
1637
-        aConstraints.gridwidth = 1;
1594
+        cGridBag velvet = new cGridBag();
1595
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1596
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598
+        specularSection.add(velvet);
16381599 
1639
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
-        aConstraints.gridx += 1;
1643
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645
-        aConstraints.gridx = 0;
1646
-        aConstraints.gridy += 1;
1647
-        aConstraints.gridwidth = 1;
1648
-
1649
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650
-        Return();
1600
+        shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1601
+        //Return();
16511602 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16521603 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16531604 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1658,130 +1609,93 @@
16581609 //		aConstraints.gridy += 1;
16591610 //		aConstraints.gridwidth = 1;
16601611 
1661
-        //aConstraints.weighty = 1;
1662
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663
-        //aConstraints.gridx += 1;
1664
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665
-        aConstraints.weighty = 0;
1666
-        aConstraints.gridx = 0;
1667
-        aConstraints.gridy += 1;
1668
-        aConstraints.gridwidth = 1;
16691612 
1670
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673
-        aConstraints.gridx += 1;
1674
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676
-        aConstraints.gridx = 0;
1677
-        aConstraints.gridy += 1;
1678
-        aConstraints.gridwidth = 1;
1613
+        panel.add(new JSeparator());
1614
+        
1615
+        panel.add(specularSection);
1616
+        
1617
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1618
+        
1619
+        cGridBag globalSection = new cGridBag().setVertical(true);
16791620 
1680
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
-        aConstraints.gridx += 1;
1684
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
-        aConstraints.gridx = 0;
1687
-        aConstraints.gridy += 1;
1688
-        aConstraints.gridwidth = 1;
1621
+        cGridBag camera = new cGridBag();
1622
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1623
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
+        globalSection.add(camera);
16891626 
1690
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
-        aConstraints.gridx += 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
-        aConstraints.gridx = 0;
1697
-        aConstraints.gridy += 1;
1698
-        aConstraints.gridwidth = 1;
1627
+        cGridBag ambient = new cGridBag();
1628
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1629
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1631
+        globalSection.add(ambient);
16991632 
1700
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
-        aConstraints.gridx += 1;
1704
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706
-        aConstraints.gridx = 0;
1707
-        aConstraints.gridy += 1;
1708
-        aConstraints.gridwidth = 1;
1709
-        aConstraints.weighty = 0;
1633
+        cGridBag backlit = new cGridBag();
1634
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1635
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1636
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1637
+        globalSection.add(backlit);
17101638 
1711
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714
-        aConstraints.gridx += 1;
1715
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717
-        aConstraints.gridx = 0;
1718
-        aConstraints.gridy += 1;
1719
-        aConstraints.gridwidth = 1;
1639
+        cGridBag opacity = new cGridBag();
1640
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1641
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1643
+        globalSection.add(opacity);
17201644 
1721
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
-        aConstraints.gridx += 1;
1725
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1727
-        aConstraints.gridx = 0;
1728
-        aConstraints.gridy += 1;
1729
-        aConstraints.gridwidth = 1;
1645
+        panel.add(new JSeparator());
1646
+        
1647
+        panel.add(globalSection);
1648
+        
1649
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1650
+        
1651
+        cGridBag textureSection = new cGridBag().setVertical(true);
17301652 
1731
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
-        aConstraints.gridx += 1;
1735
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737
-        aConstraints.gridx = 0;
1738
-        aConstraints.gridy += 1;
1739
-        aConstraints.gridwidth = 1;
1653
+        cGridBag bump = new cGridBag();
1654
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1655
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1657
+        textureSection.add(bump);
17401658 
1741
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
-        aConstraints.gridx += 1;
1745
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747
-        aConstraints.gridx = 0;
1748
-        aConstraints.gridy += 1;
1749
-        aConstraints.gridwidth = 1;
1659
+        cGridBag noise = new cGridBag();
1660
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1661
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1663
+        textureSection.add(noise);
17501664 
1751
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
-        aConstraints.gridx += 1;
1755
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757
-        aConstraints.gridx = 0;
1758
-        aConstraints.gridy += 1;
1759
-        aConstraints.gridwidth = 1;
1665
+        cGridBag power = new cGridBag();
1666
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1667
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1669
+        textureSection.add(power);
17601670 
1761
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
-        aConstraints.gridx += 1;
1765
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1767
-        aConstraints.gridx = 0;
1768
-        aConstraints.gridy += 1;
1769
-        aConstraints.gridwidth = 1;
1671
+        cGridBag borderfade = new cGridBag();
1672
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1673
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1675
+        textureSection.add(borderfade);
17701676 
1771
-        //aConstraints.weighty = 1;
1772
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773
-        //aConstraints.gridx += 1;
1774
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775
-        aConstraints.weighty = 0;
1677
+        cGridBag fog = new cGridBag();
1678
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1679
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1681
+        textureSection.add(fog);
17761682 
1777
-        aConstraints.gridx = 0;
1778
-        aConstraints.gridy = 0;
1779
-        aConstraints.gridwidth = 1;
1683
+        cGridBag opacityPower = new cGridBag();
1684
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1685
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1687
+        textureSection.add(opacityPower);
1688
+
1689
+        panel.add(new JSeparator());
1690
+        
1691
+        panel.add(textureSection);
1692
+        
1693
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17801694 
17811695         SetMaterial(copy); // .GetMaterial());
17821696 
1783
-        colorField.addChangeListener(this);
1784
-        modulationField.addChangeListener(this);
1697
+        //colorField.addChangeListener(this);
1698
+//        modulationField.addChangeListener(this);
17851699         metalnessField.addChangeListener(this);
17861700         diffuseField.addChangeListener(this);
17871701         specularField.addChangeListener(this);
....@@ -2593,6 +2507,7 @@
25932507                 }
25942508                 if (input == null)
25952509                 {
2510
+                new Exception().printStackTrace();
25962511                     System.exit(0);
25972512                 }
25982513 
....@@ -2996,7 +2911,8 @@
29962911             if (timeline)
29972912             {
29982913                 centralPanel.remove(cameraView);
2999
-                centralPanel.add(timelinePanel);
2914
+                cameraPanel.add(cameraView);
2915
+                centralPanel.add(cameraPanel);
30002916                 frame.setJMenuBar(timelineMenubar);
30012917                 wasFullScreen = CameraPane.FULLSCREEN;
30022918                 if (!CameraPane.FULLSCREEN)
....@@ -3005,7 +2921,7 @@
30052921             }
30062922             else
30072923             {
3008
-                centralPanel.remove(timelinePanel);
2924
+                centralPanel.remove(cameraPanel);
30092925                 centralPanel.add(cameraView);
30102926                 frame.setJMenuBar(null);
30112927                 if (!wasFullScreen)
....@@ -3128,7 +3044,8 @@
31283044             objEditor.refreshContents();
31293045         } else if (event.getSource() == stepItem)
31303046         {
3131
-            cameraView.ONESTEP = true;
3047
+            //cameraView.ONESTEP = true;
3048
+            Globals.ONESTEP = true;
31323049             cameraView.repaint();
31333050             return;
31343051         } else if (event.getSource() == stepButton)
....@@ -3285,25 +3202,25 @@
32853202 
32863203     void ToggleAnimation()
32873204     {
3288
-        if (!CameraPane.ANIMATION)
3205
+        if (!Globals.ANIMATION)
32893206         {
32903207             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32913208             browser.show();
32923209             String filename = browser.getFile();
32933210             if (filename != null && filename.length() > 0)
32943211             {
3295
-                CameraPane.filename = browser.getDirectory() + filename;
3212
+                Globals.filename = browser.getDirectory() + filename;
32963213                 //CameraPane.framecount = 0;
3297
-                CameraPane.imagecount = 0;
3214
+                Globals.imagecount = 0;
32983215 
3299
-                CameraPane.ANIMATION ^= true;
3216
+                Globals.ANIMATION ^= true;
33003217 
33013218                 GrafreeD.wav.cursor = 0;
33023219                 GrafreeD.wav.loop = 0;
33033220             }
33043221         } else
33053222         {
3306
-            CameraPane.ANIMATION ^= true;
3223
+            Globals.ANIMATION ^= true;
33073224         }
33083225     }
33093226 
....@@ -3320,6 +3237,7 @@
33203237             callee.refreshContents();
33213238         } else
33223239         {
3240
+                new Exception().printStackTrace();
33233241             System.exit(0);
33243242         }
33253243     }
....@@ -3482,7 +3400,7 @@
34823400             current.fakedepth = (float) fakedepthField.getFloat();
34833401             current.shadowbias = (float) shadowbiasField.getFloat();
34843402 
3485
-            if (!NumberSlider.frozen)
3403
+            if (!cNumberSlider.frozen)
34863404             {
34873405                 //System.out.println("Propagate = " + propagate);
34883406                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3530,6 +3448,7 @@
35303448                 || e.getSource() == apertureField
35313449                 || e.getSource() == shadowblurField)
35323450         {
3451
+                new Exception().printStackTrace();
35333452             System.exit(0);
35343453             cameraView.options1[0] = (float) focusField.getFloat() * 10;
35353454             cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3855,7 +3774,7 @@
38553774 
38563775             radioPanel.revalidate();
38573776             radioPanel.repaint();
3858
-            ctrlPanel.revalidate(); // ? new
3777
+            ctrlPanel.validate(); // ? new
38593778             ctrlPanel.repaint();
38603779         }
38613780     }
....@@ -4501,8 +4420,8 @@
45014420     //MenuItem normalLensItem;
45024421     MenuItem editCameraItem;
45034422     MenuItem revertCameraItem;
4504
-    CheckboxMenuItem toggleLiveItem;
45054423     MenuItem stepItem;
4424
+    CheckboxMenuItem toggleLiveItem;
45064425     CheckboxMenuItem toggleFullScreenItem;
45074426     CheckboxMenuItem toggleTimelineItem;
45084427     CheckboxMenuItem toggleRenderItem;
....@@ -4519,20 +4438,21 @@
45194438     JSplitPane mainPanel;
45204439     JScrollPane scrollpane;
45214440     JPanel toolbarPanel;
4522
-    JPanel treePanel;
4441
+    cGridBag treePanel;
45234442     JPanel radioPanel;
45244443     ButtonGroup buttonGroup;
4525
-    JPanel ctrlPanel;
4526
-    JPanel materialPanel;
4444
+    cGridBag ctrlPanel;
4445
+    cGridBag materialPanel;
45274446     JScrollPane infoPanel;
4528
-    JPanel optionsPanel;
4447
+    cGridBag optionsPanel;
45294448     JTabbedPane objectPanel;
4530
-    JPanel XYZPanel;
4449
+    cGridBag XYZPanel;
45314450     JSplitPane gridPanel;
45324451     JSplitPane bigPanel;
4533
-    JPanel bigThree;
4534
-    JTabbedPane scenePanel;
4535
-    JPanel centralPanel;
4452
+    cGridBag bigThree;
4453
+    cGridBag scenePanel;
4454
+    cGridBag centralPanel;
4455
+    JSplitPane cameraPanel;
45364456     JPanel timelinePanel;
45374457     JMenuBar timelineMenubar;
45384458     JSplitPane framePanel;
....@@ -4584,67 +4504,67 @@
45844504     // MATERIAL
45854505     JLabel materialLabel;
45864506     JLabel colorLabel;
4587
-    NumberSlider colorField;
4507
+    cNumberSlider colorField;
45884508     JLabel modulationLabel;
4589
-    NumberSlider modulationField;
4509
+    cNumberSlider modulationField;
45904510     JLabel metalnessLabel;
4591
-    NumberSlider metalnessField;
4511
+    cNumberSlider metalnessField;
45924512     JLabel diffuseLabel;
4593
-    NumberSlider diffuseField;
4513
+    cNumberSlider diffuseField;
45944514     JLabel specularLabel;
4595
-    NumberSlider specularField;
4515
+    cNumberSlider specularField;
45964516     JLabel shininessLabel;
4597
-    NumberSlider shininessField;
4517
+    cNumberSlider shininessField;
45984518     JLabel shiftLabel;
4599
-    NumberSlider shiftField;
4519
+    cNumberSlider shiftField;
46004520     JLabel ambientLabel;
4601
-    NumberSlider ambientField;
4521
+    cNumberSlider ambientField;
46024522     JLabel lightareaLabel;
4603
-    NumberSlider lightareaField;
4523
+    cNumberSlider lightareaField;
46044524     JLabel diffusenessLabel;
4605
-    NumberSlider diffusenessField;
4525
+    cNumberSlider diffusenessField;
46064526     JLabel velvetLabel;
4607
-    NumberSlider velvetField;
4527
+    cNumberSlider velvetField;
46084528     JLabel sheenLabel;
4609
-    NumberSlider sheenField;
4529
+    cNumberSlider sheenField;
46104530     JLabel subsurfaceLabel;
4611
-    NumberSlider subsurfaceField;
4531
+    cNumberSlider subsurfaceField;
46124532     //JLabel bumpLabel;
46134533     //NumberSlider bumpField;
46144534     JLabel backlitLabel;
4615
-    NumberSlider backlitField;
4535
+    cNumberSlider backlitField;
46164536     JLabel anisoLabel;
4617
-    NumberSlider anisoField;
4537
+    cNumberSlider anisoField;
46184538     JLabel anisoVLabel;
4619
-    NumberSlider anisoVField;
4539
+    cNumberSlider anisoVField;
46204540     JLabel cameraLabel;
4621
-    NumberSlider cameraField;
4541
+    cNumberSlider cameraField;
46224542     JLabel selfshadowLabel;
4623
-    NumberSlider selfshadowField;
4543
+    cNumberSlider selfshadowField;
46244544     JLabel shadowLabel;
4625
-    NumberSlider shadowField;
4545
+    cNumberSlider shadowField;
46264546     JLabel textureLabel;
4627
-    NumberSlider textureField;
4547
+    cNumberSlider textureField;
46284548     JLabel opacityLabel;
4629
-    NumberSlider opacityField;
4549
+    cNumberSlider opacityField;
46304550     JLabel fakedepthLabel;
4631
-    NumberSlider fakedepthField;
4551
+    cNumberSlider fakedepthField;
46324552     JLabel shadowbiasLabel;
4633
-    NumberSlider shadowbiasField;
4553
+    cNumberSlider shadowbiasField;
46344554     JLabel bumpLabel;
4635
-    NumberSlider bumpField;
4555
+    cNumberSlider bumpField;
46364556     JLabel noiseLabel;
4637
-    NumberSlider noiseField;
4557
+    cNumberSlider noiseField;
46384558     JLabel powerLabel;
4639
-    NumberSlider powerField;
4559
+    cNumberSlider powerField;
46404560     JLabel borderfadeLabel;
4641
-    NumberSlider borderfadeField;
4561
+    cNumberSlider borderfadeField;
46424562     JLabel fogLabel;
4643
-    NumberSlider fogField;
4563
+    cNumberSlider fogField;
46444564     JLabel opacityPowerLabel;
4645
-    NumberSlider opacityPowerField;
4565
+    cNumberSlider opacityPowerField;
46464566     JTree jTree;
46474567     //ObjectUI parent;
46484568     
4649
-    NumberSlider normalpushField;
4569
+    cNumberSlider normalpushField;
46504570 }