blame | history | patch | commit | commitdiff
Normand Briere
2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0 
 ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020         matrix.Matrix;
2121 
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325         ActionListener, ChangeListener,
2426         InputMethodListener,
....@@ -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,16 +302,18 @@
292302         //normalLensItem.addActionListener(this);
293303         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294304         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
305
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306
+        toggleTimelineItem.addItemListener(this);
307
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308
+        toggleFullScreenItem.addItemListener(this);
309
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298310         cameraMenu.add("-");
299311         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300312         toggleTextureItem.addItemListener(this);
301313         toggleTextureItem.setState(CameraPane.textureon);
302314         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303315         toggleLiveItem.addItemListener(this);
304
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
305317         cameraMenu.add(stepItem = new MenuItem("Step"));
306318         stepItem.addActionListener(this);
307319 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -343,9 +355,9 @@
343355         toolbarPanel.setName("Toolbar");
344356         treePanel = new JPanel();
345357         treePanel.setName("Tree");
346
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
347359         ctrlPanel.setName("Edit");
348
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
349361         materialPanel.setName("Material");
350362         /*JTextPane*/
351363         infoarea = createTextPane();
....@@ -375,7 +387,7 @@
375387         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376388         treePanel.setLayout(new GridBagLayout());
377389         ctrlPanel.setLayout(new GridBagLayout());
378
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
379391 
380392         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381393                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -594,6 +606,22 @@
594606         }
595607     }
596608 
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
+
597625     private JTextArea createTextPane()
598626     {
599627         String[] initString =
....@@ -786,65 +814,47 @@
786814         return combo;
787815     }
788816 
789
-    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)
790818     {
791
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
792822 
793823         JLabel jlabel = new JLabel(label);
794
-
795
-        aConstraints.fill = GridBagConstraints.VERTICAL;
796824         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797
-        aConstraints.gridwidth = 2;
798
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799
-        aConstraints.gridx += 1;
800
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
801
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802
-        ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803
-        aConstraints.gridx += 1;
804
-        aConstraints.gridwidth = 1;
805
-
825
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826
+        control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806827         combo.setFloat(current);
807
-
808
-        combo.label = jlabel;
809
-
810
-        combo.addChangeListener(this);
811
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
812831         return combo;
813832     }
814833 
815
-    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)
816835     {
817
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
818839 
819840         JLabel jlabel = new JLabel(label);
820
-
821
-        aConstraints.fill = GridBagConstraints.VERTICAL;
822841         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
-        aConstraints.gridwidth = 2;
824
-        ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
-        aConstraints.gridx += 1;
826
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
-        ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
-        aConstraints.gridx += 1;
830
-        aConstraints.gridwidth = 1;
831
-
842
+        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
+        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832844         combo.setInteger(current);
833845 
834
-        combo.label = jlabel;
835
-
836
-        combo.addChangeListener(this);
837
-
846
+        ctrlPanel.add(control);
847
+        
838848         return combo;
839849     }
840850 
841
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
842852     {
843853         JTextArea text;
844854 
845855         aConstraints.fill = GridBagConstraints.HORIZONTAL;
846856         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847
-        ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857
+        ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848858         text.addCaretListener(this);
849859         aConstraints.gridx += 1;
850860         aConstraints.gridwidth = 1;
....@@ -874,6 +884,13 @@
874884     {
875885         j.removeChangeListener(this);
876886         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);
877894         objEditor.ctrlPanel.remove(j);
878895     }
879896 
....@@ -963,6 +980,9 @@
963980 
964981         Return();
965982 
983
+    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
+    Return();
985
+            
966986 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967987 //        ObjEditor.aConstraints.gridx += 1;
968988 
....@@ -1158,10 +1178,22 @@
11581178         //JPanel worldPanel =
11591179         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601180         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1181
+	centralPanel = new cGridBag();
1182
+        centralPanel.preferredWidth = 20;
1183
+	timelinePanel = new JPanel(new BorderLayout());
1184
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641185 
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
+        
1193
+        centralPanel.add(cameraView);
1194
+        //frame.setJMenuBar(timelineMenubar);
1195
+        //centralPanel.add(timelinePanel);
1196
+        
11651197         //topView.camera = ;
11661198         //frontView.camera = new Camera(2);
11671199         //sideView.camera = new Camera(3);
....@@ -1177,12 +1209,13 @@
11771209         //frontView.object = copy;
11781210         //sideView.object = copy;
11791211 
1180
-        XYZPanel = new JPanel();
1181
-        XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212
+        XYZPanel = new cGridBag().setVertical(true);
1213
+        //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
11821214 
1183
-        XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1184
-        XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1185
-        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);
11861219 
11871220         /*
11881221         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1191,7 +1224,7 @@
11911224         gridPanel.add(cameraView);
11921225         gridPanel.add(XYZPanel);
11931226          */
1194
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1227
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951228         gridPanel.setContinuousLayout(true);
11961229         gridPanel.setOneTouchExpandable(true);
11971230         gridPanel.setDividerLocation(1.0);
....@@ -1244,16 +1277,23 @@
12441277         scrollpane.setWheelScrollingEnabled(true);
12451278         scrollpane.addMouseWheelListener(this); // Default not fast enough
12461279 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1280
+        /*JTabbedPane*/ scenePanel = new cGridBag();
1281
+        scenePanel.preferredWidth = 7;
1282
+        
1283
+        JTabbedPane tabbedPane = new JTabbedPane();
1284
+        tabbedPane.add(scrollpane);
12491285 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
12511287 
1252
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
12531289 
12541290         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1256
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
12571297 
12581298         /*
12591299         cTree jTree = new cTree(null);
....@@ -1275,7 +1315,7 @@
12751315         jtp.add(tree);
12761316          */
12771317 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1318
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791319         bigPanel.setContinuousLayout(true);
12801320         bigPanel.setOneTouchExpandable(true);
12811321         bigPanel.setDividerLocation(0.8);
....@@ -1287,6 +1327,7 @@
12871327         //bigPanel.setSize(new Dimension(10,10));
12881328         //bigPanel.add(ctrlPanel);
12891329         //bigPanel.add(gridPanel);
1330
+        /**
12901331         bigThree = new JPanel();
12911332         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
12921333         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1297,20 +1338,26 @@
12971338         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981339         aWindowConstraints.weightx = 0;
12991340         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1341
+        bigThree.add(scenePanel, aWindowConstraints);
13011342         aWindowConstraints.weightx = 1;
13021343         aWindowConstraints.gridwidth = 3;
13031344         //	aConstraints.gridheight = 3;
13041345         aWindowConstraints.gridx = 1;
13051346         aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
-        bigThree.add(cameraPanel, aWindowConstraints);
1347
+        bigThree.add(centralPanel, aWindowConstraints);
13071348         aWindowConstraints.weightx = 0;
13081349         aWindowConstraints.gridx = 4;
13091350         aWindowConstraints.gridwidth = 1;
13101351         //	aConstraints.gridheight = 3;
13111352         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13121353         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
13131355 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
13141361 //                // SIDE EFFECT!!!
13151362 //		aConstraints.gridx = 0;
13161363 //		aConstraints.gridy = 0;
....@@ -1331,7 +1378,8 @@
13311378         //worldPane.add(bigPanel);
13321379         //worldPane.add(worldPanel);
13331380                 /**/
1334
-        frame.getContentPane().add(/*"Center",*/framePanel);
1381
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1382
+        frame.add(/*"Center",*/framePanel);
13351383         //frame.getContentPane().add(/*"Center",*/ worldPane);
13361384 
13371385 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1352,6 +1400,10 @@
13521400         });
13531401     }
13541402 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
13551407     JTree GetTree()
13561408     {
13571409         return objEditor.jTree;
....@@ -1363,260 +1415,175 @@
13631415         ctrlPanel.removeAll();
13641416     }
13651417 
1366
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
13671419     {
1368
-        aConstraints.weighty = 0;
1369
-        //aConstraints.weightx = 1;
1370
-                /*
1420
+         /*
13711421         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
13721422         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374
-        aConstraints.gridx += 1;
13751423          */
13761424 
1377
-        aConstraints.gridwidth = 1;
1378
-        ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379
-        aConstraints.gridx += 1;
1380
-        aConstraints.weighty = 0;
1381
-        aConstraints.gridwidth = 1;
1425
+        cGridBag editBar = new cGridBag().setVertical(false);
1426
+            
1427
+        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
13821428 
13831429         /*
13841430         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385
-        aConstraints.gridx += 1;
1386
-        aConstraints.weighty = 0;
1387
-        aConstraints.gridwidth = 1;
13881431          */
13891432 
1390
-        ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391
-        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);
13921437 
1393
-        ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394
-
1395
-        aConstraints.gridx += 1;
1396
-
1397
-        ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398
-
1399
-        aConstraints.gridx += 1;
1400
-
1401
-        ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402
-
1403
-        aConstraints.gridx = 0;
1404
-        aConstraints.gridy += 1;
1405
-        aConstraints.weighty = 0;
1406
-        aConstraints.gridwidth = 1;
1438
+        ctrlPanel.add(editBar);
1439
+        
14071440         /**/
14081441         //aConstraints.weighty = 0;
14091442         ////aConstraints.weightx = 1;
14101443         //aConstraints.weighty = 1;
14111444         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14121445         //aConstraints.gridx += 1;
1413
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414
-        aConstraints.weighty = 0;
1415
-        aConstraints.gridx = 0;
1416
-        aConstraints.gridy += 1;
1417
-        aConstraints.gridwidth = 1;
1446
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14181447 
1419
-        ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420
-        colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422
-        aConstraints.gridx += 1;
1423
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424
-        //aConstraints.weightx = 0;
1425
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426
-        aConstraints.gridx = 0;
1427
-        aConstraints.gridy += 1;
1428
-        aConstraints.gridwidth = 1;
1448
+        JPanel colorPanel = new JPanel(new BorderLayout());
1449
+        colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
+        
1451
+        cGridBag colorSection = new cGridBag().setVertical(true);
1452
+        
1453
+        colorPanel.add(colorSection);
1454
+        
1455
+        cGridBag color = new cGridBag();
1456
+                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
+                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
+                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1459
+        colorSection.add(color);
14291460 
1430
-        ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431
-        modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433
-        aConstraints.gridx += 1;
1434
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436
-        aConstraints.gridx = 0;
1437
-        aConstraints.gridy += 1;
1438
-        aConstraints.gridwidth = 1;
1461
+        cGridBag modulation = new cGridBag();
1462
+                modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1463
+                modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1465
+        colorSection.add(modulation);
14391466 
1440
-        ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441
-        textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443
-        aConstraints.gridx += 1;
1444
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446
-        aConstraints.gridx = 0;
1447
-        aConstraints.gridy += 1;
1448
-        aConstraints.gridwidth = 1;
1467
+        cGridBag texture = new cGridBag();
1468
+                texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1469
+                textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470
+                texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471
+        colorSection.add(texture);
14491472 
1450
-        ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451
-        anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453
-        aConstraints.gridx += 1;
1454
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456
-        aConstraints.gridx = 0;
1457
-        aConstraints.gridy += 1;
1458
-        aConstraints.gridwidth = 1;
1473
+        cGridBag anisoU = new cGridBag();
1474
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477
+        colorSection.add(anisoU);
14591478 
1460
-        ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461
-        anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
-        aConstraints.gridx += 1;
1464
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
-        aConstraints.gridx = 0;
1467
-        aConstraints.gridy += 1;
1468
-        aConstraints.gridwidth = 1;
1479
+        cGridBag anisoV = new cGridBag();
1480
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483
+        colorSection.add(anisoV);
14691484 
1470
-        ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471
-        shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473
-        aConstraints.gridx += 1;
1474
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475
-        ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476
-        aConstraints.gridx = 0;
1477
-        aConstraints.gridy += 1;
1478
-        aConstraints.gridwidth = 1;
1485
+        cGridBag shadowbias = new cGridBag();
1486
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
+        colorSection.add(shadowbias);
14791490 
1480
-        //aConstraints.weighty = 1;
1481
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482
-        //aConstraints.gridx += 1;
1483
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484
-        aConstraints.weighty = 0;
1485
-        aConstraints.gridx = 0;
1486
-        aConstraints.gridy += 1;
1487
-        aConstraints.gridwidth = 1;
1491
+        ctrlPanel.add(colorPanel);
1492
+        
1493
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494
+        
1495
+        JPanel diffusePanel = new JPanel(new BorderLayout());
1496
+        diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
+        
1498
+        cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
+        
1500
+        diffusePanel.add(diffuseSection);
1501
+        
1502
+        cGridBag diffuse = new cGridBag();
1503
+                diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1504
+                diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505
+                diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1506
+        diffuseSection.add(diffuse);
14881507 
1489
-        ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490
-        diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492
-        aConstraints.gridx += 1;
1493
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494
-        ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495
-        aConstraints.gridx = 0;
1496
-        aConstraints.gridy += 1;
1497
-        aConstraints.gridwidth = 1;
1508
+        cGridBag diffuseness = new cGridBag();
1509
+                diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1510
+                diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
+                diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1512
+        diffuseSection.add(diffuseness);
14981513 
1499
-        ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500
-        diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502
-        aConstraints.gridx += 1;
1503
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504
-        ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505
-        aConstraints.gridx = 0;
1506
-        aConstraints.gridy += 1;
1507
-        aConstraints.gridwidth = 1;
1514
+        cGridBag selfshadow = new cGridBag();
1515
+                selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1516
+                selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517
+                selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1518
+        diffuseSection.add(selfshadow);
15081519 
1509
-        ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510
-        selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512
-        aConstraints.gridx += 1;
1513
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514
-        ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515
-        aConstraints.gridx = 0;
1516
-        aConstraints.gridy += 1;
1517
-        aConstraints.gridwidth = 1;
1520
+        cGridBag sheen = new cGridBag();
1521
+                sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1522
+                sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523
+                sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1524
+        diffuseSection.add(sheen);
15181525 
1519
-        ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520
-        sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522
-        aConstraints.gridx += 1;
1523
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524
-        ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525
-        aConstraints.gridx = 0;
1526
-        aConstraints.gridy += 1;
1527
-        aConstraints.gridwidth = 1;
1526
+        cGridBag subsurface = new cGridBag();
1527
+                subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1528
+                subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
+                subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530
+        diffuseSection.add(subsurface);
15281531 
1529
-        ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530
-        subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532
-        aConstraints.gridx += 1;
1533
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535
-        aConstraints.gridx = 0;
1536
-        aConstraints.gridy += 1;
1537
-        aConstraints.gridwidth = 1;
1532
+        cGridBag shadow = new cGridBag();
1533
+                shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1534
+                shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
+                shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1536
+        diffuseSection.add(shadow);
15381537 
1539
-        ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540
-        shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542
-        aConstraints.gridx += 1;
1543
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544
-        ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545
-        aConstraints.gridx = 0;
1546
-        aConstraints.gridy += 1;
1547
-        aConstraints.gridwidth = 1;
1538
+        cGridBag fakedepth = new cGridBag();
1539
+                fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1540
+                fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
+                fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
+        diffuseSection.add(fakedepth);
15481543 
1549
-        ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550
-        fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552
-        aConstraints.gridx += 1;
1553
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554
-        ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555
-        aConstraints.gridx = 0;
1556
-        aConstraints.gridy += 1;
1557
-        aConstraints.gridwidth = 1;
1544
+        ctrlPanel.add(diffusePanel);
1545
+        
1546
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547
+        
1548
+        JPanel specularPanel = new JPanel(new BorderLayout());
1549
+        specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
+        
1551
+        cGridBag specularSection = new cGridBag().setVertical(true);
1552
+        
1553
+        specularPanel.add(specularSection);
15581554 
1559
-        //aConstraints.weighty = 1;
1560
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561
-        //aConstraints.gridx += 1;
1562
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563
-        aConstraints.weighty = 0;
1564
-        aConstraints.gridx = 0;
1565
-        aConstraints.gridy += 1;
1566
-        aConstraints.gridwidth = 1;
1555
+        cGridBag specular = new cGridBag();
1556
+                specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1557
+                specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558
+                specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1559
+        specularSection.add(specular);
15671560 
1568
-        ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569
-        specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571
-        aConstraints.gridx += 1;
1572
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573
-        ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574
-        aConstraints.gridx = 0;
1575
-        aConstraints.gridy += 1;
1576
-        aConstraints.gridwidth = 1;
1561
+        cGridBag lightarea = new cGridBag();
1562
+                lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1563
+                lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564
+                lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1565
+        specularSection.add(lightarea);
15771566 
1578
-        ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579
-        lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581
-        aConstraints.gridx += 1;
1582
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583
-        ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584
-        aConstraints.gridx = 0;
1585
-        aConstraints.gridy += 1;
1586
-        aConstraints.gridwidth = 1;
1567
+        cGridBag shininess = new cGridBag();
1568
+                shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1569
+                shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570
+                shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1571
+        specularSection.add(shininess);
15871572 
1588
-        ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589
-        shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591
-        aConstraints.gridx += 1;
1592
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593
-        ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594
-        aConstraints.gridx = 0;
1595
-        aConstraints.gridy += 1;
1596
-        aConstraints.gridwidth = 1;
1573
+        cGridBag metalness = new cGridBag();
1574
+                metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1575
+                metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576
+                metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1577
+        specularSection.add(metalness);
15971578 
1598
-        ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599
-        metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601
-        aConstraints.gridx += 1;
1602
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604
-        aConstraints.gridx = 0;
1605
-        aConstraints.gridy += 1;
1606
-        aConstraints.gridwidth = 1;
1579
+        cGridBag velvet = new cGridBag();
1580
+                velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1581
+                velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
+                velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583
+        specularSection.add(velvet);
16071584 
1608
-        ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609
-        velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611
-        aConstraints.gridx += 1;
1612
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613
-        ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614
-        aConstraints.gridx = 0;
1615
-        aConstraints.gridy += 1;
1616
-        aConstraints.gridwidth = 1;
1617
-
1618
-        shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619
-        Return();
1585
+        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1586
+        //Return();
16201587 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16211588 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16221589 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1627,130 +1594,97 @@
16271594 //		aConstraints.gridy += 1;
16281595 //		aConstraints.gridwidth = 1;
16291596 
1630
-        //aConstraints.weighty = 1;
1631
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632
-        //aConstraints.gridx += 1;
1633
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634
-        aConstraints.weighty = 0;
1635
-        aConstraints.gridx = 0;
1636
-        aConstraints.gridy += 1;
1637
-        aConstraints.gridwidth = 1;
16381597 
1639
-        ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640
-        cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
-        aConstraints.gridx += 1;
1643
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
-        ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645
-        aConstraints.gridx = 0;
1646
-        aConstraints.gridy += 1;
1647
-        aConstraints.gridwidth = 1;
1598
+        ctrlPanel.add(specularPanel);
1599
+        
1600
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601
+        
1602
+        JPanel globalPanel = new JPanel(new BorderLayout());
1603
+        globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
+        
1605
+        cGridBag globalSection = new cGridBag().setVertical(true);
1606
+        
1607
+        globalPanel.add(globalSection);
16481608 
1649
-        ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650
-        ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
-        aConstraints.gridx += 1;
1653
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
-        ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
-        aConstraints.gridx = 0;
1656
-        aConstraints.gridy += 1;
1657
-        aConstraints.gridwidth = 1;
1609
+        cGridBag camera = new cGridBag();
1610
+                camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611
+                cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612
+                camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
+        globalSection.add(camera);
16581614 
1659
-        ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660
-        backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662
-        aConstraints.gridx += 1;
1663
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664
-        ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665
-        aConstraints.gridx = 0;
1666
-        aConstraints.gridy += 1;
1667
-        aConstraints.gridwidth = 1;
1615
+        cGridBag ambient = new cGridBag();
1616
+                ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617
+                ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618
+                ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619
+        globalSection.add(ambient);
16681620 
1669
-        ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670
-        opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672
-        aConstraints.gridx += 1;
1673
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675
-        aConstraints.gridx = 0;
1676
-        aConstraints.gridy += 1;
1677
-        aConstraints.gridwidth = 1;
1678
-        aConstraints.weighty = 0;
1621
+        cGridBag backlit = new cGridBag();
1622
+                backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623
+                backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
+                backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
+        globalSection.add(backlit);
16791626 
1680
-        ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681
-        bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
-        aConstraints.gridx += 1;
1684
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
-        ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686
-        aConstraints.gridx = 0;
1687
-        aConstraints.gridy += 1;
1688
-        aConstraints.gridwidth = 1;
1627
+        cGridBag opacity = new cGridBag();
1628
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
+        globalSection.add(opacity);
16891632 
1690
-        ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691
-        noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
-        aConstraints.gridx += 1;
1694
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
-        ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1696
-        aConstraints.gridx = 0;
1697
-        aConstraints.gridy += 1;
1698
-        aConstraints.gridwidth = 1;
1633
+        ctrlPanel.add(globalPanel);
1634
+        
1635
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636
+        
1637
+        JPanel texturePanel = new JPanel(new BorderLayout());
1638
+        texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
+        
1640
+        cGridBag textureSection = new cGridBag().setVertical(true);
1641
+        
1642
+        texturePanel.add(textureSection);
16991643 
1700
-        ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701
-        powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
-        aConstraints.gridx += 1;
1704
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
-        ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706
-        aConstraints.gridx = 0;
1707
-        aConstraints.gridy += 1;
1708
-        aConstraints.gridwidth = 1;
1644
+        cGridBag bump = new cGridBag();
1645
+                bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1646
+                bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647
+                bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1648
+        textureSection.add(bump);
17091649 
1710
-        ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711
-        borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
-        aConstraints.gridx += 1;
1714
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
-        ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716
-        aConstraints.gridx = 0;
1717
-        aConstraints.gridy += 1;
1718
-        aConstraints.gridwidth = 1;
1650
+        cGridBag noise = new cGridBag();
1651
+                noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1652
+                noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653
+                noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1654
+        textureSection.add(noise);
17191655 
1720
-        ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721
-        fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723
-        aConstraints.gridx += 1;
1724
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725
-        ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726
-        aConstraints.gridx = 0;
1727
-        aConstraints.gridy += 1;
1728
-        aConstraints.gridwidth = 1;
1656
+        cGridBag power = new cGridBag();
1657
+                power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1658
+                powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659
+                power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1660
+        textureSection.add(power);
17291661 
1730
-        ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731
-        opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733
-        aConstraints.gridx += 1;
1734
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735
-        ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1736
-        aConstraints.gridx = 0;
1737
-        aConstraints.gridy += 1;
1738
-        aConstraints.gridwidth = 1;
1662
+        cGridBag borderfade = new cGridBag();
1663
+                borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1664
+                borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665
+                borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1666
+        textureSection.add(borderfade);
17391667 
1740
-        //aConstraints.weighty = 1;
1741
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742
-        //aConstraints.gridx += 1;
1743
-        ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744
-        aConstraints.weighty = 0;
1668
+        cGridBag fog = new cGridBag();
1669
+                fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1670
+                fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
+                fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1672
+        textureSection.add(fog);
17451673 
1746
-        aConstraints.gridx = 0;
1747
-        aConstraints.gridy = 0;
1748
-        aConstraints.gridwidth = 1;
1674
+        cGridBag opacityPower = new cGridBag();
1675
+                opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1676
+                opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677
+                opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1678
+        textureSection.add(opacityPower);
1679
+
1680
+        ctrlPanel.add(texturePanel);
1681
+        
1682
+        //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17491683 
17501684         SetMaterial(copy); // .GetMaterial());
17511685 
1752
-        colorField.addChangeListener(this);
1753
-        modulationField.addChangeListener(this);
1686
+        //colorField.addChangeListener(this);
1687
+//        modulationField.addChangeListener(this);
17541688         metalnessField.addChangeListener(this);
17551689         diffuseField.addChangeListener(this);
17561690         specularField.addChangeListener(this);
....@@ -2958,20 +2892,37 @@
29582892             // june 2013           copy.HardTouch();
29592893             cameraView.repaint();
29602894             return;
2961
-        } else if (event.getSource() == toggleFullItem)
2895
+        } else if (event.getSource() == toggleTimelineItem)
29622896         {
2963
-            if (CameraPane.FULLSCREEN)
2897
+            timeline ^= true;
2898
+
2899
+            if (timeline)
29642900             {
2965
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2966
-                framePanel.add(bigThree);
2967
-                frame.getContentPane().add(/*"Center",*/framePanel);
2968
-            } else
2969
-            {
2970
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2971
-                frame.getContentPane().add(/*"Center",*/bigThree);
2901
+                centralPanel.remove(cameraView);
2902
+                cameraPanel.add(cameraView);
2903
+                centralPanel.add(cameraPanel);
2904
+                frame.setJMenuBar(timelineMenubar);
2905
+                wasFullScreen = CameraPane.FULLSCREEN;
2906
+                if (!CameraPane.FULLSCREEN)
2907
+                    ToggleFullScreen();
2908
+                toggleFullScreenItem.setEnabled(false);
29722909             }
2910
+            else
2911
+            {
2912
+                centralPanel.remove(cameraPanel);
2913
+                centralPanel.add(cameraView);
2914
+                frame.setJMenuBar(null);
2915
+                if (!wasFullScreen)
2916
+                    ToggleFullScreen();
2917
+                toggleFullScreenItem.setEnabled(true);
2918
+            }
2919
+
29732920             frame.validate();
2974
-            cameraView.ToggleFullScreen();
2921
+            return;
2922
+        } else if (event.getSource() == toggleFullScreenItem)
2923
+        {
2924
+            ToggleFullScreen();
2925
+            frame.validate();
29752926 
29762927             return;
29772928         } else if (event.getSource() == toggleRandomItem)
....@@ -3081,7 +3032,8 @@
30813032             objEditor.refreshContents();
30823033         } else if (event.getSource() == stepItem)
30833034         {
3084
-            cameraView.ONESTEP = true;
3035
+            //cameraView.ONESTEP = true;
3036
+            Globals.ONESTEP = true;
30853037             cameraView.repaint();
30863038             return;
30873039         } else if (event.getSource() == stepButton)
....@@ -3220,9 +3172,9 @@
32203172             cameraView.RevertCamera();
32213173             cameraView.repaint();
32223174             return;
3223
-        } else if (event.getSource() == textureButton)
3224
-        {
3225
-            return; // true;
3175
+//        } else if (event.getSource() == textureButton)
3176
+//        {
3177
+//            return; // true;
32263178         } else // combos...
32273179         if (event.getSource() == texresMenu)
32283180         {
....@@ -3238,25 +3190,25 @@
32383190 
32393191     void ToggleAnimation()
32403192     {
3241
-        if (!CameraPane.ANIMATION)
3193
+        if (!Globals.ANIMATION)
32423194         {
32433195             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32443196             browser.show();
32453197             String filename = browser.getFile();
32463198             if (filename != null && filename.length() > 0)
32473199             {
3248
-                CameraPane.filename = browser.getDirectory() + filename;
3200
+                Globals.filename = browser.getDirectory() + filename;
32493201                 //CameraPane.framecount = 0;
3250
-                CameraPane.imagecount = 0;
3202
+                Globals.imagecount = 0;
32513203 
3252
-                CameraPane.ANIMATION ^= true;
3204
+                Globals.ANIMATION ^= true;
32533205 
32543206                 GrafreeD.wav.cursor = 0;
32553207                 GrafreeD.wav.loop = 0;
32563208             }
32573209         } else
32583210         {
3259
-            CameraPane.ANIMATION ^= true;
3211
+            Globals.ANIMATION ^= true;
32603212         }
32613213     }
32623214 
....@@ -3435,7 +3387,7 @@
34353387             current.fakedepth = (float) fakedepthField.getFloat();
34363388             current.shadowbias = (float) shadowbiasField.getFloat();
34373389 
3438
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
34393391             {
34403392                 //System.out.println("Propagate = " + propagate);
34413393                 copy.UpdateMaterial(anchor, current, propagate);
....@@ -3509,7 +3461,13 @@
35093461             //System.out.println("PARENT = " + parent);
35103462             //if (parent != null)
35113463             //	parent.applySelf();
3512
-            refreshContents();
3464
+		if (e.getSource() == normalpushField)
3465
+		{
3466
+			objEditor.refreshContents();
3467
+			//Refresh();
3468
+		}
3469
+		else
3470
+                    refreshContents();
35133471             // ??? client.refreshEditWindow();
35143472         }
35153473         //else
....@@ -3521,7 +3479,7 @@
35213479         //group.name = nameField.getText();
35223480         //objEditor.applySelf();
35233481 
3524
-        assert (objEditor == this);
3482
+        // OCT2018: assert (objEditor == this);
35253483         if (copy.selection == null || copy.selection.size() == 0)
35263484 			//super.applySelf()
35273485                                 ; else
....@@ -3545,12 +3503,18 @@
35453503                 objEditor.copy = keep;
35463504             }
35473505         }
3506
+        
3507
+        if (normalpushField != null)
3508
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35483509     }
35493510 
35503511         void SnapObject()
35513512         {
3552
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3553
-            SnapObject(obj);
3513
+            if (copy.selection.size() > 0)
3514
+            {
3515
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3516
+                    SnapObject(obj);
3517
+            }
35543518         }
35553519         
35563520         void SnapObject(Object3D obj)
....@@ -3664,7 +3628,7 @@
36643628 
36653629         if (obj.parent != null)
36663630         {
3667
-            obj.parent.TransformToWorld(interest);
3631
+//            obj.parent.TransformToWorld(interest);
36683632         }
36693633 
36703634         if (!CameraPane.TRACK)
....@@ -3796,7 +3760,7 @@
37963760 
37973761             radioPanel.revalidate();
37983762             radioPanel.repaint();
3799
-            ctrlPanel.revalidate(); // ? new
3763
+            ctrlPanel.validate(); // ? new
38003764             ctrlPanel.repaint();
38013765         }
38023766     }
....@@ -4444,7 +4408,8 @@
44444408     MenuItem revertCameraItem;
44454409     CheckboxMenuItem toggleLiveItem;
44464410     MenuItem stepItem;
4447
-    CheckboxMenuItem toggleFullItem;
4411
+    CheckboxMenuItem toggleFullScreenItem;
4412
+    CheckboxMenuItem toggleTimelineItem;
44484413     CheckboxMenuItem toggleRenderItem;
44494414     CheckboxMenuItem toggleDebugItem;
44504415     CheckboxMenuItem toggleFrustumItem;
....@@ -4462,20 +4427,23 @@
44624427     JPanel treePanel;
44634428     JPanel radioPanel;
44644429     ButtonGroup buttonGroup;
4465
-    JPanel ctrlPanel;
4466
-    JPanel materialPanel;
4430
+    cGridBag ctrlPanel;
4431
+    cGridBag materialPanel;
44674432     JScrollPane infoPanel;
4468
-    JPanel optionsPanel;
4433
+    cGridBag optionsPanel;
44694434     JTabbedPane objectPanel;
4470
-    JPanel XYZPanel;
4435
+    cGridBag XYZPanel;
44714436     JSplitPane gridPanel;
44724437     JSplitPane bigPanel;
4473
-    JPanel bigThree;
4474
-    JTabbedPane jtp;
4475
-    JPanel cameraPanel;
4438
+    cGridBag bigThree;
4439
+    cGridBag scenePanel;
4440
+    cGridBag centralPanel;
4441
+    JSplitPane cameraPanel;
4442
+    JPanel timelinePanel;
4443
+    JMenuBar timelineMenubar;
44764444     JSplitPane framePanel;
44774445     JTextArea/*Field*/ nameField;
4478
-    cButton textureButton;
4446
+    //cButton textureButton;
44794447     cButton okButton;
44804448     cButton applyButton;
44814449     cButton cancelButton;
....@@ -4522,65 +4490,67 @@
45224490     // MATERIAL
45234491     JLabel materialLabel;
45244492     JLabel colorLabel;
4525
-    NumberSlider colorField;
4493
+    cNumberSlider colorField;
45264494     JLabel modulationLabel;
4527
-    NumberSlider modulationField;
4495
+    cNumberSlider modulationField;
45284496     JLabel metalnessLabel;
4529
-    NumberSlider metalnessField;
4497
+    cNumberSlider metalnessField;
45304498     JLabel diffuseLabel;
4531
-    NumberSlider diffuseField;
4499
+    cNumberSlider diffuseField;
45324500     JLabel specularLabel;
4533
-    NumberSlider specularField;
4501
+    cNumberSlider specularField;
45344502     JLabel shininessLabel;
4535
-    NumberSlider shininessField;
4503
+    cNumberSlider shininessField;
45364504     JLabel shiftLabel;
4537
-    NumberSlider shiftField;
4505
+    cNumberSlider shiftField;
45384506     JLabel ambientLabel;
4539
-    NumberSlider ambientField;
4507
+    cNumberSlider ambientField;
45404508     JLabel lightareaLabel;
4541
-    NumberSlider lightareaField;
4509
+    cNumberSlider lightareaField;
45424510     JLabel diffusenessLabel;
4543
-    NumberSlider diffusenessField;
4511
+    cNumberSlider diffusenessField;
45444512     JLabel velvetLabel;
4545
-    NumberSlider velvetField;
4513
+    cNumberSlider velvetField;
45464514     JLabel sheenLabel;
4547
-    NumberSlider sheenField;
4515
+    cNumberSlider sheenField;
45484516     JLabel subsurfaceLabel;
4549
-    NumberSlider subsurfaceField;
4517
+    cNumberSlider subsurfaceField;
45504518     //JLabel bumpLabel;
45514519     //NumberSlider bumpField;
45524520     JLabel backlitLabel;
4553
-    NumberSlider backlitField;
4521
+    cNumberSlider backlitField;
45544522     JLabel anisoLabel;
4555
-    NumberSlider anisoField;
4523
+    cNumberSlider anisoField;
45564524     JLabel anisoVLabel;
4557
-    NumberSlider anisoVField;
4525
+    cNumberSlider anisoVField;
45584526     JLabel cameraLabel;
4559
-    NumberSlider cameraField;
4527
+    cNumberSlider cameraField;
45604528     JLabel selfshadowLabel;
4561
-    NumberSlider selfshadowField;
4529
+    cNumberSlider selfshadowField;
45624530     JLabel shadowLabel;
4563
-    NumberSlider shadowField;
4531
+    cNumberSlider shadowField;
45644532     JLabel textureLabel;
4565
-    NumberSlider textureField;
4533
+    cNumberSlider textureField;
45664534     JLabel opacityLabel;
4567
-    NumberSlider opacityField;
4535
+    cNumberSlider opacityField;
45684536     JLabel fakedepthLabel;
4569
-    NumberSlider fakedepthField;
4537
+    cNumberSlider fakedepthField;
45704538     JLabel shadowbiasLabel;
4571
-    NumberSlider shadowbiasField;
4539
+    cNumberSlider shadowbiasField;
45724540     JLabel bumpLabel;
4573
-    NumberSlider bumpField;
4541
+    cNumberSlider bumpField;
45744542     JLabel noiseLabel;
4575
-    NumberSlider noiseField;
4543
+    cNumberSlider noiseField;
45764544     JLabel powerLabel;
4577
-    NumberSlider powerField;
4545
+    cNumberSlider powerField;
45784546     JLabel borderfadeLabel;
4579
-    NumberSlider borderfadeField;
4547
+    cNumberSlider borderfadeField;
45804548     JLabel fogLabel;
4581
-    NumberSlider fogField;
4549
+    cNumberSlider fogField;
45824550     JLabel opacityPowerLabel;
4583
-    NumberSlider opacityPowerField;
4551
+    cNumberSlider opacityPowerField;
45844552     JTree jTree;
45854553     //ObjectUI parent;
4554
+    
4555
+    cNumberSlider normalpushField;
45864556 }