parent: c0c300a9 | patch | commit
Normand Briere
2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0 
Material pane
13 files modified
872 ■■■■■ changed files
BiparamEditor.java 6 ●●●●● patch | view | raw | blame | history
CameraPane.java 4 ●●●●● patch | view | raw | blame | history
GroupEditor.java 55 ●●●●● patch | view | raw | blame | history
KleinEditor.java 4 ●●●●● patch | view | raw | blame | history
MocapEditor.java 8 ●●●●● patch | view | raw | blame | history
MorphEditor.java 6 ●●●●● patch | view | raw | blame | history
ObjEditor.java 679 ●●●●● patch | view | raw | blame | history
ParticleEditor.java 28 ●●●●● patch | view | raw | blame | history
PointFlowEditor.java 28 ●●●●● patch | view | raw | blame | history
RandomEditor.java 4 ●●●●● patch | view | raw | blame | history
SwitchEditor.java 6 ●●●●● patch | view | raw | blame | history
TorusEditor.java 6 ●●●●● patch | view | raw | blame | history
cSpringEditor.java 38 ●●●●● patch | view | raw | blame | history 
 BiparamEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class BiparamEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
810 {
911     BiparamEditor(Biparam inBP, GroupEditor callee)
....@@ -263,8 +265,8 @@
263265     Biparam biparam;
264266     //JLabel uDivsLabel;
265267     //JLabel vDivsLabel;
266
-    NumberSlider uDivsField;
267
-    NumberSlider vDivsField;
268
+    cNumberSlider uDivsField;
269
+    cNumberSlider vDivsField;
268270     JCheckBox optionCB;
269271 
270272 	ObjectUI parent;


 CameraPane.java
....@@ -12747,7 +12747,7 @@
1274712747               "MUL final.y, fragment.texcoord[0].x, c256;" +
1274812748               "FLR final.x, final.y;" +
1274912749               "SUB final.y, final.y, final.x;" +
12750
-              "MUL final.x, final.x, c256i;" +
12750
+              //"MUL final.x, final.x, c256i;" +
1275112751               "MOV final.z, zero.x;" +
1275212752               "MOV final.a, one.w;":""
1275312753               ) +
....@@ -12755,7 +12755,7 @@
1275512755               "MUL final.y, fragment.texcoord[0].y, c256;" +
1275612756               "FLR final.x, final.y;" +
1275712757               "SUB final.y, final.y, final.x;" +
12758
-              "MUL final.x, final.x, c256i;" +
12758
+              //"MUL final.x, final.x, c256i;" +
1275912759               "MOV final.z, zero.x;" +
1276012760               "MOV final.a, one.w;":""
1276112761               ) +


 GroupEditor.java
....@@ -12,6 +12,7 @@
1212 import com.jme.math.Vector3f;
1313 import com.jme.renderer.ColorRGBA;
1414 
15
+import grafeme.ui.*;
1516 //import buoy.widget.BFileChooser;
1617 
1718 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
....@@ -604,15 +605,15 @@
604605         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605606 	}
606607         
607
-        void AddOptions(JPanel panel, GridBagConstraints constraints)
608
+        void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608609         {
609
-        	constraints.gridx = 0;
610
-        	constraints.gridy = 0;
611
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
610
+        	//constraints.gridx = 0;
611
+        	//constraints.gridy = 0;
612
+                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
612613                 fastCB.setToolTipText("Fast mode");
613614                                 fastCB.addItemListener(this);
614
-        	constraints.gridy += 1;
615
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
615
+        	//constraints.gridy += 1;
616
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
616617                 supportCB.setToolTipText("Enabled rigging");
617618                                 supportCB.addItemListener(this);
618619 
....@@ -620,26 +621,26 @@
620621         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621622         //                        localCB.addItemListener(this);
622623 
623
-        	constraints.gridy += 1;
624
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
624
+        	//constraints.gridy += 1;
625
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625626                 crowdCB.setToolTipText("Used for crowds");
626627                                 crowdCB.addItemListener(this);
627628 
628
-        	constraints.gridy += 1;
629
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
629
+        	//constraints.gridy += 1;
630
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630631                 smoothCB.setToolTipText("Snapping delay");
631632                                 smoothCB.addItemListener(this);
632633 
633
-        	constraints.gridy += 1;
634
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
634
+        	//constraints.gridy += 1;
635
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635636                 slowCB.setToolTipText("Smooth interpolation");
636637                                 slowCB.addItemListener(this);
637
-        	constraints.gridy += 1;
638
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
638
+        	//constraints.gridy += 1;
639
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639640                 boxCB.setToolTipText("Display bounding boxes");
640641                                 boxCB.addItemListener(this);
641
-        	constraints.gridy += 1;
642
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
642
+        	//constraints.gridy += 1;
643
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643644                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644645                                 zoomBoxCB.addItemListener(this);
645646 
....@@ -650,16 +651,16 @@
650651             if (false)
651652             {
652653                 // handled in scripts
653
-        	constraints.gridy += 1;
654
-                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
654
+        	//constraints.gridy += 1;
655
+                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655656                                 speakerCameraCB.addItemListener(this);
656657 
657
-        	constraints.gridy += 1;
658
-                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
658
+        	//constraints.gridy += 1;
659
+                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659660                                 speakerFocusCB.addItemListener(this);
660661 
661
-        	constraints.gridy += 1;
662
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
662
+        	//constraints.gridy += 1;
663
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663664                                 smoothfocusCB.addItemListener(this);
664665             }
665666 
....@@ -667,12 +668,12 @@
667668 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668669 //                debugCB.addItemListener(this);
669670 
670
-        	constraints.gridy += 1;
671
-                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
671
+        	//constraints.gridy += 1;
672
+                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672673                                 oeilCB.addItemListener(this);
673674 
674
-        	constraints.gridy += 1;
675
-                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
675
+        	//constraints.gridy += 1;
676
+                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676677                 lookAtCB.setToolTipText("Look-at target");
677678                                 lookAtCB.addItemListener(this);
678679 
....@@ -2916,7 +2917,7 @@
29162917                                 
29172918                                 child.editWindow = null; // ???????????
29182919 			}
2919
-			objEditor.ctrlPanel.revalidate();
2920
+			objEditor.ctrlPanel.validate();
29202921 			//objEditor.jTree.clearSelection();
29212922 			//objEditor.ResetSliders();
29222923                     refreshContents(true);


 KleinEditor.java
....@@ -8,6 +8,8 @@
88 import javax.swing.*;
99 import javax.swing.event.*;
1010 
11
+import grafeme.ui.*;
12
+
1113 class KleinEditor extends BiparamEditor implements ActionListener, ObjectUI
1214 {
1315     KleinEditor(Klein inSph, GroupEditor callee)
....@@ -94,7 +96,7 @@
9496     }
9597 
9698     Klein klein;
97
-    NumberSlider radiusField;
99
+    cNumberSlider radiusField;
98100 
99101 	public ObjEditor GetEditor()
100102 	{


 MocapEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class MocapEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -264,9 +266,9 @@
264266 	
265267     Mocap mocap;
266268     //JLabel frameLabel;
267
-    NumberSlider frameField;
268
-    NumberSlider firstField;
269
-    NumberSlider lastField;
269
+    cNumberSlider frameField;
270
+    cNumberSlider firstField;
271
+    cNumberSlider lastField;
270272     //JLabel speedLabel;
271273     //NumberSlider offsetField;
272274 


 MorphEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class MorphEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -64,7 +66,7 @@
6466 //            speedField = AddSlider(oe.ctrlPanel, "Damp: ", 0, 500, frameselect.speed);
6567 //            Return();
6668             
67
-            morphField = new NumberSlider[morphnode.morphobject.Size()];
69
+            morphField = new cNumberSlider[morphnode.morphobject.Size()];
6870             
6971             for (int i=0; i<morphnode.morphobject.Size(); i++)
7072             {
....@@ -192,7 +194,7 @@
192194     MorphNode morphnode;
193195     
194196     //JLabel morphLabel[];
195
-    NumberSlider morphField[];
197
+    cNumberSlider morphField[];
196198 
197199 	ObjectUI parent;
198200 	


 ObjEditor.java
....@@ -355,9 +355,9 @@
355355         toolbarPanel.setName("Toolbar");
356356         treePanel = new JPanel();
357357         treePanel.setName("Tree");
358
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
359359         ctrlPanel.setName("Edit");
360
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
361361         materialPanel.setName("Material");
362362         /*JTextPane*/
363363         infoarea = createTextPane();
....@@ -387,7 +387,7 @@
387387         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388388         treePanel.setLayout(new GridBagLayout());
389389         ctrlPanel.setLayout(new GridBagLayout());
390
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
391391 
392392         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393393                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -814,65 +814,47 @@
814814         return combo;
815815     }
816816 
817
-    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)
818818     {
819
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
820822 
821823         JLabel jlabel = new JLabel(label);
822
-
823
-        aConstraints.fill = GridBagConstraints.VERTICAL;
824824         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825
-        aConstraints.gridwidth = 1;
826
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827
-        aConstraints.gridx += 1;
828
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
829
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831
-        aConstraints.gridx += 1;
832
-        aConstraints.gridwidth = 1;
833
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834827         combo.setFloat(current);
835
-
836
-        combo.label = jlabel;
837
-
838
-        combo.addChangeListener(this);
839
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
840831         return combo;
841832     }
842833 
843
-    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)
844835     {
845
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
846839 
847840         JLabel jlabel = new JLabel(label);
848
-
849
-        aConstraints.fill = GridBagConstraints.VERTICAL;
850841         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851
-        aConstraints.gridwidth = 2;
852
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853
-        aConstraints.gridx += 1;
854
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
855
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
-        aConstraints.gridx += 1;
858
-        aConstraints.gridwidth = 1;
859
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860844         combo.setInteger(current);
861845 
862
-        combo.label = jlabel;
863
-
864
-        combo.addChangeListener(this);
865
-
846
+        ctrlPanel.add(control);
847
+        
866848         return combo;
867849     }
868850 
869
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
870852     {
871853         JTextArea text;
872854 
873855         aConstraints.fill = GridBagConstraints.HORIZONTAL;
874856         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876858         text.addCaretListener(this);
877859         aConstraints.gridx += 1;
878860         aConstraints.gridwidth = 1;
....@@ -902,6 +884,13 @@
902884     {
903885         j.removeChangeListener(this);
904886         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);
905894         objEditor.ctrlPanel.remove(j);
906895     }
907896 
....@@ -1296,11 +1285,11 @@
12961285 
12971286         tabbedPane.add(FSPane = new cFileSystemPane(this));
12981287 
1299
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
13001289 
13011290         optionsPanel.setName("Options");
13021291         
1303
-        AddOptions(optionsPanel, aConstraints);
1292
+        AddOptions(optionsPanel); //, aConstraints);
13041293         
13051294         tabbedPane.add(optionsPanel);
13061295         
....@@ -1411,7 +1400,7 @@
14111400         });
14121401     }
14131402 
1414
-    void AddOptions(JPanel panel, GridBagConstraints constraints)
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
14151404     {
14161405     }
14171406     
....@@ -1426,260 +1415,175 @@
14261415         ctrlPanel.removeAll();
14271416     }
14281417 
1429
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
14301419     {
1431
-        aConstraints.weighty = 0;
1432
-        //aConstraints.weightx = 1;
1433
-                /*
1420
+         /*
14341421         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14351422         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437
-        aConstraints.gridx += 1;
14381423          */
14391424 
1440
-        aConstraints.gridwidth = 1;
1441
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442
-        aConstraints.gridx += 1;
1443
-        aConstraints.weighty = 0;
1444
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
14451428 
14461429         /*
14471430         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448
-        aConstraints.gridx += 1;
1449
-        aConstraints.weighty = 0;
1450
-        aConstraints.gridwidth = 1;
14511431          */
14521432 
1453
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454
-        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);
14551437 
1456
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457
-
1458
-        aConstraints.gridx += 1;
1459
-
1460
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461
-
1462
-        aConstraints.gridx += 1;
1463
-
1464
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465
-
1466
-        aConstraints.gridx = 0;
1467
-        aConstraints.gridy += 1;
1468
-        aConstraints.weighty = 0;
1469
-        aConstraints.gridwidth = 1;
1438
+        ctrlPanel.add(editBar);
1439
+        
14701440         /**/
14711441         //aConstraints.weighty = 0;
14721442         ////aConstraints.weightx = 1;
14731443         //aConstraints.weighty = 1;
14741444         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14751445         //aConstraints.gridx += 1;
1476
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477
-        aConstraints.weighty = 0;
1478
-        aConstraints.gridx = 0;
1479
-        aConstraints.gridy += 1;
1480
-        aConstraints.gridwidth = 1;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14811447 
1482
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485
-        aConstraints.gridx += 1;
1486
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487
-        //aConstraints.weightx = 0;
1488
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489
-        aConstraints.gridx = 0;
1490
-        aConstraints.gridy += 1;
1491
-        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);
14921460 
1493
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496
-        aConstraints.gridx += 1;
1497
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499
-        aConstraints.gridx = 0;
1500
-        aConstraints.gridy += 1;
1501
-        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);
15021466 
1503
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506
-        aConstraints.gridx += 1;
1507
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509
-        aConstraints.gridx = 0;
1510
-        aConstraints.gridy += 1;
1511
-        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);
15121472 
1513
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516
-        aConstraints.gridx += 1;
1517
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519
-        aConstraints.gridx = 0;
1520
-        aConstraints.gridy += 1;
1521
-        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);
15221478 
1523
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526
-        aConstraints.gridx += 1;
1527
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529
-        aConstraints.gridx = 0;
1530
-        aConstraints.gridy += 1;
1531
-        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);
15321484 
1533
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536
-        aConstraints.gridx += 1;
1537
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539
-        aConstraints.gridx = 0;
1540
-        aConstraints.gridy += 1;
1541
-        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);
15421490 
1543
-        //aConstraints.weighty = 1;
1544
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545
-        //aConstraints.gridx += 1;
1546
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547
-        aConstraints.weighty = 0;
1548
-        aConstraints.gridx = 0;
1549
-        aConstraints.gridy += 1;
1550
-        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);
15511507 
1552
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555
-        aConstraints.gridx += 1;
1556
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558
-        aConstraints.gridx = 0;
1559
-        aConstraints.gridy += 1;
1560
-        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);
15611513 
1562
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565
-        aConstraints.gridx += 1;
1566
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568
-        aConstraints.gridx = 0;
1569
-        aConstraints.gridy += 1;
1570
-        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);
15711519 
1572
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575
-        aConstraints.gridx += 1;
1576
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578
-        aConstraints.gridx = 0;
1579
-        aConstraints.gridy += 1;
1580
-        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);
15811525 
1582
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585
-        aConstraints.gridx += 1;
1586
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588
-        aConstraints.gridx = 0;
1589
-        aConstraints.gridy += 1;
1590
-        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);
15911531 
1592
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595
-        aConstraints.gridx += 1;
1596
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598
-        aConstraints.gridx = 0;
1599
-        aConstraints.gridy += 1;
1600
-        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);
16011537 
1602
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605
-        aConstraints.gridx += 1;
1606
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608
-        aConstraints.gridx = 0;
1609
-        aConstraints.gridy += 1;
1610
-        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);
16111543 
1612
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615
-        aConstraints.gridx += 1;
1616
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618
-        aConstraints.gridx = 0;
1619
-        aConstraints.gridy += 1;
1620
-        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);
16211554 
1622
-        //aConstraints.weighty = 1;
1623
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624
-        //aConstraints.gridx += 1;
1625
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626
-        aConstraints.weighty = 0;
1627
-        aConstraints.gridx = 0;
1628
-        aConstraints.gridy += 1;
1629
-        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);
16301560 
1631
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634
-        aConstraints.gridx += 1;
1635
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637
-        aConstraints.gridx = 0;
1638
-        aConstraints.gridy += 1;
1639
-        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);
16401566 
1641
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644
-        aConstraints.gridx += 1;
1645
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647
-        aConstraints.gridx = 0;
1648
-        aConstraints.gridy += 1;
1649
-        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);
16501572 
1651
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654
-        aConstraints.gridx += 1;
1655
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657
-        aConstraints.gridx = 0;
1658
-        aConstraints.gridy += 1;
1659
-        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);
16601578 
1661
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664
-        aConstraints.gridx += 1;
1665
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667
-        aConstraints.gridx = 0;
1668
-        aConstraints.gridy += 1;
1669
-        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);
16701584 
1671
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674
-        aConstraints.gridx += 1;
1675
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677
-        aConstraints.gridx = 0;
1678
-        aConstraints.gridy += 1;
1679
-        aConstraints.gridwidth = 1;
1680
-
1681
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682
-        Return();
1585
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1586
+        //Return();
16831587 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16841588 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16851589 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1690,130 +1594,97 @@
16901594 //		aConstraints.gridy += 1;
16911595 //		aConstraints.gridwidth = 1;
16921596 
1693
-        //aConstraints.weighty = 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695
-        //aConstraints.gridx += 1;
1696
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697
-        aConstraints.weighty = 0;
1698
-        aConstraints.gridx = 0;
1699
-        aConstraints.gridy += 1;
1700
-        aConstraints.gridwidth = 1;
17011597 
1702
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705
-        aConstraints.gridx += 1;
1706
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708
-        aConstraints.gridx = 0;
1709
-        aConstraints.gridy += 1;
1710
-        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);
17111608 
1712
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715
-        aConstraints.gridx += 1;
1716
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718
-        aConstraints.gridx = 0;
1719
-        aConstraints.gridy += 1;
1720
-        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);
17211614 
1722
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725
-        aConstraints.gridx += 1;
1726
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728
-        aConstraints.gridx = 0;
1729
-        aConstraints.gridy += 1;
1730
-        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);
17311620 
1732
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735
-        aConstraints.gridx += 1;
1736
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738
-        aConstraints.gridx = 0;
1739
-        aConstraints.gridy += 1;
1740
-        aConstraints.gridwidth = 1;
1741
-        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);
17421626 
1743
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746
-        aConstraints.gridx += 1;
1747
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749
-        aConstraints.gridx = 0;
1750
-        aConstraints.gridy += 1;
1751
-        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);
17521632 
1753
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756
-        aConstraints.gridx += 1;
1757
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1759
-        aConstraints.gridx = 0;
1760
-        aConstraints.gridy += 1;
1761
-        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);
17621643 
1763
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766
-        aConstraints.gridx += 1;
1767
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769
-        aConstraints.gridx = 0;
1770
-        aConstraints.gridy += 1;
1771
-        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);
17721649 
1773
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776
-        aConstraints.gridx += 1;
1777
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779
-        aConstraints.gridx = 0;
1780
-        aConstraints.gridy += 1;
1781
-        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);
17821655 
1783
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786
-        aConstraints.gridx += 1;
1787
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789
-        aConstraints.gridx = 0;
1790
-        aConstraints.gridy += 1;
1791
-        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);
17921661 
1793
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796
-        aConstraints.gridx += 1;
1797
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1799
-        aConstraints.gridx = 0;
1800
-        aConstraints.gridy += 1;
1801
-        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);
18021667 
1803
-        //aConstraints.weighty = 1;
1804
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805
-        //aConstraints.gridx += 1;
1806
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807
-        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);
18081673 
1809
-        aConstraints.gridx = 0;
1810
-        aConstraints.gridy = 0;
1811
-        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);
18121683 
18131684         SetMaterial(copy); // .GetMaterial());
18141685 
1815
-        colorField.addChangeListener(this);
1816
-        modulationField.addChangeListener(this);
1686
+        //colorField.addChangeListener(this);
1687
+//        modulationField.addChangeListener(this);
18171688         metalnessField.addChangeListener(this);
18181689         diffuseField.addChangeListener(this);
18191690         specularField.addChangeListener(this);
....@@ -3516,7 +3387,7 @@
35163387             current.fakedepth = (float) fakedepthField.getFloat();
35173388             current.shadowbias = (float) shadowbiasField.getFloat();
35183389 
3519
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
35203391             {
35213392                 //System.out.println("Propagate = " + propagate);
35223393                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3889,7 +3760,7 @@
38893760 
38903761             radioPanel.revalidate();
38913762             radioPanel.repaint();
3892
-            ctrlPanel.revalidate(); // ? new
3763
+            ctrlPanel.validate(); // ? new
38933764             ctrlPanel.repaint();
38943765         }
38953766     }
....@@ -4556,10 +4427,10 @@
45564427     JPanel treePanel;
45574428     JPanel radioPanel;
45584429     ButtonGroup buttonGroup;
4559
-    JPanel ctrlPanel;
4560
-    JPanel materialPanel;
4430
+    cGridBag ctrlPanel;
4431
+    cGridBag materialPanel;
45614432     JScrollPane infoPanel;
4562
-    JPanel optionsPanel;
4433
+    cGridBag optionsPanel;
45634434     JTabbedPane objectPanel;
45644435     cGridBag XYZPanel;
45654436     JSplitPane gridPanel;
....@@ -4619,67 +4490,67 @@
46194490     // MATERIAL
46204491     JLabel materialLabel;
46214492     JLabel colorLabel;
4622
-    NumberSlider colorField;
4493
+    cNumberSlider colorField;
46234494     JLabel modulationLabel;
4624
-    NumberSlider modulationField;
4495
+    cNumberSlider modulationField;
46254496     JLabel metalnessLabel;
4626
-    NumberSlider metalnessField;
4497
+    cNumberSlider metalnessField;
46274498     JLabel diffuseLabel;
4628
-    NumberSlider diffuseField;
4499
+    cNumberSlider diffuseField;
46294500     JLabel specularLabel;
4630
-    NumberSlider specularField;
4501
+    cNumberSlider specularField;
46314502     JLabel shininessLabel;
4632
-    NumberSlider shininessField;
4503
+    cNumberSlider shininessField;
46334504     JLabel shiftLabel;
4634
-    NumberSlider shiftField;
4505
+    cNumberSlider shiftField;
46354506     JLabel ambientLabel;
4636
-    NumberSlider ambientField;
4507
+    cNumberSlider ambientField;
46374508     JLabel lightareaLabel;
4638
-    NumberSlider lightareaField;
4509
+    cNumberSlider lightareaField;
46394510     JLabel diffusenessLabel;
4640
-    NumberSlider diffusenessField;
4511
+    cNumberSlider diffusenessField;
46414512     JLabel velvetLabel;
4642
-    NumberSlider velvetField;
4513
+    cNumberSlider velvetField;
46434514     JLabel sheenLabel;
4644
-    NumberSlider sheenField;
4515
+    cNumberSlider sheenField;
46454516     JLabel subsurfaceLabel;
4646
-    NumberSlider subsurfaceField;
4517
+    cNumberSlider subsurfaceField;
46474518     //JLabel bumpLabel;
46484519     //NumberSlider bumpField;
46494520     JLabel backlitLabel;
4650
-    NumberSlider backlitField;
4521
+    cNumberSlider backlitField;
46514522     JLabel anisoLabel;
4652
-    NumberSlider anisoField;
4523
+    cNumberSlider anisoField;
46534524     JLabel anisoVLabel;
4654
-    NumberSlider anisoVField;
4525
+    cNumberSlider anisoVField;
46554526     JLabel cameraLabel;
4656
-    NumberSlider cameraField;
4527
+    cNumberSlider cameraField;
46574528     JLabel selfshadowLabel;
4658
-    NumberSlider selfshadowField;
4529
+    cNumberSlider selfshadowField;
46594530     JLabel shadowLabel;
4660
-    NumberSlider shadowField;
4531
+    cNumberSlider shadowField;
46614532     JLabel textureLabel;
4662
-    NumberSlider textureField;
4533
+    cNumberSlider textureField;
46634534     JLabel opacityLabel;
4664
-    NumberSlider opacityField;
4535
+    cNumberSlider opacityField;
46654536     JLabel fakedepthLabel;
4666
-    NumberSlider fakedepthField;
4537
+    cNumberSlider fakedepthField;
46674538     JLabel shadowbiasLabel;
4668
-    NumberSlider shadowbiasField;
4539
+    cNumberSlider shadowbiasField;
46694540     JLabel bumpLabel;
4670
-    NumberSlider bumpField;
4541
+    cNumberSlider bumpField;
46714542     JLabel noiseLabel;
4672
-    NumberSlider noiseField;
4543
+    cNumberSlider noiseField;
46734544     JLabel powerLabel;
4674
-    NumberSlider powerField;
4545
+    cNumberSlider powerField;
46754546     JLabel borderfadeLabel;
4676
-    NumberSlider borderfadeField;
4547
+    cNumberSlider borderfadeField;
46774548     JLabel fogLabel;
4678
-    NumberSlider fogField;
4549
+    cNumberSlider fogField;
46794550     JLabel opacityPowerLabel;
4680
-    NumberSlider opacityPowerField;
4551
+    cNumberSlider opacityPowerField;
46814552     JTree jTree;
46824553     //ObjectUI parent;
46834554     
4684
-    NumberSlider normalpushField;
4555
+    cNumberSlider normalpushField;
46854556 }


 ParticleEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class ParticleEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -289,19 +291,19 @@
289291     
290292     ParticleSystem particlesystem;
291293     
292
-    NumberSlider particlesField;
293
-    NumberSlider velocityField;
294
-    NumberSlider timestepField;
295
-    NumberSlider delayField;
296
-    NumberSlider sizeminField;
297
-    NumberSlider sizemaxField;
298
-    NumberSlider angleminField;
299
-    NumberSlider anglemaxField;
300
-    NumberSlider lifeminField;
301
-    NumberSlider lifemaxField;
302
-    NumberSlider densityField;
303
-    NumberSlider gravityField;
304
-    NumberSlider standbyField;
294
+    cNumberSlider particlesField;
295
+    cNumberSlider velocityField;
296
+    cNumberSlider timestepField;
297
+    cNumberSlider delayField;
298
+    cNumberSlider sizeminField;
299
+    cNumberSlider sizemaxField;
300
+    cNumberSlider angleminField;
301
+    cNumberSlider anglemaxField;
302
+    cNumberSlider lifeminField;
303
+    cNumberSlider lifemaxField;
304
+    cNumberSlider densityField;
305
+    cNumberSlider gravityField;
306
+    cNumberSlider standbyField;
305307     
306308     ObjectUI parent;
307309     //ObjEditor objEditor;


 PointFlowEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class PointFlowEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -289,19 +291,19 @@
289291     
290292     PointFlow particlesystem;
291293     
292
-    NumberSlider resizefactorField;
293
-    NumberSlider velocityField;
294
-    NumberSlider timestepField;
295
-    NumberSlider delayField;
296
-    NumberSlider sizeminField;
297
-    NumberSlider sizemaxField;
298
-    NumberSlider angleminField;
299
-    NumberSlider anglemaxField;
300
-    NumberSlider lifeminField;
301
-    NumberSlider lifemaxField;
302
-    NumberSlider densityField;
303
-    NumberSlider gravityField;
304
-    NumberSlider standbyField;
294
+    cNumberSlider resizefactorField;
295
+    cNumberSlider velocityField;
296
+    cNumberSlider timestepField;
297
+    cNumberSlider delayField;
298
+    cNumberSlider sizeminField;
299
+    cNumberSlider sizemaxField;
300
+    cNumberSlider angleminField;
301
+    cNumberSlider anglemaxField;
302
+    cNumberSlider lifeminField;
303
+    cNumberSlider lifemaxField;
304
+    cNumberSlider densityField;
305
+    cNumberSlider gravityField;
306
+    cNumberSlider standbyField;
305307     
306308     ObjectUI parent;
307309     //ObjEditor objEditor;


 RandomEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class RandomEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -122,7 +124,7 @@
122124 	}
123125 	
124126     RandomNode switchnode;
125
-    NumberSlider frameField;
127
+    cNumberSlider frameField;
126128 
127129 	ObjectUI parent;
128130 	


 SwitchEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class SwitchEditor extends ObjEditor implements //ItemListener,
810         ChangeListener, ObjectUI, ActionListener
911 {
....@@ -241,9 +243,9 @@
241243 	
242244     SwitchNode switchnode;
243245 //    JLabel frameLabel;
244
-    NumberSlider frameField;
246
+    cNumberSlider frameField;
245247 //    JLabel speedLabel;
246
-    NumberSlider speedField;
248
+    cNumberSlider speedField;
247249 
248250 	ObjectUI parent;
249251 	


 TorusEditor.java
....@@ -8,6 +8,8 @@
88 import javax.swing.*;
99 import javax.swing.event.*;
1010 
11
+import grafeme.ui.*;
12
+
1113 class TorusEditor extends BiparamEditor implements ChangeListener, ObjectUI
1214 {
1315 	TorusEditor(Torus t, GroupEditor callee)
....@@ -154,8 +156,8 @@
154156     Torus torus;
155157     JLabel majorLabel;
156158     JLabel minorLabel;
157
-    NumberSlider majorField;
158
-    NumberSlider minorField;
159
+    cNumberSlider majorField;
160
+    cNumberSlider minorField;
159161 	
160162 	//BiparamEditor objEditor;
161163 }


 cSpringEditor.java
....@@ -4,6 +4,8 @@
44 import javax.swing.*;
55 import javax.swing.event.*;
66 
7
+import grafeme.ui.*;
8
+
79 class cSpringEditor extends ObjEditor implements ItemListener, ChangeListener, ObjectUI, ActionListener
810 {
911 
....@@ -748,25 +750,25 @@
748750     JLabel liftLabel;
749751     JLabel solidityLabel;
750752     
751
-    NumberSlider stiffnessField;
752
-    NumberSlider massField;
753
-    NumberSlider gravityField;
754
-    NumberSlider normalField;
755
-    NumberSlider mgravityField;
756
-    NumberSlider fluidspeedField;
757
-    NumberSlider viscosityField;
758
-    NumberSlider floorField;
759
-    NumberSlider limitField;
760
-    NumberSlider restlengthField;
761
-    NumberSlider distortionField;
762
-    NumberSlider frictionField;
763
-    NumberSlider timestepField;
764
-    NumberSlider poseslownessField;
765
-    NumberSlider dampingField;
766
-    NumberSlider liftField;
767
-    NumberSlider solidityField;
753
+    cNumberSlider stiffnessField;
754
+    cNumberSlider massField;
755
+    cNumberSlider gravityField;
756
+    cNumberSlider normalField;
757
+    cNumberSlider mgravityField;
758
+    cNumberSlider fluidspeedField;
759
+    cNumberSlider viscosityField;
760
+    cNumberSlider floorField;
761
+    cNumberSlider limitField;
762
+    cNumberSlider restlengthField;
763
+    cNumberSlider distortionField;
764
+    cNumberSlider frictionField;
765
+    cNumberSlider timestepField;
766
+    cNumberSlider poseslownessField;
767
+    cNumberSlider dampingField;
768
+    cNumberSlider liftField;
769
+    cNumberSlider solidityField;
768770 
769
-    NumberSlider poseField;
771
+    cNumberSlider poseField;
770772     
771773 //    JCheckBox animate;
772774     JCheckBox thick;