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,
....@@ -28,7 +30,12 @@
2830         iSendInfo
2931 //KeyListener
3032 {
33
+        boolean timeline;
34
+        boolean wasFullScreen;
3135 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
3239     // SCRIPT
3340     
3441     transient JFrame textpanel = null;
....@@ -119,14 +126,13 @@
119126     void keyPressed(int key, int modifiers)
120127     {
121128     System.out.println("KEY PRESSED");
122
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
123130     }
124131      */
125132 
126133     static GridBagConstraints aConstraints;
127134     static GridBagConstraints aWindowConstraints;
128
-    GroupEditor callee;
129
-    JFrame frame;
135
+
130136     static int GRIDWIDTH = 100; // 4;
131137 
132138     public void closeUI()
....@@ -158,12 +164,16 @@
158164         objEditor.ctrlPanel.remove(slowerButton);
159165         objEditor.ctrlPanel.remove(fasterButton);
160166         objEditor.ctrlPanel.remove(remarkButton);
167
+        
168
+        Remove(normalpushField);
161169     }
162170 
163171     public ObjEditor GetEditor()
164172     {
165173         return objEditor; //.GetEditor();
166174     }
175
+    
176
+    // Sometimes myself, sometimes my callee's.
167177     ObjEditor objEditor;
168178 
169179     /*
....@@ -238,7 +248,7 @@
238248         //if (!isDisplayable())
239249         //setUndecorated(true);
240250 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
251
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242252         client = inClient;
243253         copy = localCopy;
244254         copy.editWindow = this;
....@@ -292,18 +302,18 @@
292302         //normalLensItem.addActionListener(this);
293303         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294304         revertCameraItem.addActionListener(this);
305
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306
+        toggleTimelineItem.addItemListener(this);
295307         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296308         toggleFullScreenItem.addItemListener(this);
297309         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299
-        toggleTimelineItem.addItemListener(this);
300310         cameraMenu.add("-");
301311         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302312         toggleTextureItem.addItemListener(this);
303313         toggleTextureItem.setState(CameraPane.textureon);
304314         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
305315         toggleLiveItem.addItemListener(this);
306
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
307317         cameraMenu.add(stepItem = new MenuItem("Step"));
308318         stepItem.addActionListener(this);
309319 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -345,9 +355,9 @@
345355         toolbarPanel.setName("Toolbar");
346356         treePanel = new JPanel();
347357         treePanel.setName("Tree");
348
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
349359         ctrlPanel.setName("Edit");
350
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
351361         materialPanel.setName("Material");
352362         /*JTextPane*/
353363         infoarea = createTextPane();
....@@ -377,7 +387,7 @@
377387         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
378388         treePanel.setLayout(new GridBagLayout());
379389         ctrlPanel.setLayout(new GridBagLayout());
380
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
381391 
382392         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
383393                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -596,6 +606,22 @@
596606         }
597607     }
598608 
609
+        void ToggleFullScreen()
610
+        {
611
+                if (CameraPane.FULLSCREEN)
612
+                {
613
+                    frame.getContentPane().remove(/*"Center",*/bigThree);
614
+                    framePanel.add(bigThree);
615
+                    frame.getContentPane().add(/*"Center",*/framePanel);
616
+                } else
617
+                {
618
+                    frame.getContentPane().remove(/*"Center",*/framePanel);
619
+                    framePanel.remove(bigThree);
620
+                    frame.getContentPane().add(/*"Center",*/bigThree);
621
+                }
622
+                cameraView.ToggleFullScreen();
623
+        }
624
+
599625     private JTextArea createTextPane()
600626     {
601627         String[] initString =
....@@ -788,65 +814,47 @@
788814         return combo;
789815     }
790816 
791
-    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)
792818     {
793
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
794822 
795823         JLabel jlabel = new JLabel(label);
796
-
797
-        aConstraints.fill = GridBagConstraints.VERTICAL;
798824         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
799
-        aConstraints.gridwidth = 2;
800
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
801
-        aConstraints.gridx += 1;
802
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
803
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
804
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
805
-        aConstraints.gridx += 1;
806
-        aConstraints.gridwidth = 1;
807
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808827         combo.setFloat(current);
809
-
810
-        combo.label = jlabel;
811
-
812
-        combo.addChangeListener(this);
813
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
814831         return combo;
815832     }
816833 
817
-    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)
818835     {
819
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
820839 
821840         JLabel jlabel = new JLabel(label);
822
-
823
-        aConstraints.fill = GridBagConstraints.VERTICAL;
824841         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825
-        aConstraints.gridwidth = 2;
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), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831
-        aConstraints.gridx += 1;
832
-        aConstraints.gridwidth = 1;
833
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834844         combo.setInteger(current);
835845 
836
-        combo.label = jlabel;
837
-
838
-        combo.addChangeListener(this);
839
-
846
+        ctrlPanel.add(control);
847
+        
840848         return combo;
841849     }
842850 
843
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
844852     {
845853         JTextArea text;
846854 
847855         aConstraints.fill = GridBagConstraints.HORIZONTAL;
848856         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
849
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
850858         text.addCaretListener(this);
851859         aConstraints.gridx += 1;
852860         aConstraints.gridwidth = 1;
....@@ -876,6 +884,13 @@
876884     {
877885         j.removeChangeListener(this);
878886         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);
879894         objEditor.ctrlPanel.remove(j);
880895     }
881896 
....@@ -963,8 +978,11 @@
963978         fasterButton = AddButton(oe, "Fast");
964979         remarkButton = AddButton(oe, "Rem");
965980 
966
-        Return();
981
+        //Return();
967982 
983
+    //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
+    //Return();
985
+            
968986 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
969987 //        ObjEditor.aConstraints.gridx += 1;
970988 
....@@ -1160,10 +1178,18 @@
11601178         //JPanel worldPanel =
11611179         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11621180         //worldPanel.setName("World");
1163
-	centralPanel = new JPanel(new BorderLayout());
1181
+	centralPanel = new cGridBag();
1182
+        centralPanel.preferredWidth = 20;
11641183 	timelinePanel = new JPanel(new BorderLayout());
11651184         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11661185 
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
+        
11671193         centralPanel.add(cameraView);
11681194         //frame.setJMenuBar(timelineMenubar);
11691195         //centralPanel.add(timelinePanel);
....@@ -1183,12 +1209,13 @@
11831209         //frontView.object = copy;
11841210         //sideView.object = copy;
11851211 
1186
-        XYZPanel = new JPanel();
1187
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212
+        XYZPanel = new cGridBag().setVertical(true);
1213
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
11881214 
1189
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1190
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1191
-        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);
11921219 
11931220         /*
11941221         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1250,16 +1277,23 @@
12501277         scrollpane.setWheelScrollingEnabled(true);
12511278         scrollpane.addMouseWheelListener(this); // Default not fast enough
12521279 
1253
-        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1254
-        scenePanel.add(scrollpane);
1280
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1281
+        scenePanel.preferredWidth = 7;
1282
+        
1283
+        JTabbedPane tabbedPane = new JTabbedPane();
1284
+        tabbedPane.add(scrollpane);
12551285 
1256
-        scenePanel.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12571287 
1258
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
12591289 
12601290         optionsPanel.setName("Options");
1261
-        scenePanel.add(optionsPanel);
1262
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
12631297 
12641298         /*
12651299         cTree jTree = new cTree(null);
....@@ -1293,6 +1327,7 @@
12931327         //bigPanel.setSize(new Dimension(10,10));
12941328         //bigPanel.add(ctrlPanel);
12951329         //bigPanel.add(gridPanel);
1330
+        /**
12961331         bigThree = new JPanel();
12971332         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
12981333         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1316,7 +1351,13 @@
13161351         //	aConstraints.gridheight = 3;
13171352         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13181353         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
13191355 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
13201361 //                // SIDE EFFECT!!!
13211362 //		aConstraints.gridx = 0;
13221363 //		aConstraints.gridy = 0;
....@@ -1337,7 +1378,8 @@
13371378         //worldPane.add(bigPanel);
13381379         //worldPane.add(worldPanel);
13391380                 /**/
1340
-        frame.getContentPane().add(/*"Center",*/framePanel);
1381
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1382
+        frame.add(/*"Center",*/framePanel);
13411383         //frame.getContentPane().add(/*"Center",*/ worldPane);
13421384 
13431385 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1358,6 +1400,10 @@
13581400         });
13591401     }
13601402 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
13611407     JTree GetTree()
13621408     {
13631409         return objEditor.jTree;
....@@ -1369,260 +1415,165 @@
13691415         ctrlPanel.removeAll();
13701416     }
13711417 
1372
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
13731419     {
1374
-        aConstraints.weighty = 0;
1375
-        //aConstraints.weightx = 1;
1376
-                /*
1420
+         /*
13771421         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
13781422         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1379
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1380
-        aConstraints.gridx += 1;
13811423          */
13821424 
1383
-        aConstraints.gridwidth = 1;
1384
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1385
-        aConstraints.gridx += 1;
1386
-        aConstraints.weighty = 0;
1387
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
13881428 
13891429         /*
13901430         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1391
-        aConstraints.gridx += 1;
1392
-        aConstraints.weighty = 0;
1393
-        aConstraints.gridwidth = 1;
13941431          */
13951432 
1396
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1397
-        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);
13981437 
1399
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1400
-
1401
-        aConstraints.gridx += 1;
1402
-
1403
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1404
-
1405
-        aConstraints.gridx += 1;
1406
-
1407
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1408
-
1409
-        aConstraints.gridx = 0;
1410
-        aConstraints.gridy += 1;
1411
-        aConstraints.weighty = 0;
1412
-        aConstraints.gridwidth = 1;
1438
+        ctrlPanel.add(editBar);
1439
+        
14131440         /**/
14141441         //aConstraints.weighty = 0;
14151442         ////aConstraints.weightx = 1;
14161443         //aConstraints.weighty = 1;
14171444         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14181445         //aConstraints.gridx += 1;
1419
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1420
-        aConstraints.weighty = 0;
1421
-        aConstraints.gridx = 0;
1422
-        aConstraints.gridy += 1;
1423
-        aConstraints.gridwidth = 1;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14241447 
1425
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1426
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1427
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1428
-        aConstraints.gridx += 1;
1429
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1430
-        //aConstraints.weightx = 0;
1431
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1432
-        aConstraints.gridx = 0;
1433
-        aConstraints.gridy += 1;
1434
-        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);
14351456 
1436
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1437
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1438
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1439
-        aConstraints.gridx += 1;
1440
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1441
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1442
-        aConstraints.gridx = 0;
1443
-        aConstraints.gridy += 1;
1444
-        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);
14451462 
1446
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1447
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1448
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1449
-        aConstraints.gridx += 1;
1450
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1451
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1452
-        aConstraints.gridx = 0;
1453
-        aConstraints.gridy += 1;
1454
-        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);
14551468 
1456
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1457
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1459
-        aConstraints.gridx += 1;
1460
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1461
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1462
-        aConstraints.gridx = 0;
1463
-        aConstraints.gridy += 1;
1464
-        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);
14651474 
1466
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1467
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1468
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1469
-        aConstraints.gridx += 1;
1470
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1471
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1472
-        aConstraints.gridx = 0;
1473
-        aConstraints.gridy += 1;
1474
-        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);
14751480 
1476
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1477
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479
-        aConstraints.gridx += 1;
1480
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1482
-        aConstraints.gridx = 0;
1483
-        aConstraints.gridy += 1;
1484
-        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);
14851486 
1486
-        //aConstraints.weighty = 1;
1487
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1488
-        //aConstraints.gridx += 1;
1489
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1490
-        aConstraints.weighty = 0;
1491
-        aConstraints.gridx = 0;
1492
-        aConstraints.gridy += 1;
1493
-        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);
14941500 
1495
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1496
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1498
-        aConstraints.gridx += 1;
1499
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1500
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1501
-        aConstraints.gridx = 0;
1502
-        aConstraints.gridy += 1;
1503
-        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);
15041506 
1505
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1506
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1507
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1508
-        aConstraints.gridx += 1;
1509
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1510
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1511
-        aConstraints.gridx = 0;
1512
-        aConstraints.gridy += 1;
1513
-        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);
15141512 
1515
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1516
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1518
-        aConstraints.gridx += 1;
1519
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1520
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1521
-        aConstraints.gridx = 0;
1522
-        aConstraints.gridy += 1;
1523
-        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);
15241518 
1525
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1526
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1527
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1528
-        aConstraints.gridx += 1;
1529
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1530
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1531
-        aConstraints.gridx = 0;
1532
-        aConstraints.gridy += 1;
1533
-        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);
15341524 
1535
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1536
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1538
-        aConstraints.gridx += 1;
1539
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1540
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1541
-        aConstraints.gridx = 0;
1542
-        aConstraints.gridy += 1;
1543
-        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);
15441530 
1545
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1546
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1548
-        aConstraints.gridx += 1;
1549
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1550
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1551
-        aConstraints.gridx = 0;
1552
-        aConstraints.gridy += 1;
1553
-        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);
15541536 
1555
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1556
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1557
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1558
-        aConstraints.gridx += 1;
1559
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1560
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1561
-        aConstraints.gridx = 0;
1562
-        aConstraints.gridy += 1;
1563
-        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);
15641544 
1565
-        //aConstraints.weighty = 1;
1566
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1567
-        //aConstraints.gridx += 1;
1568
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1569
-        aConstraints.weighty = 0;
1570
-        aConstraints.gridx = 0;
1571
-        aConstraints.gridy += 1;
1572
-        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);
15731550 
1574
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1575
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1577
-        aConstraints.gridx += 1;
1578
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1579
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1580
-        aConstraints.gridx = 0;
1581
-        aConstraints.gridy += 1;
1582
-        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);
15831556 
1584
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1585
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1586
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1587
-        aConstraints.gridx += 1;
1588
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1589
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1590
-        aConstraints.gridx = 0;
1591
-        aConstraints.gridy += 1;
1592
-        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);
15931562 
1594
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1595
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1596
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1597
-        aConstraints.gridx += 1;
1598
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1599
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1600
-        aConstraints.gridx = 0;
1601
-        aConstraints.gridy += 1;
1602
-        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);
16031568 
1604
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1605
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1607
-        aConstraints.gridx += 1;
1608
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1609
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1610
-        aConstraints.gridx = 0;
1611
-        aConstraints.gridy += 1;
1612
-        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);
16131574 
1614
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1615
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1616
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1617
-        aConstraints.gridx += 1;
1618
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1619
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1620
-        aConstraints.gridx = 0;
1621
-        aConstraints.gridy += 1;
1622
-        aConstraints.gridwidth = 1;
1623
-
1624
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1625
-        Return();
1575
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1576
+        //Return();
16261577 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16271578 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16281579 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1633,130 +1584,93 @@
16331584 //		aConstraints.gridy += 1;
16341585 //		aConstraints.gridwidth = 1;
16351586 
1636
-        //aConstraints.weighty = 1;
1637
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1638
-        //aConstraints.gridx += 1;
1639
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1640
-        aConstraints.weighty = 0;
1641
-        aConstraints.gridx = 0;
1642
-        aConstraints.gridy += 1;
1643
-        aConstraints.gridwidth = 1;
16441587 
1645
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1646
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648
-        aConstraints.gridx += 1;
1649
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1651
-        aConstraints.gridx = 0;
1652
-        aConstraints.gridy += 1;
1653
-        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);
16541595 
1655
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1656
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658
-        aConstraints.gridx += 1;
1659
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1661
-        aConstraints.gridx = 0;
1662
-        aConstraints.gridy += 1;
1663
-        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);
16641601 
1665
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1666
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668
-        aConstraints.gridx += 1;
1669
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1671
-        aConstraints.gridx = 0;
1672
-        aConstraints.gridy += 1;
1673
-        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);
16741607 
1675
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1676
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1678
-        aConstraints.gridx += 1;
1679
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1680
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1681
-        aConstraints.gridx = 0;
1682
-        aConstraints.gridy += 1;
1683
-        aConstraints.gridwidth = 1;
1684
-        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);
16851613 
1686
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1687
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1689
-        aConstraints.gridx += 1;
1690
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1691
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1692
-        aConstraints.gridx = 0;
1693
-        aConstraints.gridy += 1;
1694
-        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);
16951619 
1696
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1697
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699
-        aConstraints.gridx += 1;
1700
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1702
-        aConstraints.gridx = 0;
1703
-        aConstraints.gridy += 1;
1704
-        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);
17051627 
1706
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1707
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709
-        aConstraints.gridx += 1;
1710
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1712
-        aConstraints.gridx = 0;
1713
-        aConstraints.gridy += 1;
1714
-        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);
17151633 
1716
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1717
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719
-        aConstraints.gridx += 1;
1720
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1722
-        aConstraints.gridx = 0;
1723
-        aConstraints.gridy += 1;
1724
-        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);
17251639 
1726
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1727
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729
-        aConstraints.gridx += 1;
1730
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1732
-        aConstraints.gridx = 0;
1733
-        aConstraints.gridy += 1;
1734
-        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);
17351645 
1736
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1737
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1738
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1739
-        aConstraints.gridx += 1;
1740
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1741
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1742
-        aConstraints.gridx = 0;
1743
-        aConstraints.gridy += 1;
1744
-        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);
17451651 
1746
-        //aConstraints.weighty = 1;
1747
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1748
-        //aConstraints.gridx += 1;
1749
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1750
-        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);
17511657 
1752
-        aConstraints.gridx = 0;
1753
-        aConstraints.gridy = 0;
1754
-        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);
17551669 
17561670         SetMaterial(copy); // .GetMaterial());
17571671 
1758
-        colorField.addChangeListener(this);
1759
-        modulationField.addChangeListener(this);
1672
+        //colorField.addChangeListener(this);
1673
+//        modulationField.addChangeListener(this);
17601674         metalnessField.addChangeListener(this);
17611675         diffuseField.addChangeListener(this);
17621676         specularField.addChangeListener(this);
....@@ -2966,37 +2880,35 @@
29662880             return;
29672881         } else if (event.getSource() == toggleTimelineItem)
29682882         {
2969
-            copy.timeline ^= true;
2883
+            timeline ^= true;
29702884 
2971
-            if (copy.timeline)
2885
+            if (timeline)
29722886             {
29732887                 centralPanel.remove(cameraView);
2974
-                centralPanel.add(timelinePanel);
2888
+                cameraPanel.add(cameraView);
2889
+                centralPanel.add(cameraPanel);
29752890                 frame.setJMenuBar(timelineMenubar);
2891
+                wasFullScreen = CameraPane.FULLSCREEN;
2892
+                if (!CameraPane.FULLSCREEN)
2893
+                    ToggleFullScreen();
2894
+                toggleFullScreenItem.setEnabled(false);
29762895             }
29772896             else
29782897             {
2979
-                centralPanel.remove(timelinePanel);
2898
+                centralPanel.remove(cameraPanel);
29802899                 centralPanel.add(cameraView);
29812900                 frame.setJMenuBar(null);
2901
+                if (!wasFullScreen)
2902
+                    ToggleFullScreen();
2903
+                toggleFullScreenItem.setEnabled(true);
29822904             }
29832905 
29842906             frame.validate();
29852907             return;
29862908         } else if (event.getSource() == toggleFullScreenItem)
29872909         {
2988
-            if (CameraPane.FULLSCREEN)
2989
-            {
2990
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2991
-                framePanel.add(bigThree);
2992
-                frame.getContentPane().add(/*"Center",*/framePanel);
2993
-            } else
2994
-            {
2995
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2996
-                frame.getContentPane().add(/*"Center",*/bigThree);
2997
-            }
2910
+            ToggleFullScreen();
29982911             frame.validate();
2999
-            cameraView.ToggleFullScreen();
30002912 
30012913             return;
30022914         } else if (event.getSource() == toggleRandomItem)
....@@ -3106,7 +3018,8 @@
31063018             objEditor.refreshContents();
31073019         } else if (event.getSource() == stepItem)
31083020         {
3109
-            cameraView.ONESTEP = true;
3021
+            //cameraView.ONESTEP = true;
3022
+            Globals.ONESTEP = true;
31103023             cameraView.repaint();
31113024             return;
31123025         } else if (event.getSource() == stepButton)
....@@ -3263,25 +3176,25 @@
32633176 
32643177     void ToggleAnimation()
32653178     {
3266
-        if (!CameraPane.ANIMATION)
3179
+        if (!Globals.ANIMATION)
32673180         {
32683181             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32693182             browser.show();
32703183             String filename = browser.getFile();
32713184             if (filename != null && filename.length() > 0)
32723185             {
3273
-                CameraPane.filename = browser.getDirectory() + filename;
3186
+                Globals.filename = browser.getDirectory() + filename;
32743187                 //CameraPane.framecount = 0;
3275
-                CameraPane.imagecount = 0;
3188
+                Globals.imagecount = 0;
32763189 
3277
-                CameraPane.ANIMATION ^= true;
3190
+                Globals.ANIMATION ^= true;
32783191 
32793192                 GrafreeD.wav.cursor = 0;
32803193                 GrafreeD.wav.loop = 0;
32813194             }
32823195         } else
32833196         {
3284
-            CameraPane.ANIMATION ^= true;
3197
+            Globals.ANIMATION ^= true;
32853198         }
32863199     }
32873200 
....@@ -3460,7 +3373,7 @@
34603373             current.fakedepth = (float) fakedepthField.getFloat();
34613374             current.shadowbias = (float) shadowbiasField.getFloat();
34623375 
3463
-            if (!NumberSlider.frozen)
3376
+            if (!cNumberSlider.frozen)
34643377             {
34653378                 //System.out.println("Propagate = " + propagate);
34663379                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3534,7 +3447,13 @@
35343447             //System.out.println("PARENT = " + parent);
35353448             //if (parent != null)
35363449             //	parent.applySelf();
3537
-            refreshContents();
3450
+		if (e.getSource() == normalpushField)
3451
+		{
3452
+			objEditor.refreshContents();
3453
+			//Refresh();
3454
+		}
3455
+		else
3456
+                    refreshContents();
35383457             // ??? client.refreshEditWindow();
35393458         }
35403459         //else
....@@ -3546,7 +3465,7 @@
35463465         //group.name = nameField.getText();
35473466         //objEditor.applySelf();
35483467 
3549
-        assert (objEditor == this);
3468
+        // OCT2018: assert (objEditor == this);
35503469         if (copy.selection == null || copy.selection.size() == 0)
35513470 			//super.applySelf()
35523471                                 ; else
....@@ -3570,12 +3489,18 @@
35703489                 objEditor.copy = keep;
35713490             }
35723491         }
3492
+        
3493
+        if (normalpushField != null)
3494
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35733495     }
35743496 
35753497         void SnapObject()
35763498         {
3577
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3578
-            SnapObject(obj);
3499
+            if (copy.selection.size() > 0)
3500
+            {
3501
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3502
+                    SnapObject(obj);
3503
+            }
35793504         }
35803505         
35813506         void SnapObject(Object3D obj)
....@@ -3821,7 +3746,7 @@
38213746 
38223747             radioPanel.revalidate();
38233748             radioPanel.repaint();
3824
-            ctrlPanel.revalidate(); // ? new
3749
+            ctrlPanel.validate(); // ? new
38253750             ctrlPanel.repaint();
38263751         }
38273752     }
....@@ -4488,17 +4413,18 @@
44884413     JPanel treePanel;
44894414     JPanel radioPanel;
44904415     ButtonGroup buttonGroup;
4491
-    JPanel ctrlPanel;
4492
-    JPanel materialPanel;
4416
+    cGridBag ctrlPanel;
4417
+    cGridBag materialPanel;
44934418     JScrollPane infoPanel;
4494
-    JPanel optionsPanel;
4419
+    cGridBag optionsPanel;
44954420     JTabbedPane objectPanel;
4496
-    JPanel XYZPanel;
4421
+    cGridBag XYZPanel;
44974422     JSplitPane gridPanel;
44984423     JSplitPane bigPanel;
4499
-    JPanel bigThree;
4500
-    JTabbedPane scenePanel;
4501
-    JPanel centralPanel;
4424
+    cGridBag bigThree;
4425
+    cGridBag scenePanel;
4426
+    cGridBag centralPanel;
4427
+    JSplitPane cameraPanel;
45024428     JPanel timelinePanel;
45034429     JMenuBar timelineMenubar;
45044430     JSplitPane framePanel;
....@@ -4550,65 +4476,67 @@
45504476     // MATERIAL
45514477     JLabel materialLabel;
45524478     JLabel colorLabel;
4553
-    NumberSlider colorField;
4479
+    cNumberSlider colorField;
45544480     JLabel modulationLabel;
4555
-    NumberSlider modulationField;
4481
+    cNumberSlider modulationField;
45564482     JLabel metalnessLabel;
4557
-    NumberSlider metalnessField;
4483
+    cNumberSlider metalnessField;
45584484     JLabel diffuseLabel;
4559
-    NumberSlider diffuseField;
4485
+    cNumberSlider diffuseField;
45604486     JLabel specularLabel;
4561
-    NumberSlider specularField;
4487
+    cNumberSlider specularField;
45624488     JLabel shininessLabel;
4563
-    NumberSlider shininessField;
4489
+    cNumberSlider shininessField;
45644490     JLabel shiftLabel;
4565
-    NumberSlider shiftField;
4491
+    cNumberSlider shiftField;
45664492     JLabel ambientLabel;
4567
-    NumberSlider ambientField;
4493
+    cNumberSlider ambientField;
45684494     JLabel lightareaLabel;
4569
-    NumberSlider lightareaField;
4495
+    cNumberSlider lightareaField;
45704496     JLabel diffusenessLabel;
4571
-    NumberSlider diffusenessField;
4497
+    cNumberSlider diffusenessField;
45724498     JLabel velvetLabel;
4573
-    NumberSlider velvetField;
4499
+    cNumberSlider velvetField;
45744500     JLabel sheenLabel;
4575
-    NumberSlider sheenField;
4501
+    cNumberSlider sheenField;
45764502     JLabel subsurfaceLabel;
4577
-    NumberSlider subsurfaceField;
4503
+    cNumberSlider subsurfaceField;
45784504     //JLabel bumpLabel;
45794505     //NumberSlider bumpField;
45804506     JLabel backlitLabel;
4581
-    NumberSlider backlitField;
4507
+    cNumberSlider backlitField;
45824508     JLabel anisoLabel;
4583
-    NumberSlider anisoField;
4509
+    cNumberSlider anisoField;
45844510     JLabel anisoVLabel;
4585
-    NumberSlider anisoVField;
4511
+    cNumberSlider anisoVField;
45864512     JLabel cameraLabel;
4587
-    NumberSlider cameraField;
4513
+    cNumberSlider cameraField;
45884514     JLabel selfshadowLabel;
4589
-    NumberSlider selfshadowField;
4515
+    cNumberSlider selfshadowField;
45904516     JLabel shadowLabel;
4591
-    NumberSlider shadowField;
4517
+    cNumberSlider shadowField;
45924518     JLabel textureLabel;
4593
-    NumberSlider textureField;
4519
+    cNumberSlider textureField;
45944520     JLabel opacityLabel;
4595
-    NumberSlider opacityField;
4521
+    cNumberSlider opacityField;
45964522     JLabel fakedepthLabel;
4597
-    NumberSlider fakedepthField;
4523
+    cNumberSlider fakedepthField;
45984524     JLabel shadowbiasLabel;
4599
-    NumberSlider shadowbiasField;
4525
+    cNumberSlider shadowbiasField;
46004526     JLabel bumpLabel;
4601
-    NumberSlider bumpField;
4527
+    cNumberSlider bumpField;
46024528     JLabel noiseLabel;
4603
-    NumberSlider noiseField;
4529
+    cNumberSlider noiseField;
46044530     JLabel powerLabel;
4605
-    NumberSlider powerField;
4531
+    cNumberSlider powerField;
46064532     JLabel borderfadeLabel;
4607
-    NumberSlider borderfadeField;
4533
+    cNumberSlider borderfadeField;
46084534     JLabel fogLabel;
4609
-    NumberSlider fogField;
4535
+    cNumberSlider fogField;
46104536     JLabel opacityPowerLabel;
4611
-    NumberSlider opacityPowerField;
4537
+    cNumberSlider opacityPowerField;
46124538     JTree jTree;
46134539     //ObjectUI parent;
4540
+    
4541
+    cNumberSlider normalpushField;
46144542 }