Nimbus L&F

Normand Briere

2019-05-01 25cef97465f0bfa8959663754e9243006324c81c

 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,
..
..
@@ -31,6 +33,9 @@
31
33
         boolean timeline;
32
34
         boolean wasFullScreen;
33
35
 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
34
39
     // SCRIPT
35
40
     
36
41
     transient JFrame textpanel = null;
..
..
@@ -121,47 +126,52 @@
121
126
     void keyPressed(int key, int modifiers)
122
127
     {
123
128
     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
125
130
     }
126
131
      */
127
132
 
128
133
     static GridBagConstraints aConstraints;
129
134
     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
135
+
132
136
     static int GRIDWIDTH = 100; // 4;
133
137
 
134
138
     public void closeUI()
135
139
     {
136
140
         //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);
139
143
         //nameField.removeActionListener(this);
140
-        objEditor.ctrlPanel.remove(nameField);
144
+//        objEditor.ctrlPanel.remove(nameField);
141
145
         
142
146
         if (!GroupEditor.allparams)
143
147
             return;
144
148
         
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);
163
167
         
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);
165
175
     }
166
176
 
167
177
     public ObjEditor GetEditor()
..
..
@@ -309,7 +319,7 @@
309
319
         toggleTextureItem.setState(CameraPane.textureon);
310
320
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311
321
         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
322
+        toggleLiveItem.setState(Globals.isLIVE());
313
323
         cameraMenu.add(stepItem = new MenuItem("Step"));
314
324
         stepItem.addActionListener(this);
315
325
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -351,9 +361,9 @@
351
361
         toolbarPanel.setName("Toolbar");
352
362
         treePanel = new JPanel();
353
363
         treePanel.setName("Tree");
354
-        ctrlPanel = new JPanel(); // new GridBagLayout());
364
+        ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355
365
         ctrlPanel.setName("Edit");
356
-        materialPanel = new JPanel();
366
+        materialPanel = new cGridBag().setVertical(true);
357
367
         materialPanel.setName("Material");
358
368
         /*JTextPane*/
359
369
         infoarea = createTextPane();
..
..
@@ -382,8 +392,8 @@
382
392
         //mainPanel.setLayout(new GridBagLayout());
383
393
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384
394
         treePanel.setLayout(new GridBagLayout());
385
-        ctrlPanel.setLayout(new GridBagLayout());
386
-        materialPanel.setLayout(new GridBagLayout());
395
+        //ctrlPanel.setLayout(new GridBagLayout());
396
+        //materialPanel.setLayout(new GridBagLayout());
387
397
 
388
398
         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389
399
                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..
..
@@ -763,115 +773,83 @@
763
773
     JButton slowerButton;
764
774
     JButton fasterButton;
765
775
     JButton remarkButton;
776
+    
777
+    cGridBag namePanel;
778
+    cGridBag setupPanel;
779
+    cGridBag commandsPanel;
780
+    cGridBag pushPanel;
781
+    cGridBag fillPanel;
766
782
 
767
-    JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
783
+    JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768
784
     {
769
785
         JCheckBox cb;
770
786
 
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);
787
+        panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776
788
         cb.addItemListener(this);
777
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
778
-        oe.aConstraints.gridwidth = 1;
779
-        oe.aConstraints.gridx += 1;
780
789
 
781
790
         return cb;
782
791
     }
783
792
 
784
-    cButton AddButton(ObjEditor oe, String label)
793
+    cButton AddButton(cGridBag panel, String label)
785
794
     {
786
795
         cButton cb;
787
796
 
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);
797
+        panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793
798
         cb.addActionListener(this);
794
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
795
-        oe.aConstraints.gridwidth = 1;
796
-        oe.aConstraints.gridx += 1;
797
799
 
798
800
         return cb;
799
801
     }
800
802
 
801
-    JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
803
+    JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802
804
     {
803
805
         JComboBox combo;
804
806
 
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;
807
+        panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808
808
         combo.addActionListener(this);
809
809
 
810
810
         return combo;
811
811
     }
812
812
 
813
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
813
+    cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814
814
     {
815
-        NumberSlider combo;
815
+        cGridBag control = new cGridBag();
816
+            
817
+        cNumberSlider combo;
816
818
 
817
819
         JLabel jlabel = new JLabel(label);
818
-
819
-        aConstraints.fill = GridBagConstraints.VERTICAL;
820
820
         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
-
821
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
822
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830
823
         combo.setFloat(current);
831
-
832
-        combo.label = jlabel;
833
-
834
-        combo.addChangeListener(this);
835
-
836
-        return combo;
824
+        
825
+        panel.add(control);
826
+        
827
+        return control;
837
828
     }
838
829
 
839
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
830
+    cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840
831
     {
841
-        NumberSlider combo;
832
+        cGridBag control = new cGridBag();
833
+        
834
+        cNumberSlider combo;
842
835
 
843
836
         JLabel jlabel = new JLabel(label);
844
-
845
-        aConstraints.fill = GridBagConstraints.VERTICAL;
846
837
         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
-
838
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
839
+        control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856
840
         combo.setInteger(current);
857
841
 
858
-        combo.label = jlabel;
859
-
860
-        combo.addChangeListener(this);
861
-
862
-        return combo;
842
+        panel.add(control);
843
+        
844
+        return control;
863
845
     }
864
846
 
865
-    JTextArea AddText(JPanel ctrlPanel, String name)
847
+    JTextArea AddText(cGridBag ctrlPanel, String name)
866
848
     {
867
849
         JTextArea text;
868
850
 
869
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
870
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872
852
         text.addCaretListener(this);
873
-        aConstraints.gridx += 1;
874
-        aConstraints.gridwidth = 1;
875
853
 
876
854
         return text;
877
855
     }
..
..
@@ -901,9 +879,16 @@
901
879
         objEditor.ctrlPanel.remove(j);
902
880
     }
903
881
 
882
+    void Remove(cNumberSlider j)
883
+    {
884
+        j.removeChangeListener(this);
885
+        //objEditor.ctrlPanel.remove(j.label);
886
+        objEditor.ctrlPanel.remove(j);
887
+    }
888
+
904
889
     /*
905
890
      */
906
-    void Return() // ObjEditor oe)
891
+    void Return0() // ObjEditor oe)
907
892
     {
908
893
         aConstraints.gridy += 1;
909
894
         aConstraints.gridx = 0;
..
..
@@ -962,33 +947,52 @@
962
947
 //            oe.aConstraints.weighty = 0;
963
948
 //            oe.aConstraints.gridx = 0;
964
949
 //            oe.aConstraints.gridy = 0;
965
-        SetupName(oe);
950
+        //SetupName(oe);
951
+        
952
+            namePanel = new cGridBag();
953
+            
954
+        nameField = AddText(namePanel, copy.GetName());
955
+        namePanel.add(nameField);
956
+        oe.ctrlPanel.add(namePanel);
957
+        
958
+        oe.ctrlPanel.Return();
966
959
         
967
960
         if (!GroupEditor.allparams)
968
961
             return;
969
962
 
970
-        liveCB = AddCheckBox(oe, "Live", copy.live);
971
-        link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972
-        hideCB = AddCheckBox(oe, "Hide", copy.hide);
963
+            setupPanel = new cGridBag().setVertical(false);
964
+            
965
+        liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966
+        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973
968
 //            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");
969
+        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970
+        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971
+        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
972
+
973
+        oe.ctrlPanel.add(setupPanel);
974
+        oe.ctrlPanel.Return();
975
+        
976
+            commandsPanel = new cGridBag().setVertical(false);
977
+        
978
+        resetButton = AddButton(commandsPanel, "Reset");
979
+        stepButton = AddButton(commandsPanel, "Step");
980
980
 //            resetAllButton = AddButton(oe, "Reset All");
981
981
 //            stepAllButton = AddButton(oe, "Step All");
982
-        speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
982
+        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983
983
 //            Return();
984
-        slowerButton = AddButton(oe, "Slow");
985
-        fasterButton = AddButton(oe, "Fast");
986
-        remarkButton = AddButton(oe, "Rem");
984
+        slowerButton = AddButton(commandsPanel, "Slow");
985
+        fasterButton = AddButton(commandsPanel, "Fast");
986
+        remarkButton = AddButton(commandsPanel, "Remark");
987
987
 
988
-        Return();
988
+        oe.ctrlPanel.add(commandsPanel);
989
+        oe.ctrlPanel.Return();
989
990
 
990
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991
-    Return();
991
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
992
+    normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993
+    //Return();
994
+
995
+        oe.ctrlPanel.Return();
992
996
             
993
997
 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994
998
 //        ObjEditor.aConstraints.gridx += 1;
..
..
@@ -1083,7 +1087,7 @@
1083
1087
         oe.aConstraints.gridwidth = 1;
1084
1088
         /**/
1085
1089
         nameField = AddText(oe.ctrlPanel, copy.GetName());
1086
-        Return();
1090
+        oe.ctrlPanel.Return();
1087
1091
 
1088
1092
         //ctrlPanel.add(textureButton = new Button("Texture..."));
1089
1093
         //textureButton.setEnabled(false);
..
..
@@ -1185,7 +1189,8 @@
1185
1189
         //JPanel worldPanel =
1186
1190
         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187
1191
         //worldPanel.setName("World");
1188
-	centralPanel = new JPanel(new BorderLayout());
1192
+	centralPanel = new cGridBag();
1193
+        centralPanel.preferredWidth = 20;
1189
1194
 	timelinePanel = new JPanel(new BorderLayout());
1190
1195
         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191
1196
 
..
..
@@ -1215,12 +1220,13 @@
1215
1220
         //frontView.object = copy;
1216
1221
         //sideView.object = copy;
1217
1222
 
1218
-        XYZPanel = new JPanel();
1219
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1223
+        XYZPanel = new cGridBag().setVertical(true);
1224
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1220
1225
 
1221
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1222
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1223
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1226
+        XYZPanel.preferredWidth = 5;
1227
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1228
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1229
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1224
1230
 
1225
1231
         /*
1226
1232
         gridPanel = new JPanel(); //new BorderLayout());
..
..
@@ -1258,10 +1264,11 @@
1258
1264
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1259
1265
         //tmp.setName("Edit");
1260
1266
         objectPanel.add(materialPanel);
1261
-        JPanel north = new JPanel(new BorderLayout());
1262
-        north.setName("Edit");
1263
-        north.add(ctrlPanel, BorderLayout.NORTH);
1264
-        objectPanel.add(north);
1267
+//        JPanel north = new JPanel(new BorderLayout());
1268
+//        north.setName("Edit");
1269
+//        north.add(ctrlPanel, BorderLayout.NORTH);
1270
+//        objectPanel.add(north);
1271
+        objectPanel.add(ctrlPanel);
1265
1272
         objectPanel.add(infoPanel);
1266
1273
 
1267
1274
         /*
..
..
@@ -1282,16 +1289,23 @@
1282
1289
         scrollpane.setWheelScrollingEnabled(true);
1283
1290
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1284
1291
 
1285
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1286
-        scenePanel.add(scrollpane);
1292
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1293
+        scenePanel.preferredWidth = 7;
1294
+        
1295
+        JTabbedPane tabbedPane = new JTabbedPane();
1296
+        tabbedPane.add(scrollpane);
1287
1297
 
1288
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1298
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1289
1299
 
1290
-        optionsPanel = new JPanel(new GridBagLayout());
1300
+        optionsPanel = new cGridBag().setVertical(true);
1291
1301
 
1292
1302
         optionsPanel.setName("Options");
1293
-        scenePanel.add(optionsPanel);
1294
-
1303
+        
1304
+        AddOptions(optionsPanel); //, aConstraints);
1305
+        
1306
+        tabbedPane.add(optionsPanel);
1307
+        
1308
+        scenePanel.add(tabbedPane);
1295
1309
 
1296
1310
         /*
1297
1311
         cTree jTree = new cTree(null);
..
..
@@ -1325,6 +1339,7 @@
1325
1339
         //bigPanel.setSize(new Dimension(10,10));
1326
1340
         //bigPanel.add(ctrlPanel);
1327
1341
         //bigPanel.add(gridPanel);
1342
+        /**
1328
1343
         bigThree = new JPanel();
1329
1344
         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
1330
1345
         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..
..
@@ -1348,7 +1363,13 @@
1348
1363
         //	aConstraints.gridheight = 3;
1349
1364
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1350
1365
         bigThree.add(XYZPanel, aWindowConstraints);
1366
+        /**/
1351
1367
 
1368
+        bigThree = new cGridBag();
1369
+        bigThree.addComponent(scenePanel);
1370
+        bigThree.addComponent(centralPanel);
1371
+        bigThree.addComponent(XYZPanel);
1372
+        
1352
1373
 //                // SIDE EFFECT!!!
1353
1374
 //		aConstraints.gridx = 0;
1354
1375
 //		aConstraints.gridy = 0;
..
..
@@ -1369,7 +1390,8 @@
1369
1390
         //worldPane.add(bigPanel);
1370
1391
         //worldPane.add(worldPanel);
1371
1392
                 /**/
1372
-        frame.getContentPane().add(/*"Center",*/framePanel);
1393
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1394
+        frame.add(/*"Center",*/framePanel);
1373
1395
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1374
1396
 
1375
1397
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..
..
@@ -1390,6 +1412,10 @@
1390
1412
         });
1391
1413
     }
1392
1414
 
1415
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1416
+    {
1417
+    }
1418
+    
1393
1419
     JTree GetTree()
1394
1420
     {
1395
1421
         return objEditor.jTree;
..
..
@@ -1401,260 +1427,165 @@
1401
1427
         ctrlPanel.removeAll();
1402
1428
     }
1403
1429
 
1404
-    void SetupMaterial(JPanel ctrlPanel)
1430
+    void SetupMaterial(cGridBag panel)
1405
1431
     {
1406
-        aConstraints.weighty = 0;
1407
-        //aConstraints.weightx = 1;
1408
-                /*
1432
+         /*
1409
1433
         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1410
1434
         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1411
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1412
-        aConstraints.gridx += 1;
1413
1435
          */
1414
1436
 
1415
-        aConstraints.gridwidth = 1;
1416
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1417
-        aConstraints.gridx += 1;
1418
-        aConstraints.weighty = 0;
1419
-        aConstraints.gridwidth = 1;
1437
+        cGridBag editBar = new cGridBag().setVertical(false);
1438
+            
1439
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1420
1440
 
1421
1441
         /*
1422
1442
         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1423
-        aConstraints.gridx += 1;
1424
-        aConstraints.weighty = 0;
1425
-        aConstraints.gridwidth = 1;
1426
1443
          */
1427
1444
 
1428
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1429
-        aConstraints.gridx += 1;
1445
+        editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446
+        editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447
+        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448
+        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1430
1449
 
1431
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1432
-
1433
-        aConstraints.gridx += 1;
1434
-
1435
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1436
-
1437
-        aConstraints.gridx += 1;
1438
-
1439
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1440
-
1441
-        aConstraints.gridx = 0;
1442
-        aConstraints.gridy += 1;
1443
-        aConstraints.weighty = 0;
1444
-        aConstraints.gridwidth = 1;
1450
+        panel.add(editBar);
1451
+        
1445
1452
         /**/
1446
1453
         //aConstraints.weighty = 0;
1447
1454
         ////aConstraints.weightx = 1;
1448
1455
         //aConstraints.weighty = 1;
1449
1456
         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1450
1457
         //aConstraints.gridx += 1;
1451
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1452
-        aConstraints.weighty = 0;
1453
-        aConstraints.gridx = 0;
1454
-        aConstraints.gridy += 1;
1455
-        aConstraints.gridwidth = 1;
1458
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1456
1459
 
1457
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1458
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1459
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1460
-        aConstraints.gridx += 1;
1461
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1462
-        //aConstraints.weightx = 0;
1463
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1464
-        aConstraints.gridx = 0;
1465
-        aConstraints.gridy += 1;
1466
-        aConstraints.gridwidth = 1;
1460
+        cGridBag colorSection = new cGridBag().setVertical(true);
1461
+        
1462
+        cGridBag color = new cGridBag();
1463
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1464
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1465
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1466
+        //colorField.preferredWidth = 200;
1467
+        colorSection.add(color);
1467
1468
 
1468
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1469
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1471
-        aConstraints.gridx += 1;
1472
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1473
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474
-        aConstraints.gridx = 0;
1475
-        aConstraints.gridy += 1;
1476
-        aConstraints.gridwidth = 1;
1469
+        cGridBag modulation = new cGridBag();
1470
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1471
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1473
+        colorSection.add(modulation);
1477
1474
 
1478
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1479
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481
-        aConstraints.gridx += 1;
1482
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484
-        aConstraints.gridx = 0;
1485
-        aConstraints.gridy += 1;
1486
-        aConstraints.gridwidth = 1;
1475
+        cGridBag texture = new cGridBag();
1476
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1477
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479
+        colorSection.add(texture);
1487
1480
 
1488
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1489
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491
-        aConstraints.gridx += 1;
1492
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494
-        aConstraints.gridx = 0;
1495
-        aConstraints.gridy += 1;
1496
-        aConstraints.gridwidth = 1;
1481
+        cGridBag anisoU = new cGridBag();
1482
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1483
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1485
+        colorSection.add(anisoU);
1497
1486
 
1498
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1499
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501
-        aConstraints.gridx += 1;
1502
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504
-        aConstraints.gridx = 0;
1505
-        aConstraints.gridy += 1;
1506
-        aConstraints.gridwidth = 1;
1487
+        cGridBag anisoV = new cGridBag();
1488
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1489
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1491
+        colorSection.add(anisoV);
1507
1492
 
1508
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1509
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511
-        aConstraints.gridx += 1;
1512
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1514
-        aConstraints.gridx = 0;
1515
-        aConstraints.gridy += 1;
1516
-        aConstraints.gridwidth = 1;
1493
+        cGridBag shadowbias = new cGridBag();
1494
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1495
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1497
+        colorSection.add(shadowbias);
1517
1498
 
1518
-        //aConstraints.weighty = 1;
1519
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1520
-        //aConstraints.gridx += 1;
1521
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1522
-        aConstraints.weighty = 0;
1523
-        aConstraints.gridx = 0;
1524
-        aConstraints.gridy += 1;
1525
-        aConstraints.gridwidth = 1;
1499
+        panel.add(new JSeparator());
1500
+        
1501
+        panel.add(colorSection);
1502
+        
1503
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1504
+        
1505
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1506
+        
1507
+        cGridBag diffuse = new cGridBag();
1508
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1509
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1511
+        diffuseSection.add(diffuse);
1526
1512
 
1527
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1528
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530
-        aConstraints.gridx += 1;
1531
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1533
-        aConstraints.gridx = 0;
1534
-        aConstraints.gridy += 1;
1535
-        aConstraints.gridwidth = 1;
1513
+        cGridBag diffuseness = new cGridBag();
1514
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1515
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1516
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1517
+        diffuseSection.add(diffuseness);
1536
1518
 
1537
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1538
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540
-        aConstraints.gridx += 1;
1541
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1543
-        aConstraints.gridx = 0;
1544
-        aConstraints.gridy += 1;
1545
-        aConstraints.gridwidth = 1;
1519
+        cGridBag selfshadow = new cGridBag();
1520
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1521
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1523
+        diffuseSection.add(selfshadow);
1546
1524
 
1547
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1548
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550
-        aConstraints.gridx += 1;
1551
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1553
-        aConstraints.gridx = 0;
1554
-        aConstraints.gridy += 1;
1555
-        aConstraints.gridwidth = 1;
1525
+        cGridBag sheen = new cGridBag();
1526
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1527
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1528
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1529
+        diffuseSection.add(sheen);
1556
1530
 
1557
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1558
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560
-        aConstraints.gridx += 1;
1561
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1563
-        aConstraints.gridx = 0;
1564
-        aConstraints.gridy += 1;
1565
-        aConstraints.gridwidth = 1;
1531
+        cGridBag subsurface = new cGridBag();
1532
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1533
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1534
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1535
+        diffuseSection.add(subsurface);
1566
1536
 
1567
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1568
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570
-        aConstraints.gridx += 1;
1571
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1573
-        aConstraints.gridx = 0;
1574
-        aConstraints.gridy += 1;
1575
-        aConstraints.gridwidth = 1;
1537
+        cGridBag shadow = new cGridBag();
1538
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1539
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1540
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1541
+        diffuseSection.add(shadow);
1576
1542
 
1577
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1578
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580
-        aConstraints.gridx += 1;
1581
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1583
-        aConstraints.gridx = 0;
1584
-        aConstraints.gridy += 1;
1585
-        aConstraints.gridwidth = 1;
1543
+        cGridBag fakedepth = new cGridBag();
1544
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1545
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1546
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547
+        diffuseSection.add(fakedepth);
1586
1548
 
1587
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1588
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590
-        aConstraints.gridx += 1;
1591
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1593
-        aConstraints.gridx = 0;
1594
-        aConstraints.gridy += 1;
1595
-        aConstraints.gridwidth = 1;
1549
+        panel.add(new JSeparator());
1550
+        
1551
+        panel.add(diffuseSection);
1552
+        
1553
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1554
+        
1555
+        cGridBag specularSection = new cGridBag().setVertical(true);
1596
1556
 
1597
-        //aConstraints.weighty = 1;
1598
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1599
-        //aConstraints.gridx += 1;
1600
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1601
-        aConstraints.weighty = 0;
1602
-        aConstraints.gridx = 0;
1603
-        aConstraints.gridy += 1;
1604
-        aConstraints.gridwidth = 1;
1557
+        cGridBag specular = new cGridBag();
1558
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1559
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1561
+        specularSection.add(specular);
1605
1562
 
1606
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1607
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609
-        aConstraints.gridx += 1;
1610
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1612
-        aConstraints.gridx = 0;
1613
-        aConstraints.gridy += 1;
1614
-        aConstraints.gridwidth = 1;
1563
+        cGridBag lightarea = new cGridBag();
1564
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1565
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1567
+        specularSection.add(lightarea);
1615
1568
 
1616
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1617
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619
-        aConstraints.gridx += 1;
1620
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1622
-        aConstraints.gridx = 0;
1623
-        aConstraints.gridy += 1;
1624
-        aConstraints.gridwidth = 1;
1569
+        cGridBag shininess = new cGridBag();
1570
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1571
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573
+        specularSection.add(shininess);
1625
1574
 
1626
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1627
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629
-        aConstraints.gridx += 1;
1630
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1632
-        aConstraints.gridx = 0;
1633
-        aConstraints.gridy += 1;
1634
-        aConstraints.gridwidth = 1;
1575
+        cGridBag metalness = new cGridBag();
1576
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1577
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579
+        specularSection.add(metalness);
1635
1580
 
1636
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1637
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639
-        aConstraints.gridx += 1;
1640
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1642
-        aConstraints.gridx = 0;
1643
-        aConstraints.gridy += 1;
1644
-        aConstraints.gridwidth = 1;
1581
+        cGridBag velvet = new cGridBag();
1582
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1583
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1585
+        specularSection.add(velvet);
1645
1586
 
1646
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1647
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649
-        aConstraints.gridx += 1;
1650
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1652
-        aConstraints.gridx = 0;
1653
-        aConstraints.gridy += 1;
1654
-        aConstraints.gridwidth = 1;
1655
-
1656
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1657
-        Return();
1587
+        shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1588
+        //Return();
1658
1589
 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1659
1590
 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660
1591
 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
..
..
@@ -1665,130 +1596,93 @@
1665
1596
 //		aConstraints.gridy += 1;
1666
1597
 //		aConstraints.gridwidth = 1;
1667
1598
 
1668
-        //aConstraints.weighty = 1;
1669
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1670
-        //aConstraints.gridx += 1;
1671
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1672
-        aConstraints.weighty = 0;
1673
-        aConstraints.gridx = 0;
1674
-        aConstraints.gridy += 1;
1675
-        aConstraints.gridwidth = 1;
1676
1599
 
1677
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1678
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1680
-        aConstraints.gridx += 1;
1681
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1682
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1683
-        aConstraints.gridx = 0;
1684
-        aConstraints.gridy += 1;
1685
-        aConstraints.gridwidth = 1;
1600
+        panel.add(new JSeparator());
1601
+        
1602
+        panel.add(specularSection);
1603
+        
1604
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605
+        
1606
+        cGridBag globalSection = new cGridBag().setVertical(true);
1686
1607
 
1687
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1688
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690
-        aConstraints.gridx += 1;
1691
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1693
-        aConstraints.gridx = 0;
1694
-        aConstraints.gridy += 1;
1695
-        aConstraints.gridwidth = 1;
1608
+        cGridBag camera = new cGridBag();
1609
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612
+        globalSection.add(camera);
1696
1613
 
1697
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1698
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700
-        aConstraints.gridx += 1;
1701
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1703
-        aConstraints.gridx = 0;
1704
-        aConstraints.gridy += 1;
1705
-        aConstraints.gridwidth = 1;
1614
+        cGridBag ambient = new cGridBag();
1615
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618
+        globalSection.add(ambient);
1706
1619
 
1707
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1708
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710
-        aConstraints.gridx += 1;
1711
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1713
-        aConstraints.gridx = 0;
1714
-        aConstraints.gridy += 1;
1715
-        aConstraints.gridwidth = 1;
1716
-        aConstraints.weighty = 0;
1620
+        cGridBag backlit = new cGridBag();
1621
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624
+        globalSection.add(backlit);
1717
1625
 
1718
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1719
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1721
-        aConstraints.gridx += 1;
1722
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1723
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1724
-        aConstraints.gridx = 0;
1725
-        aConstraints.gridy += 1;
1726
-        aConstraints.gridwidth = 1;
1626
+        cGridBag opacity = new cGridBag();
1627
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630
+        globalSection.add(opacity);
1727
1631
 
1728
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1729
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731
-        aConstraints.gridx += 1;
1732
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1734
-        aConstraints.gridx = 0;
1735
-        aConstraints.gridy += 1;
1736
-        aConstraints.gridwidth = 1;
1632
+        panel.add(new JSeparator());
1633
+        
1634
+        panel.add(globalSection);
1635
+        
1636
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637
+        
1638
+        cGridBag textureSection = new cGridBag().setVertical(true);
1737
1639
 
1738
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1739
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741
-        aConstraints.gridx += 1;
1742
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1744
-        aConstraints.gridx = 0;
1745
-        aConstraints.gridy += 1;
1746
-        aConstraints.gridwidth = 1;
1640
+        cGridBag bump = new cGridBag();
1641
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1642
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1644
+        textureSection.add(bump);
1747
1645
 
1748
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1749
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751
-        aConstraints.gridx += 1;
1752
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1754
-        aConstraints.gridx = 0;
1755
-        aConstraints.gridy += 1;
1756
-        aConstraints.gridwidth = 1;
1646
+        cGridBag noise = new cGridBag();
1647
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1648
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1649
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1650
+        textureSection.add(noise);
1757
1651
 
1758
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1759
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761
-        aConstraints.gridx += 1;
1762
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1764
-        aConstraints.gridx = 0;
1765
-        aConstraints.gridy += 1;
1766
-        aConstraints.gridwidth = 1;
1652
+        cGridBag power = new cGridBag();
1653
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1654
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1655
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1656
+        textureSection.add(power);
1767
1657
 
1768
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1769
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771
-        aConstraints.gridx += 1;
1772
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1774
-        aConstraints.gridx = 0;
1775
-        aConstraints.gridy += 1;
1776
-        aConstraints.gridwidth = 1;
1658
+        cGridBag borderfade = new cGridBag();
1659
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1660
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1662
+        textureSection.add(borderfade);
1777
1663
 
1778
-        //aConstraints.weighty = 1;
1779
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1780
-        //aConstraints.gridx += 1;
1781
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1782
-        aConstraints.weighty = 0;
1664
+        cGridBag fog = new cGridBag();
1665
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1666
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1668
+        textureSection.add(fog);
1783
1669
 
1784
-        aConstraints.gridx = 0;
1785
-        aConstraints.gridy = 0;
1786
-        aConstraints.gridwidth = 1;
1670
+        cGridBag opacityPower = new cGridBag();
1671
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1672
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1674
+        textureSection.add(opacityPower);
1675
+
1676
+        panel.add(new JSeparator());
1677
+        
1678
+        panel.add(textureSection);
1679
+        
1680
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1787
1681
 
1788
1682
         SetMaterial(copy); // .GetMaterial());
1789
1683
 
1790
-        colorField.addChangeListener(this);
1791
-        modulationField.addChangeListener(this);
1684
+        //colorField.addChangeListener(this);
1685
+//        modulationField.addChangeListener(this);
1792
1686
         metalnessField.addChangeListener(this);
1793
1687
         diffuseField.addChangeListener(this);
1794
1688
         specularField.addChangeListener(this);
..
..
@@ -2600,6 +2494,7 @@
2600
2494
                 }
2601
2495
                 if (input == null)
2602
2496
                 {
2497
+                new Exception().printStackTrace();
2603
2498
                     System.exit(0);
2604
2499
                 }
2605
2500
 
..
..
@@ -3136,7 +3031,8 @@
3136
3031
             objEditor.refreshContents();
3137
3032
         } else if (event.getSource() == stepItem)
3138
3033
         {
3139
-            cameraView.ONESTEP = true;
3034
+            //cameraView.ONESTEP = true;
3035
+            Globals.ONESTEP = true;
3140
3036
             cameraView.repaint();
3141
3037
             return;
3142
3038
         } else if (event.getSource() == stepButton)
..
..
@@ -3293,25 +3189,25 @@
3293
3189
 
3294
3190
     void ToggleAnimation()
3295
3191
     {
3296
-        if (!CameraPane.ANIMATION)
3192
+        if (!Globals.ANIMATION)
3297
3193
         {
3298
3194
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3299
3195
             browser.show();
3300
3196
             String filename = browser.getFile();
3301
3197
             if (filename != null && filename.length() > 0)
3302
3198
             {
3303
-                CameraPane.filename = browser.getDirectory() + filename;
3199
+                Globals.filename = browser.getDirectory() + filename;
3304
3200
                 //CameraPane.framecount = 0;
3305
-                CameraPane.imagecount = 0;
3201
+                Globals.imagecount = 0;
3306
3202
 
3307
-                CameraPane.ANIMATION ^= true;
3203
+                Globals.ANIMATION ^= true;
3308
3204
 
3309
3205
                 GrafreeD.wav.cursor = 0;
3310
3206
                 GrafreeD.wav.loop = 0;
3311
3207
             }
3312
3208
         } else
3313
3209
         {
3314
-            CameraPane.ANIMATION ^= true;
3210
+            Globals.ANIMATION ^= true;
3315
3211
         }
3316
3212
     }
3317
3213
 
..
..
@@ -3328,6 +3224,7 @@
3328
3224
             callee.refreshContents();
3329
3225
         } else
3330
3226
         {
3227
+                new Exception().printStackTrace();
3331
3228
             System.exit(0);
3332
3229
         }
3333
3230
     }
..
..
@@ -3490,7 +3387,7 @@
3490
3387
             current.fakedepth = (float) fakedepthField.getFloat();
3491
3388
             current.shadowbias = (float) shadowbiasField.getFloat();
3492
3389
 
3493
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
3494
3391
             {
3495
3392
                 //System.out.println("Propagate = " + propagate);
3496
3393
                 copy.UpdateMaterial(anchor, current, propagate);
..
..
@@ -3538,6 +3435,7 @@
3538
3435
                 || e.getSource() == apertureField
3539
3436
                 || e.getSource() == shadowblurField)
3540
3437
         {
3438
+                new Exception().printStackTrace();
3541
3439
             System.exit(0);
3542
3440
             cameraView.options1[0] = (float) focusField.getFloat() * 10;
3543
3441
             cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..
..
@@ -3863,7 +3761,7 @@
3863
3761
 
3864
3762
             radioPanel.revalidate();
3865
3763
             radioPanel.repaint();
3866
-            ctrlPanel.revalidate(); // ? new
3764
+            ctrlPanel.validate(); // ? new
3867
3765
             ctrlPanel.repaint();
3868
3766
         }
3869
3767
     }
..
..
@@ -4509,8 +4407,8 @@
4509
4407
     //MenuItem normalLensItem;
4510
4408
     MenuItem editCameraItem;
4511
4409
     MenuItem revertCameraItem;
4512
-    CheckboxMenuItem toggleLiveItem;
4513
4410
     MenuItem stepItem;
4411
+    CheckboxMenuItem toggleLiveItem;
4514
4412
     CheckboxMenuItem toggleFullScreenItem;
4515
4413
     CheckboxMenuItem toggleTimelineItem;
4516
4414
     CheckboxMenuItem toggleRenderItem;
..
..
@@ -4530,17 +4428,17 @@
4530
4428
     JPanel treePanel;
4531
4429
     JPanel radioPanel;
4532
4430
     ButtonGroup buttonGroup;
4533
-    JPanel ctrlPanel;
4534
-    JPanel materialPanel;
4431
+    cGridBag ctrlPanel;
4432
+    cGridBag materialPanel;
4535
4433
     JScrollPane infoPanel;
4536
-    JPanel optionsPanel;
4434
+    cGridBag optionsPanel;
4537
4435
     JTabbedPane objectPanel;
4538
-    JPanel XYZPanel;
4436
+    cGridBag XYZPanel;
4539
4437
     JSplitPane gridPanel;
4540
4438
     JSplitPane bigPanel;
4541
-    JPanel bigThree;
4542
-    JTabbedPane scenePanel;
4543
-    JPanel centralPanel;
4439
+    cGridBag bigThree;
4440
+    cGridBag scenePanel;
4441
+    cGridBag centralPanel;
4544
4442
     JSplitPane cameraPanel;
4545
4443
     JPanel timelinePanel;
4546
4444
     JMenuBar timelineMenubar;
..
..
@@ -4593,67 +4491,67 @@
4593
4491
     // MATERIAL
4594
4492
     JLabel materialLabel;
4595
4493
     JLabel colorLabel;
4596
-    NumberSlider colorField;
4494
+    cNumberSlider colorField;
4597
4495
     JLabel modulationLabel;
4598
-    NumberSlider modulationField;
4496
+    cNumberSlider modulationField;
4599
4497
     JLabel metalnessLabel;
4600
-    NumberSlider metalnessField;
4498
+    cNumberSlider metalnessField;
4601
4499
     JLabel diffuseLabel;
4602
-    NumberSlider diffuseField;
4500
+    cNumberSlider diffuseField;
4603
4501
     JLabel specularLabel;
4604
-    NumberSlider specularField;
4502
+    cNumberSlider specularField;
4605
4503
     JLabel shininessLabel;
4606
-    NumberSlider shininessField;
4504
+    cNumberSlider shininessField;
4607
4505
     JLabel shiftLabel;
4608
-    NumberSlider shiftField;
4506
+    cNumberSlider shiftField;
4609
4507
     JLabel ambientLabel;
4610
-    NumberSlider ambientField;
4508
+    cNumberSlider ambientField;
4611
4509
     JLabel lightareaLabel;
4612
-    NumberSlider lightareaField;
4510
+    cNumberSlider lightareaField;
4613
4511
     JLabel diffusenessLabel;
4614
-    NumberSlider diffusenessField;
4512
+    cNumberSlider diffusenessField;
4615
4513
     JLabel velvetLabel;
4616
-    NumberSlider velvetField;
4514
+    cNumberSlider velvetField;
4617
4515
     JLabel sheenLabel;
4618
-    NumberSlider sheenField;
4516
+    cNumberSlider sheenField;
4619
4517
     JLabel subsurfaceLabel;
4620
-    NumberSlider subsurfaceField;
4518
+    cNumberSlider subsurfaceField;
4621
4519
     //JLabel bumpLabel;
4622
4520
     //NumberSlider bumpField;
4623
4521
     JLabel backlitLabel;
4624
-    NumberSlider backlitField;
4522
+    cNumberSlider backlitField;
4625
4523
     JLabel anisoLabel;
4626
-    NumberSlider anisoField;
4524
+    cNumberSlider anisoField;
4627
4525
     JLabel anisoVLabel;
4628
-    NumberSlider anisoVField;
4526
+    cNumberSlider anisoVField;
4629
4527
     JLabel cameraLabel;
4630
-    NumberSlider cameraField;
4528
+    cNumberSlider cameraField;
4631
4529
     JLabel selfshadowLabel;
4632
-    NumberSlider selfshadowField;
4530
+    cNumberSlider selfshadowField;
4633
4531
     JLabel shadowLabel;
4634
-    NumberSlider shadowField;
4532
+    cNumberSlider shadowField;
4635
4533
     JLabel textureLabel;
4636
-    NumberSlider textureField;
4534
+    cNumberSlider textureField;
4637
4535
     JLabel opacityLabel;
4638
-    NumberSlider opacityField;
4536
+    cNumberSlider opacityField;
4639
4537
     JLabel fakedepthLabel;
4640
-    NumberSlider fakedepthField;
4538
+    cNumberSlider fakedepthField;
4641
4539
     JLabel shadowbiasLabel;
4642
-    NumberSlider shadowbiasField;
4540
+    cNumberSlider shadowbiasField;
4643
4541
     JLabel bumpLabel;
4644
-    NumberSlider bumpField;
4542
+    cNumberSlider bumpField;
4645
4543
     JLabel noiseLabel;
4646
-    NumberSlider noiseField;
4544
+    cNumberSlider noiseField;
4647
4545
     JLabel powerLabel;
4648
-    NumberSlider powerField;
4546
+    cNumberSlider powerField;
4649
4547
     JLabel borderfadeLabel;
4650
-    NumberSlider borderfadeField;
4548
+    cNumberSlider borderfadeField;
4651
4549
     JLabel fogLabel;
4652
-    NumberSlider fogField;
4550
+    cNumberSlider fogField;
4653
4551
     JLabel opacityPowerLabel;
4654
-    NumberSlider opacityPowerField;
4552
+    cNumberSlider opacityPowerField;
4655
4553
     JTree jTree;
4656
4554
     //ObjectUI parent;
4657
4555
     
4658
-    NumberSlider normalpushField;
4556
+    cNumberSlider normalpushField;
4659
4557
 }