Material pane

Normand Briere

2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0

 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,14 +126,13 @@
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()
..
..
@@ -309,7 +313,7 @@
309
313
         toggleTextureItem.setState(CameraPane.textureon);
310
314
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311
315
         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
313
317
         cameraMenu.add(stepItem = new MenuItem("Step"));
314
318
         stepItem.addActionListener(this);
315
319
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -351,9 +355,9 @@
351
355
         toolbarPanel.setName("Toolbar");
352
356
         treePanel = new JPanel();
353
357
         treePanel.setName("Tree");
354
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
355
359
         ctrlPanel.setName("Edit");
356
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
357
361
         materialPanel.setName("Material");
358
362
         /*JTextPane*/
359
363
         infoarea = createTextPane();
..
..
@@ -383,7 +387,7 @@
383
387
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384
388
         treePanel.setLayout(new GridBagLayout());
385
389
         ctrlPanel.setLayout(new GridBagLayout());
386
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
387
391
 
388
392
         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389
393
                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..
..
@@ -810,65 +814,47 @@
810
814
         return combo;
811
815
     }
812
816
 
813
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
817
+    cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
814
818
     {
815
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
816
822
 
817
823
         JLabel jlabel = new JLabel(label);
818
-
819
-        aConstraints.fill = GridBagConstraints.VERTICAL;
820
824
         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
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830
827
         combo.setFloat(current);
831
-
832
-        combo.label = jlabel;
833
-
834
-        combo.addChangeListener(this);
835
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
836
831
         return combo;
837
832
     }
838
833
 
839
-    NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
834
+    cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
840
835
     {
841
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
842
839
 
843
840
         JLabel jlabel = new JLabel(label);
844
-
845
-        aConstraints.fill = GridBagConstraints.VERTICAL;
846
841
         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
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856
844
         combo.setInteger(current);
857
845
 
858
-        combo.label = jlabel;
859
-
860
-        combo.addChangeListener(this);
861
-
846
+        ctrlPanel.add(control);
847
+        
862
848
         return combo;
863
849
     }
864
850
 
865
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
866
852
     {
867
853
         JTextArea text;
868
854
 
869
855
         aConstraints.fill = GridBagConstraints.HORIZONTAL;
870
856
         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872
858
         text.addCaretListener(this);
873
859
         aConstraints.gridx += 1;
874
860
         aConstraints.gridwidth = 1;
..
..
@@ -898,6 +884,13 @@
898
884
     {
899
885
         j.removeChangeListener(this);
900
886
         objEditor.ctrlPanel.remove(j.label);
887
+        objEditor.ctrlPanel.remove(j);
888
+    }
889
+
890
+    void Remove(cNumberSlider j)
891
+    {
892
+        j.removeChangeListener(this);
893
+        //objEditor.ctrlPanel.remove(j.label);
901
894
         objEditor.ctrlPanel.remove(j);
902
895
     }
903
896
 
..
..
@@ -1185,10 +1178,18 @@
1185
1178
         //JPanel worldPanel =
1186
1179
         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187
1180
         //worldPanel.setName("World");
1188
-	centralPanel = new JPanel(new BorderLayout());
1181
+	centralPanel = new cGridBag();
1182
+        centralPanel.preferredWidth = 20;
1189
1183
 	timelinePanel = new JPanel(new BorderLayout());
1190
1184
         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191
1185
 
1186
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187
+        cameraPanel.setContinuousLayout(true);
1188
+        cameraPanel.setOneTouchExpandable(true);
1189
+//        cameraPanel.setDividerLocation(0.9);
1190
+//        cameraPanel.setDividerSize(9);
1191
+        cameraPanel.setResizeWeight(1.0);
1192
+        
1192
1193
         centralPanel.add(cameraView);
1193
1194
         //frame.setJMenuBar(timelineMenubar);
1194
1195
         //centralPanel.add(timelinePanel);
..
..
@@ -1208,12 +1209,13 @@
1208
1209
         //frontView.object = copy;
1209
1210
         //sideView.object = copy;
1210
1211
 
1211
-        XYZPanel = new JPanel();
1212
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212
+        XYZPanel = new cGridBag().setVertical(true);
1213
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213
1214
 
1214
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1215
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1216
-        XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1215
+        XYZPanel.preferredWidth = 5;
1216
+        XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1217
+        XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1218
+        XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1217
1219
 
1218
1220
         /*
1219
1221
         gridPanel = new JPanel(); //new BorderLayout());
..
..
@@ -1275,16 +1277,23 @@
1275
1277
         scrollpane.setWheelScrollingEnabled(true);
1276
1278
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1277
1279
 
1278
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1279
-        scenePanel.add(scrollpane);
1280
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1281
+        scenePanel.preferredWidth = 7;
1282
+        
1283
+        JTabbedPane tabbedPane = new JTabbedPane();
1284
+        tabbedPane.add(scrollpane);
1280
1285
 
1281
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1282
1287
 
1283
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
1284
1289
 
1285
1290
         optionsPanel.setName("Options");
1286
-        scenePanel.add(optionsPanel);
1287
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
1288
1297
 
1289
1298
         /*
1290
1299
         cTree jTree = new cTree(null);
..
..
@@ -1318,6 +1327,7 @@
1318
1327
         //bigPanel.setSize(new Dimension(10,10));
1319
1328
         //bigPanel.add(ctrlPanel);
1320
1329
         //bigPanel.add(gridPanel);
1330
+        /**
1321
1331
         bigThree = new JPanel();
1322
1332
         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323
1333
         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..
..
@@ -1341,7 +1351,13 @@
1341
1351
         //	aConstraints.gridheight = 3;
1342
1352
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343
1353
         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
1344
1355
 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
1345
1361
 //                // SIDE EFFECT!!!
1346
1362
 //		aConstraints.gridx = 0;
1347
1363
 //		aConstraints.gridy = 0;
..
..
@@ -1362,7 +1378,8 @@
1362
1378
         //worldPane.add(bigPanel);
1363
1379
         //worldPane.add(worldPanel);
1364
1380
                 /**/
1365
-        frame.getContentPane().add(/*"Center",*/framePanel);
1381
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1382
+        frame.add(/*"Center",*/framePanel);
1366
1383
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1367
1384
 
1368
1385
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..
..
@@ -1383,6 +1400,10 @@
1383
1400
         });
1384
1401
     }
1385
1402
 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
1386
1407
     JTree GetTree()
1387
1408
     {
1388
1409
         return objEditor.jTree;
..
..
@@ -1394,260 +1415,175 @@
1394
1415
         ctrlPanel.removeAll();
1395
1416
     }
1396
1417
 
1397
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
1398
1419
     {
1399
-        aConstraints.weighty = 0;
1400
-        //aConstraints.weightx = 1;
1401
-                /*
1420
+         /*
1402
1421
         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403
1422
         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405
-        aConstraints.gridx += 1;
1406
1423
          */
1407
1424
 
1408
-        aConstraints.gridwidth = 1;
1409
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410
-        aConstraints.gridx += 1;
1411
-        aConstraints.weighty = 0;
1412
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1413
1428
 
1414
1429
         /*
1415
1430
         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416
-        aConstraints.gridx += 1;
1417
-        aConstraints.weighty = 0;
1418
-        aConstraints.gridwidth = 1;
1419
1431
          */
1420
1432
 
1421
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422
-        aConstraints.gridx += 1;
1433
+        editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434
+        editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435
+        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436
+        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1423
1437
 
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;
1438
+        ctrlPanel.add(editBar);
1439
+        
1438
1440
         /**/
1439
1441
         //aConstraints.weighty = 0;
1440
1442
         ////aConstraints.weightx = 1;
1441
1443
         //aConstraints.weighty = 1;
1442
1444
         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443
1445
         //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;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449
1447
 
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;
1448
+        JPanel colorPanel = new JPanel(new BorderLayout());
1449
+        colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
+        
1451
+        cGridBag colorSection = new cGridBag().setVertical(true);
1452
+        
1453
+        colorPanel.add(colorSection);
1454
+        
1455
+        cGridBag color = new cGridBag();
1456
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1459
+        colorSection.add(color);
1460
1460
 
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;
1461
+        cGridBag modulation = new cGridBag();
1462
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1463
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1465
+        colorSection.add(modulation);
1470
1466
 
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;
1467
+        cGridBag texture = new cGridBag();
1468
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1469
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471
+        colorSection.add(texture);
1480
1472
 
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;
1473
+        cGridBag anisoU = new cGridBag();
1474
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477
+        colorSection.add(anisoU);
1490
1478
 
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;
1479
+        cGridBag anisoV = new cGridBag();
1480
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483
+        colorSection.add(anisoV);
1500
1484
 
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;
1485
+        cGridBag shadowbias = new cGridBag();
1486
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
+        colorSection.add(shadowbias);
1510
1490
 
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;
1491
+        ctrlPanel.add(colorPanel);
1492
+        
1493
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494
+        
1495
+        JPanel diffusePanel = new JPanel(new BorderLayout());
1496
+        diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
+        
1498
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
+        
1500
+        diffusePanel.add(diffuseSection);
1501
+        
1502
+        cGridBag diffuse = new cGridBag();
1503
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1504
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1506
+        diffuseSection.add(diffuse);
1519
1507
 
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;
1508
+        cGridBag diffuseness = new cGridBag();
1509
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1510
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1512
+        diffuseSection.add(diffuseness);
1529
1513
 
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;
1514
+        cGridBag selfshadow = new cGridBag();
1515
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1516
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1518
+        diffuseSection.add(selfshadow);
1539
1519
 
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;
1520
+        cGridBag sheen = new cGridBag();
1521
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1522
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1524
+        diffuseSection.add(sheen);
1549
1525
 
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;
1526
+        cGridBag subsurface = new cGridBag();
1527
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1528
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530
+        diffuseSection.add(subsurface);
1559
1531
 
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;
1532
+        cGridBag shadow = new cGridBag();
1533
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1534
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1536
+        diffuseSection.add(shadow);
1569
1537
 
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;
1538
+        cGridBag fakedepth = new cGridBag();
1539
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1540
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
+        diffuseSection.add(fakedepth);
1579
1543
 
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;
1544
+        ctrlPanel.add(diffusePanel);
1545
+        
1546
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547
+        
1548
+        JPanel specularPanel = new JPanel(new BorderLayout());
1549
+        specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
+        
1551
+        cGridBag specularSection = new cGridBag().setVertical(true);
1552
+        
1553
+        specularPanel.add(specularSection);
1589
1554
 
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;
1555
+        cGridBag specular = new cGridBag();
1556
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1557
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1559
+        specularSection.add(specular);
1598
1560
 
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;
1561
+        cGridBag lightarea = new cGridBag();
1562
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1563
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1565
+        specularSection.add(lightarea);
1608
1566
 
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;
1567
+        cGridBag shininess = new cGridBag();
1568
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1569
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1571
+        specularSection.add(shininess);
1618
1572
 
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;
1573
+        cGridBag metalness = new cGridBag();
1574
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1575
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1577
+        specularSection.add(metalness);
1628
1578
 
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;
1579
+        cGridBag velvet = new cGridBag();
1580
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1581
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583
+        specularSection.add(velvet);
1638
1584
 
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();
1585
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1586
+        //Return();
1651
1587
 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652
1588
 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653
1589
 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
..
..
@@ -1658,130 +1594,97 @@
1658
1594
 //		aConstraints.gridy += 1;
1659
1595
 //		aConstraints.gridwidth = 1;
1660
1596
 
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;
1669
1597
 
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;
1598
+        ctrlPanel.add(specularPanel);
1599
+        
1600
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601
+        
1602
+        JPanel globalPanel = new JPanel(new BorderLayout());
1603
+        globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
+        
1605
+        cGridBag globalSection = new cGridBag().setVertical(true);
1606
+        
1607
+        globalPanel.add(globalSection);
1679
1608
 
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;
1609
+        cGridBag camera = new cGridBag();
1610
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
+        globalSection.add(camera);
1689
1614
 
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;
1615
+        cGridBag ambient = new cGridBag();
1616
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619
+        globalSection.add(ambient);
1699
1620
 
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;
1621
+        cGridBag backlit = new cGridBag();
1622
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
+        globalSection.add(backlit);
1710
1626
 
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;
1627
+        cGridBag opacity = new cGridBag();
1628
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
+        globalSection.add(opacity);
1720
1632
 
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;
1633
+        ctrlPanel.add(globalPanel);
1634
+        
1635
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636
+        
1637
+        JPanel texturePanel = new JPanel(new BorderLayout());
1638
+        texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
+        
1640
+        cGridBag textureSection = new cGridBag().setVertical(true);
1641
+        
1642
+        texturePanel.add(textureSection);
1730
1643
 
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;
1644
+        cGridBag bump = new cGridBag();
1645
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1646
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1648
+        textureSection.add(bump);
1740
1649
 
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;
1650
+        cGridBag noise = new cGridBag();
1651
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1652
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1654
+        textureSection.add(noise);
1750
1655
 
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;
1656
+        cGridBag power = new cGridBag();
1657
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1658
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1660
+        textureSection.add(power);
1760
1661
 
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;
1662
+        cGridBag borderfade = new cGridBag();
1663
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1664
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1666
+        textureSection.add(borderfade);
1770
1667
 
1771
-        //aConstraints.weighty = 1;
1772
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773
-        //aConstraints.gridx += 1;
1774
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775
-        aConstraints.weighty = 0;
1668
+        cGridBag fog = new cGridBag();
1669
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1670
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1672
+        textureSection.add(fog);
1776
1673
 
1777
-        aConstraints.gridx = 0;
1778
-        aConstraints.gridy = 0;
1779
-        aConstraints.gridwidth = 1;
1674
+        cGridBag opacityPower = new cGridBag();
1675
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1676
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1678
+        textureSection.add(opacityPower);
1679
+
1680
+        ctrlPanel.add(texturePanel);
1681
+        
1682
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1780
1683
 
1781
1684
         SetMaterial(copy); // .GetMaterial());
1782
1685
 
1783
-        colorField.addChangeListener(this);
1784
-        modulationField.addChangeListener(this);
1686
+        //colorField.addChangeListener(this);
1687
+//        modulationField.addChangeListener(this);
1785
1688
         metalnessField.addChangeListener(this);
1786
1689
         diffuseField.addChangeListener(this);
1787
1690
         specularField.addChangeListener(this);
..
..
@@ -2996,7 +2899,8 @@
2996
2899
             if (timeline)
2997
2900
             {
2998
2901
                 centralPanel.remove(cameraView);
2999
-                centralPanel.add(timelinePanel);
2902
+                cameraPanel.add(cameraView);
2903
+                centralPanel.add(cameraPanel);
3000
2904
                 frame.setJMenuBar(timelineMenubar);
3001
2905
                 wasFullScreen = CameraPane.FULLSCREEN;
3002
2906
                 if (!CameraPane.FULLSCREEN)
..
..
@@ -3005,7 +2909,7 @@
3005
2909
             }
3006
2910
             else
3007
2911
             {
3008
-                centralPanel.remove(timelinePanel);
2912
+                centralPanel.remove(cameraPanel);
3009
2913
                 centralPanel.add(cameraView);
3010
2914
                 frame.setJMenuBar(null);
3011
2915
                 if (!wasFullScreen)
..
..
@@ -3128,7 +3032,8 @@
3128
3032
             objEditor.refreshContents();
3129
3033
         } else if (event.getSource() == stepItem)
3130
3034
         {
3131
-            cameraView.ONESTEP = true;
3035
+            //cameraView.ONESTEP = true;
3036
+            Globals.ONESTEP = true;
3132
3037
             cameraView.repaint();
3133
3038
             return;
3134
3039
         } else if (event.getSource() == stepButton)
..
..
@@ -3285,25 +3190,25 @@
3285
3190
 
3286
3191
     void ToggleAnimation()
3287
3192
     {
3288
-        if (!CameraPane.ANIMATION)
3193
+        if (!Globals.ANIMATION)
3289
3194
         {
3290
3195
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3291
3196
             browser.show();
3292
3197
             String filename = browser.getFile();
3293
3198
             if (filename != null && filename.length() > 0)
3294
3199
             {
3295
-                CameraPane.filename = browser.getDirectory() + filename;
3200
+                Globals.filename = browser.getDirectory() + filename;
3296
3201
                 //CameraPane.framecount = 0;
3297
-                CameraPane.imagecount = 0;
3202
+                Globals.imagecount = 0;
3298
3203
 
3299
-                CameraPane.ANIMATION ^= true;
3204
+                Globals.ANIMATION ^= true;
3300
3205
 
3301
3206
                 GrafreeD.wav.cursor = 0;
3302
3207
                 GrafreeD.wav.loop = 0;
3303
3208
             }
3304
3209
         } else
3305
3210
         {
3306
-            CameraPane.ANIMATION ^= true;
3211
+            Globals.ANIMATION ^= true;
3307
3212
         }
3308
3213
     }
3309
3214
 
..
..
@@ -3482,7 +3387,7 @@
3482
3387
             current.fakedepth = (float) fakedepthField.getFloat();
3483
3388
             current.shadowbias = (float) shadowbiasField.getFloat();
3484
3389
 
3485
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
3486
3391
             {
3487
3392
                 //System.out.println("Propagate = " + propagate);
3488
3393
                 copy.UpdateMaterial(anchor, current, propagate);
..
..
@@ -3855,7 +3760,7 @@
3855
3760
 
3856
3761
             radioPanel.revalidate();
3857
3762
             radioPanel.repaint();
3858
-            ctrlPanel.revalidate(); // ? new
3763
+            ctrlPanel.validate(); // ? new
3859
3764
             ctrlPanel.repaint();
3860
3765
         }
3861
3766
     }
..
..
@@ -4522,17 +4427,18 @@
4522
4427
     JPanel treePanel;
4523
4428
     JPanel radioPanel;
4524
4429
     ButtonGroup buttonGroup;
4525
-    JPanel ctrlPanel;
4526
-    JPanel materialPanel;
4430
+    cGridBag ctrlPanel;
4431
+    cGridBag materialPanel;
4527
4432
     JScrollPane infoPanel;
4528
-    JPanel optionsPanel;
4433
+    cGridBag optionsPanel;
4529
4434
     JTabbedPane objectPanel;
4530
-    JPanel XYZPanel;
4435
+    cGridBag XYZPanel;
4531
4436
     JSplitPane gridPanel;
4532
4437
     JSplitPane bigPanel;
4533
-    JPanel bigThree;
4534
-    JTabbedPane scenePanel;
4535
-    JPanel centralPanel;
4438
+    cGridBag bigThree;
4439
+    cGridBag scenePanel;
4440
+    cGridBag centralPanel;
4441
+    JSplitPane cameraPanel;
4536
4442
     JPanel timelinePanel;
4537
4443
     JMenuBar timelineMenubar;
4538
4444
     JSplitPane framePanel;
..
..
@@ -4584,67 +4490,67 @@
4584
4490
     // MATERIAL
4585
4491
     JLabel materialLabel;
4586
4492
     JLabel colorLabel;
4587
-    NumberSlider colorField;
4493
+    cNumberSlider colorField;
4588
4494
     JLabel modulationLabel;
4589
-    NumberSlider modulationField;
4495
+    cNumberSlider modulationField;
4590
4496
     JLabel metalnessLabel;
4591
-    NumberSlider metalnessField;
4497
+    cNumberSlider metalnessField;
4592
4498
     JLabel diffuseLabel;
4593
-    NumberSlider diffuseField;
4499
+    cNumberSlider diffuseField;
4594
4500
     JLabel specularLabel;
4595
-    NumberSlider specularField;
4501
+    cNumberSlider specularField;
4596
4502
     JLabel shininessLabel;
4597
-    NumberSlider shininessField;
4503
+    cNumberSlider shininessField;
4598
4504
     JLabel shiftLabel;
4599
-    NumberSlider shiftField;
4505
+    cNumberSlider shiftField;
4600
4506
     JLabel ambientLabel;
4601
-    NumberSlider ambientField;
4507
+    cNumberSlider ambientField;
4602
4508
     JLabel lightareaLabel;
4603
-    NumberSlider lightareaField;
4509
+    cNumberSlider lightareaField;
4604
4510
     JLabel diffusenessLabel;
4605
-    NumberSlider diffusenessField;
4511
+    cNumberSlider diffusenessField;
4606
4512
     JLabel velvetLabel;
4607
-    NumberSlider velvetField;
4513
+    cNumberSlider velvetField;
4608
4514
     JLabel sheenLabel;
4609
-    NumberSlider sheenField;
4515
+    cNumberSlider sheenField;
4610
4516
     JLabel subsurfaceLabel;
4611
-    NumberSlider subsurfaceField;
4517
+    cNumberSlider subsurfaceField;
4612
4518
     //JLabel bumpLabel;
4613
4519
     //NumberSlider bumpField;
4614
4520
     JLabel backlitLabel;
4615
-    NumberSlider backlitField;
4521
+    cNumberSlider backlitField;
4616
4522
     JLabel anisoLabel;
4617
-    NumberSlider anisoField;
4523
+    cNumberSlider anisoField;
4618
4524
     JLabel anisoVLabel;
4619
-    NumberSlider anisoVField;
4525
+    cNumberSlider anisoVField;
4620
4526
     JLabel cameraLabel;
4621
-    NumberSlider cameraField;
4527
+    cNumberSlider cameraField;
4622
4528
     JLabel selfshadowLabel;
4623
-    NumberSlider selfshadowField;
4529
+    cNumberSlider selfshadowField;
4624
4530
     JLabel shadowLabel;
4625
-    NumberSlider shadowField;
4531
+    cNumberSlider shadowField;
4626
4532
     JLabel textureLabel;
4627
-    NumberSlider textureField;
4533
+    cNumberSlider textureField;
4628
4534
     JLabel opacityLabel;
4629
-    NumberSlider opacityField;
4535
+    cNumberSlider opacityField;
4630
4536
     JLabel fakedepthLabel;
4631
-    NumberSlider fakedepthField;
4537
+    cNumberSlider fakedepthField;
4632
4538
     JLabel shadowbiasLabel;
4633
-    NumberSlider shadowbiasField;
4539
+    cNumberSlider shadowbiasField;
4634
4540
     JLabel bumpLabel;
4635
-    NumberSlider bumpField;
4541
+    cNumberSlider bumpField;
4636
4542
     JLabel noiseLabel;
4637
-    NumberSlider noiseField;
4543
+    cNumberSlider noiseField;
4638
4544
     JLabel powerLabel;
4639
-    NumberSlider powerField;
4545
+    cNumberSlider powerField;
4640
4546
     JLabel borderfadeLabel;
4641
-    NumberSlider borderfadeField;
4547
+    cNumberSlider borderfadeField;
4642
4548
     JLabel fogLabel;
4643
-    NumberSlider fogField;
4549
+    cNumberSlider fogField;
4644
4550
     JLabel opacityPowerLabel;
4645
-    NumberSlider opacityPowerField;
4551
+    cNumberSlider opacityPowerField;
4646
4552
     JTree jTree;
4647
4553
     //ObjectUI parent;
4648
4554
     
4649
-    NumberSlider normalpushField;
4555
+    cNumberSlider normalpushField;
4650
4556
 }