blame | history | patch | commit | commitdiff
Normand Briere
2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -353,9 +355,9 @@
353355         toolbarPanel.setName("Toolbar");
354356         treePanel = new JPanel();
355357         treePanel.setName("Tree");
356
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
357359         ctrlPanel.setName("Edit");
358
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
359361         materialPanel.setName("Material");
360362         /*JTextPane*/
361363         infoarea = createTextPane();
....@@ -385,7 +387,7 @@
385387         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386388         treePanel.setLayout(new GridBagLayout());
387389         ctrlPanel.setLayout(new GridBagLayout());
388
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
389391 
390392         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391393                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -812,65 +814,47 @@
812814         return combo;
813815     }
814816 
815
-    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)
816818     {
817
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
818822 
819823         JLabel jlabel = new JLabel(label);
820
-
821
-        aConstraints.fill = GridBagConstraints.VERTICAL;
822824         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
-        aConstraints.gridwidth = 1;
824
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
-        aConstraints.gridx += 1;
826
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
-        aConstraints.gridx += 1;
830
-        aConstraints.gridwidth = 1;
831
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832827         combo.setFloat(current);
833
-
834
-        combo.label = jlabel;
835
-
836
-        combo.addChangeListener(this);
837
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
838831         return combo;
839832     }
840833 
841
-    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)
842835     {
843
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
844839 
845840         JLabel jlabel = new JLabel(label);
846
-
847
-        aConstraints.fill = GridBagConstraints.VERTICAL;
848841         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849
-        aConstraints.gridwidth = 2;
850
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851
-        aConstraints.gridx += 1;
852
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
853
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855
-        aConstraints.gridx += 1;
856
-        aConstraints.gridwidth = 1;
857
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858844         combo.setInteger(current);
859845 
860
-        combo.label = jlabel;
861
-
862
-        combo.addChangeListener(this);
863
-
846
+        ctrlPanel.add(control);
847
+        
864848         return combo;
865849     }
866850 
867
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
868852     {
869853         JTextArea text;
870854 
871855         aConstraints.fill = GridBagConstraints.HORIZONTAL;
872856         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874858         text.addCaretListener(this);
875859         aConstraints.gridx += 1;
876860         aConstraints.gridwidth = 1;
....@@ -900,6 +884,13 @@
900884     {
901885         j.removeChangeListener(this);
902886         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);
903894         objEditor.ctrlPanel.remove(j);
904895     }
905896 
....@@ -1187,7 +1178,8 @@
11871178         //JPanel worldPanel =
11881179         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11891180         //worldPanel.setName("World");
1190
-	centralPanel = new JPanel(new BorderLayout());
1181
+	centralPanel = new cGridBag();
1182
+        centralPanel.preferredWidth = 20;
11911183 	timelinePanel = new JPanel(new BorderLayout());
11921184         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11931185 
....@@ -1217,12 +1209,13 @@
12171209         //frontView.object = copy;
12181210         //sideView.object = copy;
12191211 
1220
-        XYZPanel = new JPanel();
1221
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212
+        XYZPanel = new cGridBag().setVertical(true);
1213
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12221214 
1223
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
-        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);
12261219 
12271220         /*
12281221         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1284,16 +1277,23 @@
12841277         scrollpane.setWheelScrollingEnabled(true);
12851278         scrollpane.addMouseWheelListener(this); // Default not fast enough
12861279 
1287
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
-        scenePanel.add(scrollpane);
1280
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1281
+        scenePanel.preferredWidth = 7;
1282
+        
1283
+        JTabbedPane tabbedPane = new JTabbedPane();
1284
+        tabbedPane.add(scrollpane);
12891285 
1290
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12911287 
1292
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
12931289 
12941290         optionsPanel.setName("Options");
1295
-        scenePanel.add(optionsPanel);
1296
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
12971297 
12981298         /*
12991299         cTree jTree = new cTree(null);
....@@ -1327,6 +1327,7 @@
13271327         //bigPanel.setSize(new Dimension(10,10));
13281328         //bigPanel.add(ctrlPanel);
13291329         //bigPanel.add(gridPanel);
1330
+        /**
13301331         bigThree = new JPanel();
13311332         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13321333         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1350,7 +1351,13 @@
13501351         //	aConstraints.gridheight = 3;
13511352         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13521353         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
13531355 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
13541361 //                // SIDE EFFECT!!!
13551362 //		aConstraints.gridx = 0;
13561363 //		aConstraints.gridy = 0;
....@@ -1393,6 +1400,10 @@
13931400         });
13941401     }
13951402 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
13961407     JTree GetTree()
13971408     {
13981409         return objEditor.jTree;
....@@ -1404,260 +1415,175 @@
14041415         ctrlPanel.removeAll();
14051416     }
14061417 
1407
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
14081419     {
1409
-        aConstraints.weighty = 0;
1410
-        //aConstraints.weightx = 1;
1411
-                /*
1420
+         /*
14121421         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14131422         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415
-        aConstraints.gridx += 1;
14161423          */
14171424 
1418
-        aConstraints.gridwidth = 1;
1419
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420
-        aConstraints.gridx += 1;
1421
-        aConstraints.weighty = 0;
1422
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
14231428 
14241429         /*
14251430         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426
-        aConstraints.gridx += 1;
1427
-        aConstraints.weighty = 0;
1428
-        aConstraints.gridwidth = 1;
14291431          */
14301432 
1431
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432
-        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);
14331437 
1434
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435
-
1436
-        aConstraints.gridx += 1;
1437
-
1438
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439
-
1440
-        aConstraints.gridx += 1;
1441
-
1442
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443
-
1444
-        aConstraints.gridx = 0;
1445
-        aConstraints.gridy += 1;
1446
-        aConstraints.weighty = 0;
1447
-        aConstraints.gridwidth = 1;
1438
+        ctrlPanel.add(editBar);
1439
+        
14481440         /**/
14491441         //aConstraints.weighty = 0;
14501442         ////aConstraints.weightx = 1;
14511443         //aConstraints.weighty = 1;
14521444         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14531445         //aConstraints.gridx += 1;
1454
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455
-        aConstraints.weighty = 0;
1456
-        aConstraints.gridx = 0;
1457
-        aConstraints.gridy += 1;
1458
-        aConstraints.gridwidth = 1;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14591447 
1460
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
-        aConstraints.gridx += 1;
1464
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
-        //aConstraints.weightx = 0;
1466
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
-        aConstraints.gridx = 0;
1468
-        aConstraints.gridy += 1;
1469
-        aConstraints.gridwidth = 1;
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);
14701460 
1471
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
-        aConstraints.gridx += 1;
1475
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
-        aConstraints.gridx = 0;
1478
-        aConstraints.gridy += 1;
1479
-        aConstraints.gridwidth = 1;
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);
14801466 
1481
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
-        aConstraints.gridx += 1;
1485
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
-        aConstraints.gridx = 0;
1488
-        aConstraints.gridy += 1;
1489
-        aConstraints.gridwidth = 1;
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);
14901472 
1491
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
-        aConstraints.gridx += 1;
1495
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
-        aConstraints.gridx = 0;
1498
-        aConstraints.gridy += 1;
1499
-        aConstraints.gridwidth = 1;
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);
15001478 
1501
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
-        aConstraints.gridx += 1;
1505
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507
-        aConstraints.gridx = 0;
1508
-        aConstraints.gridy += 1;
1509
-        aConstraints.gridwidth = 1;
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);
15101484 
1511
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514
-        aConstraints.gridx += 1;
1515
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517
-        aConstraints.gridx = 0;
1518
-        aConstraints.gridy += 1;
1519
-        aConstraints.gridwidth = 1;
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);
15201490 
1521
-        //aConstraints.weighty = 1;
1522
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523
-        //aConstraints.gridx += 1;
1524
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525
-        aConstraints.weighty = 0;
1526
-        aConstraints.gridx = 0;
1527
-        aConstraints.gridy += 1;
1528
-        aConstraints.gridwidth = 1;
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);
15291507 
1530
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
-        aConstraints.gridx += 1;
1534
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
-        aConstraints.gridx = 0;
1537
-        aConstraints.gridy += 1;
1538
-        aConstraints.gridwidth = 1;
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);
15391513 
1540
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
-        aConstraints.gridx += 1;
1544
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
-        aConstraints.gridx = 0;
1547
-        aConstraints.gridy += 1;
1548
-        aConstraints.gridwidth = 1;
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);
15491519 
1550
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
-        aConstraints.gridx += 1;
1554
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
-        aConstraints.gridx = 0;
1557
-        aConstraints.gridy += 1;
1558
-        aConstraints.gridwidth = 1;
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);
15591525 
1560
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
-        aConstraints.gridx += 1;
1564
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566
-        aConstraints.gridx = 0;
1567
-        aConstraints.gridy += 1;
1568
-        aConstraints.gridwidth = 1;
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);
15691531 
1570
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
-        aConstraints.gridx += 1;
1574
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576
-        aConstraints.gridx = 0;
1577
-        aConstraints.gridy += 1;
1578
-        aConstraints.gridwidth = 1;
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);
15791537 
1580
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
-        aConstraints.gridx += 1;
1584
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
-        aConstraints.gridx = 0;
1587
-        aConstraints.gridy += 1;
1588
-        aConstraints.gridwidth = 1;
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);
15891543 
1590
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593
-        aConstraints.gridx += 1;
1594
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596
-        aConstraints.gridx = 0;
1597
-        aConstraints.gridy += 1;
1598
-        aConstraints.gridwidth = 1;
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);
15991554 
1600
-        //aConstraints.weighty = 1;
1601
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602
-        //aConstraints.gridx += 1;
1603
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604
-        aConstraints.weighty = 0;
1605
-        aConstraints.gridx = 0;
1606
-        aConstraints.gridy += 1;
1607
-        aConstraints.gridwidth = 1;
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);
16081560 
1609
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
-        aConstraints.gridx += 1;
1613
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
-        aConstraints.gridx = 0;
1616
-        aConstraints.gridy += 1;
1617
-        aConstraints.gridwidth = 1;
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);
16181566 
1619
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
-        aConstraints.gridx += 1;
1623
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
-        aConstraints.gridx = 0;
1626
-        aConstraints.gridy += 1;
1627
-        aConstraints.gridwidth = 1;
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);
16281572 
1629
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
-        aConstraints.gridx += 1;
1633
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635
-        aConstraints.gridx = 0;
1636
-        aConstraints.gridy += 1;
1637
-        aConstraints.gridwidth = 1;
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);
16381578 
1639
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
-        aConstraints.gridx += 1;
1643
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645
-        aConstraints.gridx = 0;
1646
-        aConstraints.gridy += 1;
1647
-        aConstraints.gridwidth = 1;
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);
16481584 
1649
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
-        aConstraints.gridx += 1;
1653
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
-        aConstraints.gridx = 0;
1656
-        aConstraints.gridy += 1;
1657
-        aConstraints.gridwidth = 1;
1658
-
1659
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660
-        Return();
1585
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1586
+        //Return();
16611587 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16621588 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16631589 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1668,130 +1594,97 @@
16681594 //		aConstraints.gridy += 1;
16691595 //		aConstraints.gridwidth = 1;
16701596 
1671
-        //aConstraints.weighty = 1;
1672
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673
-        //aConstraints.gridx += 1;
1674
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675
-        aConstraints.weighty = 0;
1676
-        aConstraints.gridx = 0;
1677
-        aConstraints.gridy += 1;
1678
-        aConstraints.gridwidth = 1;
16791597 
1680
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
-        aConstraints.gridx += 1;
1684
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
-        aConstraints.gridx = 0;
1687
-        aConstraints.gridy += 1;
1688
-        aConstraints.gridwidth = 1;
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);
16891608 
1690
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
-        aConstraints.gridx += 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
-        aConstraints.gridx = 0;
1697
-        aConstraints.gridy += 1;
1698
-        aConstraints.gridwidth = 1;
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);
16991614 
1700
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
-        aConstraints.gridx += 1;
1704
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706
-        aConstraints.gridx = 0;
1707
-        aConstraints.gridy += 1;
1708
-        aConstraints.gridwidth = 1;
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);
17091620 
1710
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
-        aConstraints.gridx += 1;
1714
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716
-        aConstraints.gridx = 0;
1717
-        aConstraints.gridy += 1;
1718
-        aConstraints.gridwidth = 1;
1719
-        aConstraints.weighty = 0;
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);
17201626 
1721
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
-        aConstraints.gridx += 1;
1725
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727
-        aConstraints.gridx = 0;
1728
-        aConstraints.gridy += 1;
1729
-        aConstraints.gridwidth = 1;
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);
17301632 
1731
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
-        aConstraints.gridx += 1;
1735
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1737
-        aConstraints.gridx = 0;
1738
-        aConstraints.gridy += 1;
1739
-        aConstraints.gridwidth = 1;
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);
17401643 
1741
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
-        aConstraints.gridx += 1;
1745
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747
-        aConstraints.gridx = 0;
1748
-        aConstraints.gridy += 1;
1749
-        aConstraints.gridwidth = 1;
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);
17501649 
1751
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
-        aConstraints.gridx += 1;
1755
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757
-        aConstraints.gridx = 0;
1758
-        aConstraints.gridy += 1;
1759
-        aConstraints.gridwidth = 1;
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);
17601655 
1761
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
-        aConstraints.gridx += 1;
1765
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767
-        aConstraints.gridx = 0;
1768
-        aConstraints.gridy += 1;
1769
-        aConstraints.gridwidth = 1;
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);
17701661 
1771
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774
-        aConstraints.gridx += 1;
1775
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1777
-        aConstraints.gridx = 0;
1778
-        aConstraints.gridy += 1;
1779
-        aConstraints.gridwidth = 1;
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);
17801667 
1781
-        //aConstraints.weighty = 1;
1782
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783
-        //aConstraints.gridx += 1;
1784
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785
-        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);
17861673 
1787
-        aConstraints.gridx = 0;
1788
-        aConstraints.gridy = 0;
1789
-        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);
17901683 
17911684         SetMaterial(copy); // .GetMaterial());
17921685 
1793
-        colorField.addChangeListener(this);
1794
-        modulationField.addChangeListener(this);
1686
+        //colorField.addChangeListener(this);
1687
+//        modulationField.addChangeListener(this);
17951688         metalnessField.addChangeListener(this);
17961689         diffuseField.addChangeListener(this);
17971690         specularField.addChangeListener(this);
....@@ -3494,7 +3387,7 @@
34943387             current.fakedepth = (float) fakedepthField.getFloat();
34953388             current.shadowbias = (float) shadowbiasField.getFloat();
34963389 
3497
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
34983391             {
34993392                 //System.out.println("Propagate = " + propagate);
35003393                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3867,7 +3760,7 @@
38673760 
38683761             radioPanel.revalidate();
38693762             radioPanel.repaint();
3870
-            ctrlPanel.revalidate(); // ? new
3763
+            ctrlPanel.validate(); // ? new
38713764             ctrlPanel.repaint();
38723765         }
38733766     }
....@@ -4534,17 +4427,17 @@
45344427     JPanel treePanel;
45354428     JPanel radioPanel;
45364429     ButtonGroup buttonGroup;
4537
-    JPanel ctrlPanel;
4538
-    JPanel materialPanel;
4430
+    cGridBag ctrlPanel;
4431
+    cGridBag materialPanel;
45394432     JScrollPane infoPanel;
4540
-    JPanel optionsPanel;
4433
+    cGridBag optionsPanel;
45414434     JTabbedPane objectPanel;
4542
-    JPanel XYZPanel;
4435
+    cGridBag XYZPanel;
45434436     JSplitPane gridPanel;
45444437     JSplitPane bigPanel;
4545
-    JPanel bigThree;
4546
-    JTabbedPane scenePanel;
4547
-    JPanel centralPanel;
4438
+    cGridBag bigThree;
4439
+    cGridBag scenePanel;
4440
+    cGridBag centralPanel;
45484441     JSplitPane cameraPanel;
45494442     JPanel timelinePanel;
45504443     JMenuBar timelineMenubar;
....@@ -4597,67 +4490,67 @@
45974490     // MATERIAL
45984491     JLabel materialLabel;
45994492     JLabel colorLabel;
4600
-    NumberSlider colorField;
4493
+    cNumberSlider colorField;
46014494     JLabel modulationLabel;
4602
-    NumberSlider modulationField;
4495
+    cNumberSlider modulationField;
46034496     JLabel metalnessLabel;
4604
-    NumberSlider metalnessField;
4497
+    cNumberSlider metalnessField;
46054498     JLabel diffuseLabel;
4606
-    NumberSlider diffuseField;
4499
+    cNumberSlider diffuseField;
46074500     JLabel specularLabel;
4608
-    NumberSlider specularField;
4501
+    cNumberSlider specularField;
46094502     JLabel shininessLabel;
4610
-    NumberSlider shininessField;
4503
+    cNumberSlider shininessField;
46114504     JLabel shiftLabel;
4612
-    NumberSlider shiftField;
4505
+    cNumberSlider shiftField;
46134506     JLabel ambientLabel;
4614
-    NumberSlider ambientField;
4507
+    cNumberSlider ambientField;
46154508     JLabel lightareaLabel;
4616
-    NumberSlider lightareaField;
4509
+    cNumberSlider lightareaField;
46174510     JLabel diffusenessLabel;
4618
-    NumberSlider diffusenessField;
4511
+    cNumberSlider diffusenessField;
46194512     JLabel velvetLabel;
4620
-    NumberSlider velvetField;
4513
+    cNumberSlider velvetField;
46214514     JLabel sheenLabel;
4622
-    NumberSlider sheenField;
4515
+    cNumberSlider sheenField;
46234516     JLabel subsurfaceLabel;
4624
-    NumberSlider subsurfaceField;
4517
+    cNumberSlider subsurfaceField;
46254518     //JLabel bumpLabel;
46264519     //NumberSlider bumpField;
46274520     JLabel backlitLabel;
4628
-    NumberSlider backlitField;
4521
+    cNumberSlider backlitField;
46294522     JLabel anisoLabel;
4630
-    NumberSlider anisoField;
4523
+    cNumberSlider anisoField;
46314524     JLabel anisoVLabel;
4632
-    NumberSlider anisoVField;
4525
+    cNumberSlider anisoVField;
46334526     JLabel cameraLabel;
4634
-    NumberSlider cameraField;
4527
+    cNumberSlider cameraField;
46354528     JLabel selfshadowLabel;
4636
-    NumberSlider selfshadowField;
4529
+    cNumberSlider selfshadowField;
46374530     JLabel shadowLabel;
4638
-    NumberSlider shadowField;
4531
+    cNumberSlider shadowField;
46394532     JLabel textureLabel;
4640
-    NumberSlider textureField;
4533
+    cNumberSlider textureField;
46414534     JLabel opacityLabel;
4642
-    NumberSlider opacityField;
4535
+    cNumberSlider opacityField;
46434536     JLabel fakedepthLabel;
4644
-    NumberSlider fakedepthField;
4537
+    cNumberSlider fakedepthField;
46454538     JLabel shadowbiasLabel;
4646
-    NumberSlider shadowbiasField;
4539
+    cNumberSlider shadowbiasField;
46474540     JLabel bumpLabel;
4648
-    NumberSlider bumpField;
4541
+    cNumberSlider bumpField;
46494542     JLabel noiseLabel;
4650
-    NumberSlider noiseField;
4543
+    cNumberSlider noiseField;
46514544     JLabel powerLabel;
4652
-    NumberSlider powerField;
4545
+    cNumberSlider powerField;
46534546     JLabel borderfadeLabel;
4654
-    NumberSlider borderfadeField;
4547
+    cNumberSlider borderfadeField;
46554548     JLabel fogLabel;
4656
-    NumberSlider fogField;
4549
+    cNumberSlider fogField;
46574550     JLabel opacityPowerLabel;
4658
-    NumberSlider opacityPowerField;
4551
+    cNumberSlider opacityPowerField;
46594552     JTree jTree;
46604553     //ObjectUI parent;
46614554     
4662
-    NumberSlider normalpushField;
4555
+    cNumberSlider normalpushField;
46634556 }