blame | history | patch | commit | commitdiff
Normand Briere
2019-04-29 8c837a9e50c29e66bdf5bd7ea2fd15b1a7d5d598 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -31,6 +33,9 @@
3133         boolean timeline;
3234         boolean wasFullScreen;
3335 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
3439     // SCRIPT
3540     
3641     transient JFrame textpanel = null;
....@@ -121,14 +126,13 @@
121126     void keyPressed(int key, int modifiers)
122127     {
123128     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
125130     }
126131      */
127132 
128133     static GridBagConstraints aConstraints;
129134     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
135
+
132136     static int GRIDWIDTH = 100; // 4;
133137 
134138     public void closeUI()
....@@ -160,12 +164,16 @@
160164         objEditor.ctrlPanel.remove(slowerButton);
161165         objEditor.ctrlPanel.remove(fasterButton);
162166         objEditor.ctrlPanel.remove(remarkButton);
167
+        
168
+        Remove(normalpushField);
163169     }
164170 
165171     public ObjEditor GetEditor()
166172     {
167173         return objEditor; //.GetEditor();
168174     }
175
+    
176
+    // Sometimes myself, sometimes my callee's.
169177     ObjEditor objEditor;
170178 
171179     /*
....@@ -305,7 +313,7 @@
305313         toggleTextureItem.setState(CameraPane.textureon);
306314         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307315         toggleLiveItem.addItemListener(this);
308
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
309317         cameraMenu.add(stepItem = new MenuItem("Step"));
310318         stepItem.addActionListener(this);
311319 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -347,9 +355,9 @@
347355         toolbarPanel.setName("Toolbar");
348356         treePanel = new JPanel();
349357         treePanel.setName("Tree");
350
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
351359         ctrlPanel.setName("Edit");
352
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
353361         materialPanel.setName("Material");
354362         /*JTextPane*/
355363         infoarea = createTextPane();
....@@ -379,7 +387,7 @@
379387         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380388         treePanel.setLayout(new GridBagLayout());
381389         ctrlPanel.setLayout(new GridBagLayout());
382
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
383391 
384392         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385393                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -806,65 +814,47 @@
806814         return combo;
807815     }
808816 
809
-    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)
810818     {
811
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
812822 
813823         JLabel jlabel = new JLabel(label);
814
-
815
-        aConstraints.fill = GridBagConstraints.VERTICAL;
816824         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817
-        aConstraints.gridwidth = 2;
818
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819
-        aConstraints.gridx += 1;
820
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
821
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823
-        aConstraints.gridx += 1;
824
-        aConstraints.gridwidth = 1;
825
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826827         combo.setFloat(current);
827
-
828
-        combo.label = jlabel;
829
-
830
-        combo.addChangeListener(this);
831
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
832831         return combo;
833832     }
834833 
835
-    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)
836835     {
837
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
838839 
839840         JLabel jlabel = new JLabel(label);
840
-
841
-        aConstraints.fill = GridBagConstraints.VERTICAL;
842841         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843
-        aConstraints.gridwidth = 2;
844
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845
-        aConstraints.gridx += 1;
846
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
847
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849
-        aConstraints.gridx += 1;
850
-        aConstraints.gridwidth = 1;
851
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852844         combo.setInteger(current);
853845 
854
-        combo.label = jlabel;
855
-
856
-        combo.addChangeListener(this);
857
-
846
+        ctrlPanel.add(control);
847
+        
858848         return combo;
859849     }
860850 
861
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
862852     {
863853         JTextArea text;
864854 
865855         aConstraints.fill = GridBagConstraints.HORIZONTAL;
866856         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868858         text.addCaretListener(this);
869859         aConstraints.gridx += 1;
870860         aConstraints.gridwidth = 1;
....@@ -894,6 +884,13 @@
894884     {
895885         j.removeChangeListener(this);
896886         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);
897894         objEditor.ctrlPanel.remove(j);
898895     }
899896 
....@@ -981,8 +978,11 @@
981978         fasterButton = AddButton(oe, "Fast");
982979         remarkButton = AddButton(oe, "Rem");
983980 
984
-        Return();
981
+        //Return();
985982 
983
+    //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
+    //Return();
985
+            
986986 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987987 //        ObjEditor.aConstraints.gridx += 1;
988988 
....@@ -1178,10 +1178,18 @@
11781178         //JPanel worldPanel =
11791179         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11801180         //worldPanel.setName("World");
1181
-	centralPanel = new JPanel(new BorderLayout());
1181
+	centralPanel = new cGridBag();
1182
+        centralPanel.preferredWidth = 20;
11821183 	timelinePanel = new JPanel(new BorderLayout());
11831184         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11841185 
1186
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187
+        cameraPanel.setContinuousLayout(true);
1188
+        cameraPanel.setOneTouchExpandable(true);
1189
+//        cameraPanel.setDividerLocation(0.9);
1190
+//        cameraPanel.setDividerSize(9);
1191
+        cameraPanel.setResizeWeight(1.0);
1192
+        
11851193         centralPanel.add(cameraView);
11861194         //frame.setJMenuBar(timelineMenubar);
11871195         //centralPanel.add(timelinePanel);
....@@ -1201,12 +1209,13 @@
12011209         //frontView.object = copy;
12021210         //sideView.object = copy;
12031211 
1204
-        XYZPanel = new JPanel();
1205
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212
+        XYZPanel = new cGridBag().setVertical(true);
1213
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12061214 
1207
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1208
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1209
-        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);
12101219 
12111220         /*
12121221         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1268,16 +1277,23 @@
12681277         scrollpane.setWheelScrollingEnabled(true);
12691278         scrollpane.addMouseWheelListener(this); // Default not fast enough
12701279 
1271
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1272
-        scenePanel.add(scrollpane);
1280
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1281
+        scenePanel.preferredWidth = 7;
1282
+        
1283
+        JTabbedPane tabbedPane = new JTabbedPane();
1284
+        tabbedPane.add(scrollpane);
12731285 
1274
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12751287 
1276
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
12771289 
12781290         optionsPanel.setName("Options");
1279
-        scenePanel.add(optionsPanel);
1280
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
12811297 
12821298         /*
12831299         cTree jTree = new cTree(null);
....@@ -1311,6 +1327,7 @@
13111327         //bigPanel.setSize(new Dimension(10,10));
13121328         //bigPanel.add(ctrlPanel);
13131329         //bigPanel.add(gridPanel);
1330
+        /**
13141331         bigThree = new JPanel();
13151332         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13161333         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1334,7 +1351,13 @@
13341351         //	aConstraints.gridheight = 3;
13351352         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13361353         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
13371355 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
13381361 //                // SIDE EFFECT!!!
13391362 //		aConstraints.gridx = 0;
13401363 //		aConstraints.gridy = 0;
....@@ -1355,7 +1378,8 @@
13551378         //worldPane.add(bigPanel);
13561379         //worldPane.add(worldPanel);
13571380                 /**/
1358
-        frame.getContentPane().add(/*"Center",*/framePanel);
1381
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1382
+        frame.add(/*"Center",*/framePanel);
13591383         //frame.getContentPane().add(/*"Center",*/ worldPane);
13601384 
13611385 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1376,6 +1400,10 @@
13761400         });
13771401     }
13781402 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
13791407     JTree GetTree()
13801408     {
13811409         return objEditor.jTree;
....@@ -1387,260 +1415,165 @@
13871415         ctrlPanel.removeAll();
13881416     }
13891417 
1390
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
13911419     {
1392
-        aConstraints.weighty = 0;
1393
-        //aConstraints.weightx = 1;
1394
-                /*
1420
+         /*
13951421         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
13961422         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398
-        aConstraints.gridx += 1;
13991423          */
14001424 
1401
-        aConstraints.gridwidth = 1;
1402
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403
-        aConstraints.gridx += 1;
1404
-        aConstraints.weighty = 0;
1405
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
14061428 
14071429         /*
14081430         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409
-        aConstraints.gridx += 1;
1410
-        aConstraints.weighty = 0;
1411
-        aConstraints.gridwidth = 1;
14121431          */
14131432 
1414
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415
-        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);
14161437 
1417
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418
-
1419
-        aConstraints.gridx += 1;
1420
-
1421
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422
-
1423
-        aConstraints.gridx += 1;
1424
-
1425
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426
-
1427
-        aConstraints.gridx = 0;
1428
-        aConstraints.gridy += 1;
1429
-        aConstraints.weighty = 0;
1430
-        aConstraints.gridwidth = 1;
1438
+        ctrlPanel.add(editBar);
1439
+        
14311440         /**/
14321441         //aConstraints.weighty = 0;
14331442         ////aConstraints.weightx = 1;
14341443         //aConstraints.weighty = 1;
14351444         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14361445         //aConstraints.gridx += 1;
1437
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438
-        aConstraints.weighty = 0;
1439
-        aConstraints.gridx = 0;
1440
-        aConstraints.gridy += 1;
1441
-        aConstraints.gridwidth = 1;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14421447 
1443
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446
-        aConstraints.gridx += 1;
1447
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448
-        //aConstraints.weightx = 0;
1449
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450
-        aConstraints.gridx = 0;
1451
-        aConstraints.gridy += 1;
1452
-        aConstraints.gridwidth = 1;
1448
+        cGridBag colorSection = new cGridBag().setVertical(true);
1449
+        
1450
+        cGridBag color = new cGridBag();
1451
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1452
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1454
+        //colorField.preferredWidth = 200;
1455
+        colorSection.add(color);
14531456 
1454
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457
-        aConstraints.gridx += 1;
1458
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460
-        aConstraints.gridx = 0;
1461
-        aConstraints.gridy += 1;
1462
-        aConstraints.gridwidth = 1;
1457
+        cGridBag modulation = new cGridBag();
1458
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1459
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1461
+        colorSection.add(modulation);
14631462 
1464
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467
-        aConstraints.gridx += 1;
1468
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470
-        aConstraints.gridx = 0;
1471
-        aConstraints.gridy += 1;
1472
-        aConstraints.gridwidth = 1;
1463
+        cGridBag texture = new cGridBag();
1464
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1465
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1467
+        colorSection.add(texture);
14731468 
1474
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477
-        aConstraints.gridx += 1;
1478
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480
-        aConstraints.gridx = 0;
1481
-        aConstraints.gridy += 1;
1482
-        aConstraints.gridwidth = 1;
1469
+        cGridBag anisoU = new cGridBag();
1470
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1471
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1473
+        colorSection.add(anisoU);
14831474 
1484
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487
-        aConstraints.gridx += 1;
1488
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490
-        aConstraints.gridx = 0;
1491
-        aConstraints.gridy += 1;
1492
-        aConstraints.gridwidth = 1;
1475
+        cGridBag anisoV = new cGridBag();
1476
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1477
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479
+        colorSection.add(anisoV);
14931480 
1494
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497
-        aConstraints.gridx += 1;
1498
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500
-        aConstraints.gridx = 0;
1501
-        aConstraints.gridy += 1;
1502
-        aConstraints.gridwidth = 1;
1481
+        cGridBag shadowbias = new cGridBag();
1482
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1483
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485
+        colorSection.add(shadowbias);
15031486 
1504
-        //aConstraints.weighty = 1;
1505
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506
-        //aConstraints.gridx += 1;
1507
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508
-        aConstraints.weighty = 0;
1509
-        aConstraints.gridx = 0;
1510
-        aConstraints.gridy += 1;
1511
-        aConstraints.gridwidth = 1;
1487
+        ctrlPanel.add(new JSeparator());
1488
+        
1489
+        ctrlPanel.add(colorSection);
1490
+        
1491
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492
+        
1493
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1494
+        
1495
+        cGridBag diffuse = new cGridBag();
1496
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1497
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1498
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1499
+        diffuseSection.add(diffuse);
15121500 
1513
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516
-        aConstraints.gridx += 1;
1517
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519
-        aConstraints.gridx = 0;
1520
-        aConstraints.gridy += 1;
1521
-        aConstraints.gridwidth = 1;
1501
+        cGridBag diffuseness = new cGridBag();
1502
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1503
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1504
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1505
+        diffuseSection.add(diffuseness);
15221506 
1523
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526
-        aConstraints.gridx += 1;
1527
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529
-        aConstraints.gridx = 0;
1530
-        aConstraints.gridy += 1;
1531
-        aConstraints.gridwidth = 1;
1507
+        cGridBag selfshadow = new cGridBag();
1508
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1509
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1511
+        diffuseSection.add(selfshadow);
15321512 
1533
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536
-        aConstraints.gridx += 1;
1537
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539
-        aConstraints.gridx = 0;
1540
-        aConstraints.gridy += 1;
1541
-        aConstraints.gridwidth = 1;
1513
+        cGridBag sheen = new cGridBag();
1514
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1515
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1516
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1517
+        diffuseSection.add(sheen);
15421518 
1543
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546
-        aConstraints.gridx += 1;
1547
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549
-        aConstraints.gridx = 0;
1550
-        aConstraints.gridy += 1;
1551
-        aConstraints.gridwidth = 1;
1519
+        cGridBag subsurface = new cGridBag();
1520
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1521
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1523
+        diffuseSection.add(subsurface);
15521524 
1553
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556
-        aConstraints.gridx += 1;
1557
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559
-        aConstraints.gridx = 0;
1560
-        aConstraints.gridy += 1;
1561
-        aConstraints.gridwidth = 1;
1525
+        cGridBag shadow = new cGridBag();
1526
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1527
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1528
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1529
+        diffuseSection.add(shadow);
15621530 
1563
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566
-        aConstraints.gridx += 1;
1567
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569
-        aConstraints.gridx = 0;
1570
-        aConstraints.gridy += 1;
1571
-        aConstraints.gridwidth = 1;
1531
+        cGridBag fakedepth = new cGridBag();
1532
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1533
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1534
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535
+        diffuseSection.add(fakedepth);
15721536 
1573
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576
-        aConstraints.gridx += 1;
1577
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579
-        aConstraints.gridx = 0;
1580
-        aConstraints.gridy += 1;
1581
-        aConstraints.gridwidth = 1;
1537
+        ctrlPanel.add(new JSeparator());
1538
+        
1539
+        ctrlPanel.add(diffuseSection);
1540
+        
1541
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542
+        
1543
+        cGridBag specularSection = new cGridBag().setVertical(true);
15821544 
1583
-        //aConstraints.weighty = 1;
1584
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585
-        //aConstraints.gridx += 1;
1586
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587
-        aConstraints.weighty = 0;
1588
-        aConstraints.gridx = 0;
1589
-        aConstraints.gridy += 1;
1590
-        aConstraints.gridwidth = 1;
1545
+        cGridBag specular = new cGridBag();
1546
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1547
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1549
+        specularSection.add(specular);
15911550 
1592
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595
-        aConstraints.gridx += 1;
1596
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598
-        aConstraints.gridx = 0;
1599
-        aConstraints.gridy += 1;
1600
-        aConstraints.gridwidth = 1;
1551
+        cGridBag lightarea = new cGridBag();
1552
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1553
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1555
+        specularSection.add(lightarea);
16011556 
1602
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605
-        aConstraints.gridx += 1;
1606
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608
-        aConstraints.gridx = 0;
1609
-        aConstraints.gridy += 1;
1610
-        aConstraints.gridwidth = 1;
1557
+        cGridBag shininess = new cGridBag();
1558
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1559
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1561
+        specularSection.add(shininess);
16111562 
1612
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615
-        aConstraints.gridx += 1;
1616
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618
-        aConstraints.gridx = 0;
1619
-        aConstraints.gridy += 1;
1620
-        aConstraints.gridwidth = 1;
1563
+        cGridBag metalness = new cGridBag();
1564
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1565
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567
+        specularSection.add(metalness);
16211568 
1622
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625
-        aConstraints.gridx += 1;
1626
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628
-        aConstraints.gridx = 0;
1629
-        aConstraints.gridy += 1;
1630
-        aConstraints.gridwidth = 1;
1569
+        cGridBag velvet = new cGridBag();
1570
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1571
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573
+        specularSection.add(velvet);
16311574 
1632
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635
-        aConstraints.gridx += 1;
1636
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638
-        aConstraints.gridx = 0;
1639
-        aConstraints.gridy += 1;
1640
-        aConstraints.gridwidth = 1;
1641
-
1642
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643
-        Return();
1575
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1576
+        //Return();
16441577 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16451578 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16461579 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1651,130 +1584,93 @@
16511584 //		aConstraints.gridy += 1;
16521585 //		aConstraints.gridwidth = 1;
16531586 
1654
-        //aConstraints.weighty = 1;
1655
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656
-        //aConstraints.gridx += 1;
1657
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658
-        aConstraints.weighty = 0;
1659
-        aConstraints.gridx = 0;
1660
-        aConstraints.gridy += 1;
1661
-        aConstraints.gridwidth = 1;
16621587 
1663
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666
-        aConstraints.gridx += 1;
1667
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669
-        aConstraints.gridx = 0;
1670
-        aConstraints.gridy += 1;
1671
-        aConstraints.gridwidth = 1;
1588
+        ctrlPanel.add(new JSeparator());
1589
+        
1590
+        ctrlPanel.add(specularSection);
1591
+        
1592
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593
+        
1594
+        cGridBag globalSection = new cGridBag().setVertical(true);
16721595 
1673
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676
-        aConstraints.gridx += 1;
1677
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679
-        aConstraints.gridx = 0;
1680
-        aConstraints.gridy += 1;
1681
-        aConstraints.gridwidth = 1;
1596
+        cGridBag camera = new cGridBag();
1597
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1598
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1600
+        globalSection.add(camera);
16821601 
1683
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686
-        aConstraints.gridx += 1;
1687
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689
-        aConstraints.gridx = 0;
1690
-        aConstraints.gridy += 1;
1691
-        aConstraints.gridwidth = 1;
1602
+        cGridBag ambient = new cGridBag();
1603
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1604
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1605
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1606
+        globalSection.add(ambient);
16921607 
1693
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696
-        aConstraints.gridx += 1;
1697
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699
-        aConstraints.gridx = 0;
1700
-        aConstraints.gridy += 1;
1701
-        aConstraints.gridwidth = 1;
1702
-        aConstraints.weighty = 0;
1608
+        cGridBag backlit = new cGridBag();
1609
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1610
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612
+        globalSection.add(backlit);
17031613 
1704
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707
-        aConstraints.gridx += 1;
1708
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710
-        aConstraints.gridx = 0;
1711
-        aConstraints.gridy += 1;
1712
-        aConstraints.gridwidth = 1;
1614
+        cGridBag opacity = new cGridBag();
1615
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1616
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618
+        globalSection.add(opacity);
17131619 
1714
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717
-        aConstraints.gridx += 1;
1718
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1720
-        aConstraints.gridx = 0;
1721
-        aConstraints.gridy += 1;
1722
-        aConstraints.gridwidth = 1;
1620
+        ctrlPanel.add(new JSeparator());
1621
+        
1622
+        ctrlPanel.add(globalSection);
1623
+        
1624
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625
+        
1626
+        cGridBag textureSection = new cGridBag().setVertical(true);
17231627 
1724
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727
-        aConstraints.gridx += 1;
1728
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730
-        aConstraints.gridx = 0;
1731
-        aConstraints.gridy += 1;
1732
-        aConstraints.gridwidth = 1;
1628
+        cGridBag bump = new cGridBag();
1629
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1630
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1632
+        textureSection.add(bump);
17331633 
1734
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737
-        aConstraints.gridx += 1;
1738
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740
-        aConstraints.gridx = 0;
1741
-        aConstraints.gridy += 1;
1742
-        aConstraints.gridwidth = 1;
1634
+        cGridBag noise = new cGridBag();
1635
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1636
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1638
+        textureSection.add(noise);
17431639 
1744
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747
-        aConstraints.gridx += 1;
1748
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750
-        aConstraints.gridx = 0;
1751
-        aConstraints.gridy += 1;
1752
-        aConstraints.gridwidth = 1;
1640
+        cGridBag power = new cGridBag();
1641
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1642
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1644
+        textureSection.add(power);
17531645 
1754
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757
-        aConstraints.gridx += 1;
1758
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1760
-        aConstraints.gridx = 0;
1761
-        aConstraints.gridy += 1;
1762
-        aConstraints.gridwidth = 1;
1646
+        cGridBag borderfade = new cGridBag();
1647
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1648
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1649
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1650
+        textureSection.add(borderfade);
17631651 
1764
-        //aConstraints.weighty = 1;
1765
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766
-        //aConstraints.gridx += 1;
1767
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768
-        aConstraints.weighty = 0;
1652
+        cGridBag fog = new cGridBag();
1653
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1654
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1655
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1656
+        textureSection.add(fog);
17691657 
1770
-        aConstraints.gridx = 0;
1771
-        aConstraints.gridy = 0;
1772
-        aConstraints.gridwidth = 1;
1658
+        cGridBag opacityPower = new cGridBag();
1659
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1660
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1662
+        textureSection.add(opacityPower);
1663
+
1664
+        ctrlPanel.add(new JSeparator());
1665
+        
1666
+        ctrlPanel.add(textureSection);
1667
+        
1668
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17731669 
17741670         SetMaterial(copy); // .GetMaterial());
17751671 
1776
-        colorField.addChangeListener(this);
1777
-        modulationField.addChangeListener(this);
1672
+        //colorField.addChangeListener(this);
1673
+//        modulationField.addChangeListener(this);
17781674         metalnessField.addChangeListener(this);
17791675         diffuseField.addChangeListener(this);
17801676         specularField.addChangeListener(this);
....@@ -2989,7 +2885,8 @@
29892885             if (timeline)
29902886             {
29912887                 centralPanel.remove(cameraView);
2992
-                centralPanel.add(timelinePanel);
2888
+                cameraPanel.add(cameraView);
2889
+                centralPanel.add(cameraPanel);
29932890                 frame.setJMenuBar(timelineMenubar);
29942891                 wasFullScreen = CameraPane.FULLSCREEN;
29952892                 if (!CameraPane.FULLSCREEN)
....@@ -2998,7 +2895,7 @@
29982895             }
29992896             else
30002897             {
3001
-                centralPanel.remove(timelinePanel);
2898
+                centralPanel.remove(cameraPanel);
30022899                 centralPanel.add(cameraView);
30032900                 frame.setJMenuBar(null);
30042901                 if (!wasFullScreen)
....@@ -3121,7 +3018,8 @@
31213018             objEditor.refreshContents();
31223019         } else if (event.getSource() == stepItem)
31233020         {
3124
-            cameraView.ONESTEP = true;
3021
+            //cameraView.ONESTEP = true;
3022
+            Globals.ONESTEP = true;
31253023             cameraView.repaint();
31263024             return;
31273025         } else if (event.getSource() == stepButton)
....@@ -3278,25 +3176,25 @@
32783176 
32793177     void ToggleAnimation()
32803178     {
3281
-        if (!CameraPane.ANIMATION)
3179
+        if (!Globals.ANIMATION)
32823180         {
32833181             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32843182             browser.show();
32853183             String filename = browser.getFile();
32863184             if (filename != null && filename.length() > 0)
32873185             {
3288
-                CameraPane.filename = browser.getDirectory() + filename;
3186
+                Globals.filename = browser.getDirectory() + filename;
32893187                 //CameraPane.framecount = 0;
3290
-                CameraPane.imagecount = 0;
3188
+                Globals.imagecount = 0;
32913189 
3292
-                CameraPane.ANIMATION ^= true;
3190
+                Globals.ANIMATION ^= true;
32933191 
32943192                 GrafreeD.wav.cursor = 0;
32953193                 GrafreeD.wav.loop = 0;
32963194             }
32973195         } else
32983196         {
3299
-            CameraPane.ANIMATION ^= true;
3197
+            Globals.ANIMATION ^= true;
33003198         }
33013199     }
33023200 
....@@ -3475,7 +3373,7 @@
34753373             current.fakedepth = (float) fakedepthField.getFloat();
34763374             current.shadowbias = (float) shadowbiasField.getFloat();
34773375 
3478
-            if (!NumberSlider.frozen)
3376
+            if (!cNumberSlider.frozen)
34793377             {
34803378                 //System.out.println("Propagate = " + propagate);
34813379                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3549,7 +3447,13 @@
35493447             //System.out.println("PARENT = " + parent);
35503448             //if (parent != null)
35513449             //	parent.applySelf();
3552
-            refreshContents();
3450
+		if (e.getSource() == normalpushField)
3451
+		{
3452
+			objEditor.refreshContents();
3453
+			//Refresh();
3454
+		}
3455
+		else
3456
+                    refreshContents();
35533457             // ??? client.refreshEditWindow();
35543458         }
35553459         //else
....@@ -3561,7 +3465,7 @@
35613465         //group.name = nameField.getText();
35623466         //objEditor.applySelf();
35633467 
3564
-        assert (objEditor == this);
3468
+        // OCT2018: assert (objEditor == this);
35653469         if (copy.selection == null || copy.selection.size() == 0)
35663470 			//super.applySelf()
35673471                                 ; else
....@@ -3585,6 +3489,9 @@
35853489                 objEditor.copy = keep;
35863490             }
35873491         }
3492
+        
3493
+        if (normalpushField != null)
3494
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35883495     }
35893496 
35903497         void SnapObject()
....@@ -3839,7 +3746,7 @@
38393746 
38403747             radioPanel.revalidate();
38413748             radioPanel.repaint();
3842
-            ctrlPanel.revalidate(); // ? new
3749
+            ctrlPanel.validate(); // ? new
38433750             ctrlPanel.repaint();
38443751         }
38453752     }
....@@ -4506,17 +4413,18 @@
45064413     JPanel treePanel;
45074414     JPanel radioPanel;
45084415     ButtonGroup buttonGroup;
4509
-    JPanel ctrlPanel;
4510
-    JPanel materialPanel;
4416
+    cGridBag ctrlPanel;
4417
+    cGridBag materialPanel;
45114418     JScrollPane infoPanel;
4512
-    JPanel optionsPanel;
4419
+    cGridBag optionsPanel;
45134420     JTabbedPane objectPanel;
4514
-    JPanel XYZPanel;
4421
+    cGridBag XYZPanel;
45154422     JSplitPane gridPanel;
45164423     JSplitPane bigPanel;
4517
-    JPanel bigThree;
4518
-    JTabbedPane scenePanel;
4519
-    JPanel centralPanel;
4424
+    cGridBag bigThree;
4425
+    cGridBag scenePanel;
4426
+    cGridBag centralPanel;
4427
+    JSplitPane cameraPanel;
45204428     JPanel timelinePanel;
45214429     JMenuBar timelineMenubar;
45224430     JSplitPane framePanel;
....@@ -4568,65 +4476,67 @@
45684476     // MATERIAL
45694477     JLabel materialLabel;
45704478     JLabel colorLabel;
4571
-    NumberSlider colorField;
4479
+    cNumberSlider colorField;
45724480     JLabel modulationLabel;
4573
-    NumberSlider modulationField;
4481
+    cNumberSlider modulationField;
45744482     JLabel metalnessLabel;
4575
-    NumberSlider metalnessField;
4483
+    cNumberSlider metalnessField;
45764484     JLabel diffuseLabel;
4577
-    NumberSlider diffuseField;
4485
+    cNumberSlider diffuseField;
45784486     JLabel specularLabel;
4579
-    NumberSlider specularField;
4487
+    cNumberSlider specularField;
45804488     JLabel shininessLabel;
4581
-    NumberSlider shininessField;
4489
+    cNumberSlider shininessField;
45824490     JLabel shiftLabel;
4583
-    NumberSlider shiftField;
4491
+    cNumberSlider shiftField;
45844492     JLabel ambientLabel;
4585
-    NumberSlider ambientField;
4493
+    cNumberSlider ambientField;
45864494     JLabel lightareaLabel;
4587
-    NumberSlider lightareaField;
4495
+    cNumberSlider lightareaField;
45884496     JLabel diffusenessLabel;
4589
-    NumberSlider diffusenessField;
4497
+    cNumberSlider diffusenessField;
45904498     JLabel velvetLabel;
4591
-    NumberSlider velvetField;
4499
+    cNumberSlider velvetField;
45924500     JLabel sheenLabel;
4593
-    NumberSlider sheenField;
4501
+    cNumberSlider sheenField;
45944502     JLabel subsurfaceLabel;
4595
-    NumberSlider subsurfaceField;
4503
+    cNumberSlider subsurfaceField;
45964504     //JLabel bumpLabel;
45974505     //NumberSlider bumpField;
45984506     JLabel backlitLabel;
4599
-    NumberSlider backlitField;
4507
+    cNumberSlider backlitField;
46004508     JLabel anisoLabel;
4601
-    NumberSlider anisoField;
4509
+    cNumberSlider anisoField;
46024510     JLabel anisoVLabel;
4603
-    NumberSlider anisoVField;
4511
+    cNumberSlider anisoVField;
46044512     JLabel cameraLabel;
4605
-    NumberSlider cameraField;
4513
+    cNumberSlider cameraField;
46064514     JLabel selfshadowLabel;
4607
-    NumberSlider selfshadowField;
4515
+    cNumberSlider selfshadowField;
46084516     JLabel shadowLabel;
4609
-    NumberSlider shadowField;
4517
+    cNumberSlider shadowField;
46104518     JLabel textureLabel;
4611
-    NumberSlider textureField;
4519
+    cNumberSlider textureField;
46124520     JLabel opacityLabel;
4613
-    NumberSlider opacityField;
4521
+    cNumberSlider opacityField;
46144522     JLabel fakedepthLabel;
4615
-    NumberSlider fakedepthField;
4523
+    cNumberSlider fakedepthField;
46164524     JLabel shadowbiasLabel;
4617
-    NumberSlider shadowbiasField;
4525
+    cNumberSlider shadowbiasField;
46184526     JLabel bumpLabel;
4619
-    NumberSlider bumpField;
4527
+    cNumberSlider bumpField;
46204528     JLabel noiseLabel;
4621
-    NumberSlider noiseField;
4529
+    cNumberSlider noiseField;
46224530     JLabel powerLabel;
4623
-    NumberSlider powerField;
4531
+    cNumberSlider powerField;
46244532     JLabel borderfadeLabel;
4625
-    NumberSlider borderfadeField;
4533
+    cNumberSlider borderfadeField;
46264534     JLabel fogLabel;
4627
-    NumberSlider fogField;
4535
+    cNumberSlider fogField;
46284536     JLabel opacityPowerLabel;
4629
-    NumberSlider opacityPowerField;
4537
+    cNumberSlider opacityPowerField;
46304538     JTree jTree;
46314539     //ObjectUI parent;
4540
+    
4541
+    cNumberSlider normalpushField;
46324542 }