Material pane

Normand Briere

2019-04-29 6c2c00ee7f33ec46f79eba11c349f766cb207ec0

 ObjEditor.java
..
..
@@ -19,6 +19,8 @@
19
19
 import //weka.core.
20
20
         matrix.Matrix;
21
21
 
22
+import grafeme.ui.*;
23
+
22
24
 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
23
25
         ActionListener, ChangeListener,
24
26
         InputMethodListener,
..
..
@@ -28,7 +30,12 @@
28
30
         iSendInfo
29
31
 //KeyListener
30
32
 {
33
+        boolean timeline;
34
+        boolean wasFullScreen;
31
35
 
36
+    GroupEditor callee;
37
+    JFrame frame;
38
+    
32
39
     // SCRIPT
33
40
     
34
41
     transient JFrame textpanel = null;
..
..
@@ -119,14 +126,13 @@
119
126
     void keyPressed(int key, int modifiers)
120
127
     {
121
128
     System.out.println("KEY PRESSED");
122
-    CameraPane.theRenderer.keyPressed(key, modifiers);
129
+    Globals.theRenderer.keyPressed(key, modifiers);
123
130
     }
124
131
      */
125
132
 
126
133
     static GridBagConstraints aConstraints;
127
134
     static GridBagConstraints aWindowConstraints;
128
-    GroupEditor callee;
129
-    JFrame frame;
135
+
130
136
     static int GRIDWIDTH = 100; // 4;
131
137
 
132
138
     public void closeUI()
..
..
@@ -158,12 +164,16 @@
158
164
         objEditor.ctrlPanel.remove(slowerButton);
159
165
         objEditor.ctrlPanel.remove(fasterButton);
160
166
         objEditor.ctrlPanel.remove(remarkButton);
167
+        
168
+        Remove(normalpushField);
161
169
     }
162
170
 
163
171
     public ObjEditor GetEditor()
164
172
     {
165
173
         return objEditor; //.GetEditor();
166
174
     }
175
+    
176
+    // Sometimes myself, sometimes my callee's.
167
177
     ObjEditor objEditor;
168
178
 
169
179
     /*
..
..
@@ -238,7 +248,7 @@
238
248
         //if (!isDisplayable())
239
249
         //setUndecorated(true);
240
250
 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
251
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242
252
         client = inClient;
243
253
         copy = localCopy;
244
254
         copy.editWindow = this;
..
..
@@ -292,16 +302,18 @@
292
302
         //normalLensItem.addActionListener(this);
293
303
         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294
304
         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);
298
310
         cameraMenu.add("-");
299
311
         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300
312
         toggleTextureItem.addItemListener(this);
301
313
         toggleTextureItem.setState(CameraPane.textureon);
302
314
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303
315
         toggleLiveItem.addItemListener(this);
304
-        toggleLiveItem.setState(CameraPane.isLIVE());
316
+        toggleLiveItem.setState(Globals.isLIVE());
305
317
         cameraMenu.add(stepItem = new MenuItem("Step"));
306
318
         stepItem.addActionListener(this);
307
319
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -343,9 +355,9 @@
343
355
         toolbarPanel.setName("Toolbar");
344
356
         treePanel = new JPanel();
345
357
         treePanel.setName("Tree");
346
-        ctrlPanel = new JPanel(); // new GridBagLayout());
358
+        ctrlPanel = new cGridBag(); // new GridBagLayout());
347
359
         ctrlPanel.setName("Edit");
348
-        materialPanel = new JPanel();
360
+        materialPanel = new cGridBag().setVertical(true);
349
361
         materialPanel.setName("Material");
350
362
         /*JTextPane*/
351
363
         infoarea = createTextPane();
..
..
@@ -375,7 +387,7 @@
375
387
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376
388
         treePanel.setLayout(new GridBagLayout());
377
389
         ctrlPanel.setLayout(new GridBagLayout());
378
-        materialPanel.setLayout(new GridBagLayout());
390
+        //materialPanel.setLayout(new GridBagLayout());
379
391
 
380
392
         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381
393
                 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..
..
@@ -522,18 +534,18 @@
522
534
                     maxima.y = sel.toParent[3][1];
523
535
                     maxima.z = sel.toParent[3][2];
524
536
                     si.SendInfo("    Orig: " + maxima, "regular");
525
-                    maxima.x = sel.globalTransform[3][0];
526
-                    maxima.y = sel.globalTransform[3][1];
527
-                    maxima.z = sel.globalTransform[3][2];
528
-        if (full)
529
-            si.SendInfo("    Global Orig: " + maxima, "regular");
530
537
                     maxima.x = sel.toParent[0][0];
531
538
                     maxima.y = sel.toParent[1][1];
532
539
                     maxima.z = sel.toParent[2][2];
533
540
                     si.SendInfo("    Scale: " + maxima, "regular");
534
-                    maxima.x = sel.globalTransform[0][0];
535
-                    maxima.y = sel.globalTransform[1][1];
536
-                    maxima.z = sel.globalTransform[2][2];
541
+        maxima.x = sel.globalTransform[3][0];
542
+        maxima.y = sel.globalTransform[3][1];
543
+        maxima.z = sel.globalTransform[3][2];
544
+        if (full)
545
+            si.SendInfo("    Global Orig: " + maxima, "regular");
546
+        maxima.x = sel.globalTransform[0][0];
547
+        maxima.y = sel.globalTransform[1][1];
548
+        maxima.z = sel.globalTransform[2][2];
537
549
         if (full)
538
550
             si.SendInfo("    Global Scale: " + maxima, "regular");
539
551
                 }
..
..
@@ -593,6 +605,22 @@
593
605
             System.err.println("Couldn't insert initial text into text pane.");
594
606
         }
595
607
     }
608
+
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
+        }
596
624
 
597
625
     private JTextArea createTextPane()
598
626
     {
..
..
@@ -786,65 +814,47 @@
786
814
         return combo;
787
815
     }
788
816
 
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)
790
818
     {
791
-        NumberSlider combo;
819
+        cGridBag control = new cGridBag();
820
+            
821
+        cNumberSlider combo;
792
822
 
793
823
         JLabel jlabel = new JLabel(label);
794
-
795
-        aConstraints.fill = GridBagConstraints.VERTICAL;
796
824
         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);
806
827
         combo.setFloat(current);
807
-
808
-        combo.label = jlabel;
809
-
810
-        combo.addChangeListener(this);
811
-
828
+        
829
+        ctrlPanel.add(control);
830
+        
812
831
         return combo;
813
832
     }
814
833
 
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)
816
835
     {
817
-        NumberSlider combo;
836
+        cGridBag control = new cGridBag();
837
+        
838
+        cNumberSlider combo;
818
839
 
819
840
         JLabel jlabel = new JLabel(label);
820
-
821
-        aConstraints.fill = GridBagConstraints.VERTICAL;
822
841
         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);
832
844
         combo.setInteger(current);
833
845
 
834
-        combo.label = jlabel;
835
-
836
-        combo.addChangeListener(this);
837
-
846
+        ctrlPanel.add(control);
847
+        
838
848
         return combo;
839
849
     }
840
850
 
841
-    JTextArea AddText(JPanel ctrlPanel, String name)
851
+    JTextArea AddText(cGridBag ctrlPanel, String name)
842
852
     {
843
853
         JTextArea text;
844
854
 
845
855
         aConstraints.fill = GridBagConstraints.HORIZONTAL;
846
856
         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);
848
858
         text.addCaretListener(this);
849
859
         aConstraints.gridx += 1;
850
860
         aConstraints.gridwidth = 1;
..
..
@@ -874,6 +884,13 @@
874
884
     {
875
885
         j.removeChangeListener(this);
876
886
         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);
877
894
         objEditor.ctrlPanel.remove(j);
878
895
     }
879
896
 
..
..
@@ -963,6 +980,9 @@
963
980
 
964
981
         Return();
965
982
 
983
+    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
+    Return();
985
+            
966
986
 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967
987
 //        ObjEditor.aConstraints.gridx += 1;
968
988
 
..
..
@@ -1158,10 +1178,22 @@
1158
1178
         //JPanel worldPanel =
1159
1179
         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160
1180
         //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);
1164
1185
 
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
+        
1165
1197
         //topView.camera = ;
1166
1198
         //frontView.camera = new Camera(2);
1167
1199
         //sideView.camera = new Camera(3);
..
..
@@ -1177,12 +1209,13 @@
1177
1209
         //frontView.object = copy;
1178
1210
         //sideView.object = copy;
1179
1211
 
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));
1182
1214
 
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);
1186
1219
 
1187
1220
         /*
1188
1221
         gridPanel = new JPanel(); //new BorderLayout());
..
..
@@ -1191,7 +1224,7 @@
1191
1224
         gridPanel.add(cameraView);
1192
1225
         gridPanel.add(XYZPanel);
1193
1226
          */
1194
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1227
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195
1228
         gridPanel.setContinuousLayout(true);
1196
1229
         gridPanel.setOneTouchExpandable(true);
1197
1230
         gridPanel.setDividerLocation(1.0);
..
..
@@ -1244,16 +1277,23 @@
1244
1277
         scrollpane.setWheelScrollingEnabled(true);
1245
1278
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1246
1279
 
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);
1249
1285
 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1286
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1251
1287
 
1252
-        optionsPanel = new JPanel(new GridBagLayout());
1288
+        optionsPanel = new cGridBag().setVertical(true);
1253
1289
 
1254
1290
         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1256
-
1291
+        
1292
+        AddOptions(optionsPanel); //, aConstraints);
1293
+        
1294
+        tabbedPane.add(optionsPanel);
1295
+        
1296
+        scenePanel.add(tabbedPane);
1257
1297
 
1258
1298
         /*
1259
1299
         cTree jTree = new cTree(null);
..
..
@@ -1275,7 +1315,7 @@
1275
1315
         jtp.add(tree);
1276
1316
          */
1277
1317
 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1318
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279
1319
         bigPanel.setContinuousLayout(true);
1280
1320
         bigPanel.setOneTouchExpandable(true);
1281
1321
         bigPanel.setDividerLocation(0.8);
..
..
@@ -1287,6 +1327,7 @@
1287
1327
         //bigPanel.setSize(new Dimension(10,10));
1288
1328
         //bigPanel.add(ctrlPanel);
1289
1329
         //bigPanel.add(gridPanel);
1330
+        /**
1290
1331
         bigThree = new JPanel();
1291
1332
         //big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292
1333
         bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..
..
@@ -1297,20 +1338,26 @@
1297
1338
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298
1339
         aWindowConstraints.weightx = 0;
1299
1340
         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1341
+        bigThree.add(scenePanel, aWindowConstraints);
1301
1342
         aWindowConstraints.weightx = 1;
1302
1343
         aWindowConstraints.gridwidth = 3;
1303
1344
         //	aConstraints.gridheight = 3;
1304
1345
         aWindowConstraints.gridx = 1;
1305
1346
         aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
-        bigThree.add(cameraPanel, aWindowConstraints);
1347
+        bigThree.add(centralPanel, aWindowConstraints);
1307
1348
         aWindowConstraints.weightx = 0;
1308
1349
         aWindowConstraints.gridx = 4;
1309
1350
         aWindowConstraints.gridwidth = 1;
1310
1351
         //	aConstraints.gridheight = 3;
1311
1352
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312
1353
         bigThree.add(XYZPanel, aWindowConstraints);
1354
+        /**/
1313
1355
 
1356
+        bigThree = new cGridBag();
1357
+        bigThree.addComponent(scenePanel);
1358
+        bigThree.addComponent(centralPanel);
1359
+        bigThree.addComponent(XYZPanel);
1360
+        
1314
1361
 //                // SIDE EFFECT!!!
1315
1362
 //		aConstraints.gridx = 0;
1316
1363
 //		aConstraints.gridy = 0;
..
..
@@ -1331,7 +1378,8 @@
1331
1378
         //worldPane.add(bigPanel);
1332
1379
         //worldPane.add(worldPanel);
1333
1380
                 /**/
1334
-        frame.getContentPane().add(/*"Center",*/framePanel);
1381
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1382
+        frame.add(/*"Center",*/framePanel);
1335
1383
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1336
1384
 
1337
1385
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..
..
@@ -1352,6 +1400,10 @@
1352
1400
         });
1353
1401
     }
1354
1402
 
1403
+    void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1404
+    {
1405
+    }
1406
+    
1355
1407
     JTree GetTree()
1356
1408
     {
1357
1409
         return objEditor.jTree;
..
..
@@ -1363,260 +1415,175 @@
1363
1415
         ctrlPanel.removeAll();
1364
1416
     }
1365
1417
 
1366
-    void SetupMaterial(JPanel ctrlPanel)
1418
+    void SetupMaterial(cGridBag ctrlPanel)
1367
1419
     {
1368
-        aConstraints.weighty = 0;
1369
-        //aConstraints.weightx = 1;
1370
-                /*
1420
+         /*
1371
1421
         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372
1422
         materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374
-        aConstraints.gridx += 1;
1375
1423
          */
1376
1424
 
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);
1382
1428
 
1383
1429
         /*
1384
1430
         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385
-        aConstraints.gridx += 1;
1386
-        aConstraints.weighty = 0;
1387
-        aConstraints.gridwidth = 1;
1388
1431
          */
1389
1432
 
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);
1392
1437
 
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
+        
1407
1440
         /**/
1408
1441
         //aConstraints.weighty = 0;
1409
1442
         ////aConstraints.weightx = 1;
1410
1443
         //aConstraints.weighty = 1;
1411
1444
         aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412
1445
         //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);
1418
1447
 
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);
1429
1460
 
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);
1439
1466
 
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);
1449
1472
 
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);
1459
1478
 
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);
1469
1484
 
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);
1479
1490
 
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);
1488
1507
 
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);
1498
1513
 
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);
1508
1519
 
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);
1518
1525
 
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);
1528
1531
 
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);
1538
1537
 
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);
1548
1543
 
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);
1558
1554
 
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);
1567
1560
 
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);
1577
1566
 
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);
1587
1572
 
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);
1597
1578
 
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);
1607
1584
 
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();
1620
1587
 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621
1588
 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622
1589
 //		aConstraints.fill = GridBagConstraints.HORIZONTAL;
..
..
@@ -1627,130 +1594,97 @@
1627
1594
 //		aConstraints.gridy += 1;
1628
1595
 //		aConstraints.gridwidth = 1;
1629
1596
 
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;
1638
1597
 
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);
1648
1608
 
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);
1658
1614
 
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);
1668
1620
 
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);
1679
1626
 
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);
1689
1632
 
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);
1699
1643
 
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);
1709
1649
 
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);
1719
1655
 
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);
1729
1661
 
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);
1739
1667
 
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);
1745
1673
 
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);
1749
1683
 
1750
1684
         SetMaterial(copy); // .GetMaterial());
1751
1685
 
1752
-        colorField.addChangeListener(this);
1753
-        modulationField.addChangeListener(this);
1686
+        //colorField.addChangeListener(this);
1687
+//        modulationField.addChangeListener(this);
1754
1688
         metalnessField.addChangeListener(this);
1755
1689
         diffuseField.addChangeListener(this);
1756
1690
         specularField.addChangeListener(this);
..
..
@@ -1859,19 +1793,21 @@
1859
1793
             }
1860
1794
 
1861
1795
             // Images/textures
1862
-            if (textures
1863
-                    && (filename.toLowerCase().endsWith(".jpg")
1864
-                    || filename.toLowerCase().endsWith(".jpeg")
1865
-                    || filename.toLowerCase().endsWith(".gif")
1866
-                    || filename.toLowerCase().endsWith(".png")
1867
-                    || filename.toLowerCase().endsWith(".tre")
1868
-                    || filename.toLowerCase().endsWith(".bmp")
1869
-                    || filename.toLowerCase().endsWith(".tga")
1870
-                    || filename.toLowerCase().endsWith(".sgi")
1871
-                    || filename.toLowerCase().endsWith(".tif")
1872
-                    || filename.toLowerCase().endsWith(".tiff")))
1796
+            if (filename.toLowerCase().endsWith(".jpg")
1797
+                || filename.toLowerCase().endsWith(".jpeg")
1798
+                || filename.toLowerCase().endsWith(".gif")
1799
+                || filename.toLowerCase().endsWith(".png")
1800
+                || filename.toLowerCase().endsWith(".tre")
1801
+                || filename.toLowerCase().endsWith(".bmp")
1802
+                || filename.toLowerCase().endsWith(".tga")
1803
+                || filename.toLowerCase().endsWith(".sgi")
1804
+                || filename.toLowerCase().endsWith(".tif")
1805
+                || filename.toLowerCase().endsWith(".tiff"))
1873
1806
             {
1874
-                DropTexture(filename);
1807
+                if (textures)
1808
+                    DropTexture(filename);
1809
+                else
1810
+                    CreateBillboard(filename);
1875
1811
                 continue;
1876
1812
             }
1877
1813
 
..
..
@@ -1880,6 +1816,60 @@
1880
1816
         }
1881
1817
 
1882
1818
         ResetModel();
1819
+    }
1820
+    
1821
+    void CreateBillboard(String filename)
1822
+    {
1823
+        Object3D source = null;
1824
+        Object3D group = copy;
1825
+
1826
+        if (group.selection.size() > 0)
1827
+        {
1828
+            source = group.selection.get(0);
1829
+        }
1830
+
1831
+        Grid grid = new Grid(1,1);
1832
+        grid.material = null;
1833
+        
1834
+        grid.toParent = LA.newMatrix();
1835
+        grid.fromParent = LA.newMatrix();
1836
+        LA.matYRotate(grid.toParent, Math.PI/2);
1837
+        LA.matXRotate(grid.toParent, -Math.PI/2);
1838
+        LA.matXRotate(grid.fromParent, Math.PI/2);
1839
+        LA.matYRotate(grid.fromParent, -Math.PI/2);
1840
+        
1841
+        BillboardNode bb = new BillboardNode();
1842
+        bb.addChild(grid);
1843
+        
1844
+        Object3D newgroup = new Object3D();
1845
+        newgroup.CreateMaterial();
1846
+        
1847
+        File file = new File(filename);
1848
+        newgroup.name = file.getName();
1849
+        newgroup.addChild(bb);
1850
+        
1851
+        Object3D main = newgroup;
1852
+        
1853
+        main.SetPigmentTexture(filename);
1854
+        
1855
+        if (source != null)
1856
+        {
1857
+            main.material = new cMaterial(source.material);
1858
+            if (main.projectedVertices.length < source.projectedVertices.length)
1859
+            {
1860
+                main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
1861
+            }
1862
+            
1863
+            for (int i=0; i<source.projectedVertices.length; i++)
1864
+            {
1865
+                main.projectedVertices[i].x = source.projectedVertices[i].x;
1866
+                main.projectedVertices[i].y = source.projectedVertices[i].y;
1867
+            }
1868
+            
1869
+            main.texres = source.texres;
1870
+        }
1871
+        
1872
+        makeSomething(newgroup, false);
1883
1873
     }
1884
1874
     
1885
1875
     Point location;
..
..
@@ -2138,6 +2128,8 @@
2138
2128
             {
2139
2129
                 Mocap sel = (Mocap) copy.selection.get(0);
2140
2130
 
2131
+                sel.SetCurrentBones(sel.frame);
2132
+            
2141
2133
                 sel.fullname = fullname;
2142
2134
 
2143
2135
                 if (changename)
..
..
@@ -2151,14 +2143,18 @@
2151
2143
                 sel.smoothed = false;
2152
2144
 
2153
2145
                 //    if (!changename)
2154
-                sel.SetPositionDelta(false, true, true, true/*?*/); // false
2146
+                //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2147
+                sel.SetGlobalTransform();
2148
+                sel.LoadData();
2149
+                sel.Rewind();
2150
+                sel.Fade();
2155
2151
                 //                sel.setPose(0);
2156
2152
                 refreshContents();
2157
2153
             } else
2158
2154
             {
2159
2155
                 mocap.Reset();
2160
2156
                 // new skeleton
2161
-                makeSomething(mocap, false); // true);
2157
+                makeSomething(mocap, true); // true);
2162
2158
             }
2163
2159
         } catch (Exception e)
2164
2160
         {
..
..
@@ -2185,6 +2181,8 @@
2185
2181
         {
2186
2182
             Mocap sel = (Mocap) select;
2187
2183
 
2184
+            sel.SetCurrentBones(sel.frame);
2185
+            
2188
2186
             File file = new File(fullname);
2189
2187
 
2190
2188
             //       Mocap mocap = new Mocap("Mocap" + file.getName());
..
..
@@ -2251,7 +2249,11 @@
2251
2249
 
2252
2250
             if (!changename)
2253
2251
             {
2254
-                sel.SetPositionDelta(false, true, true, true/*?*/);
2252
+                //sel.SetPositionDelta(false, true, true, true/*?*/);
2253
+                sel.SetGlobalTransform();
2254
+                sel.LoadData();
2255
+                sel.Rewind();
2256
+                sel.Fade();
2255
2257
             }
2256
2258
 
2257
2259
             //          sel.setPose(0);
..
..
@@ -2890,20 +2892,37 @@
2890
2892
             // june 2013           copy.HardTouch();
2891
2893
             cameraView.repaint();
2892
2894
             return;
2893
-        } else if (event.getSource() == toggleFullItem)
2895
+        } else if (event.getSource() == toggleTimelineItem)
2894
2896
         {
2895
-            if (CameraPane.FULLSCREEN)
2897
+            timeline ^= true;
2898
+
2899
+            if (timeline)
2896
2900
             {
2897
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2898
-                framePanel.add(bigThree);
2899
-                frame.getContentPane().add(/*"Center",*/framePanel);
2900
-            } else
2901
-            {
2902
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2903
-                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);
2904
2909
             }
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
+
2905
2920
             frame.validate();
2906
-            cameraView.ToggleFullScreen();
2921
+            return;
2922
+        } else if (event.getSource() == toggleFullScreenItem)
2923
+        {
2924
+            ToggleFullScreen();
2925
+            frame.validate();
2907
2926
 
2908
2927
             return;
2909
2928
         } else if (event.getSource() == toggleRandomItem)
..
..
@@ -3013,7 +3032,8 @@
3013
3032
             objEditor.refreshContents();
3014
3033
         } else if (event.getSource() == stepItem)
3015
3034
         {
3016
-            cameraView.ONESTEP = true;
3035
+            //cameraView.ONESTEP = true;
3036
+            Globals.ONESTEP = true;
3017
3037
             cameraView.repaint();
3018
3038
             return;
3019
3039
         } else if (event.getSource() == stepButton)
..
..
@@ -3152,9 +3172,9 @@
3152
3172
             cameraView.RevertCamera();
3153
3173
             cameraView.repaint();
3154
3174
             return;
3155
-        } else if (event.getSource() == textureButton)
3156
-        {
3157
-            return; // true;
3175
+//        } else if (event.getSource() == textureButton)
3176
+//        {
3177
+//            return; // true;
3158
3178
         } else // combos...
3159
3179
         if (event.getSource() == texresMenu)
3160
3180
         {
..
..
@@ -3170,25 +3190,25 @@
3170
3190
 
3171
3191
     void ToggleAnimation()
3172
3192
     {
3173
-        if (!CameraPane.ANIMATION)
3193
+        if (!Globals.ANIMATION)
3174
3194
         {
3175
3195
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3176
3196
             browser.show();
3177
3197
             String filename = browser.getFile();
3178
3198
             if (filename != null && filename.length() > 0)
3179
3199
             {
3180
-                CameraPane.filename = browser.getDirectory() + filename;
3200
+                Globals.filename = browser.getDirectory() + filename;
3181
3201
                 //CameraPane.framecount = 0;
3182
-                CameraPane.imagecount = 0;
3202
+                Globals.imagecount = 0;
3183
3203
 
3184
-                CameraPane.ANIMATION ^= true;
3204
+                Globals.ANIMATION ^= true;
3185
3205
 
3186
3206
                 GrafreeD.wav.cursor = 0;
3187
3207
                 GrafreeD.wav.loop = 0;
3188
3208
             }
3189
3209
         } else
3190
3210
         {
3191
-            CameraPane.ANIMATION ^= true;
3211
+            Globals.ANIMATION ^= true;
3192
3212
         }
3193
3213
     }
3194
3214
 
..
..
@@ -3367,7 +3387,7 @@
3367
3387
             current.fakedepth = (float) fakedepthField.getFloat();
3368
3388
             current.shadowbias = (float) shadowbiasField.getFloat();
3369
3389
 
3370
-            if (!NumberSlider.frozen)
3390
+            if (!cNumberSlider.frozen)
3371
3391
             {
3372
3392
                 //System.out.println("Propagate = " + propagate);
3373
3393
                 copy.UpdateMaterial(anchor, current, propagate);
..
..
@@ -3441,7 +3461,13 @@
3441
3461
             //System.out.println("PARENT = " + parent);
3442
3462
             //if (parent != null)
3443
3463
             //	parent.applySelf();
3444
-            refreshContents();
3464
+		if (e.getSource() == normalpushField)
3465
+		{
3466
+			objEditor.refreshContents();
3467
+			//Refresh();
3468
+		}
3469
+		else
3470
+                    refreshContents();
3445
3471
             // ??? client.refreshEditWindow();
3446
3472
         }
3447
3473
         //else
..
..
@@ -3453,7 +3479,7 @@
3453
3479
         //group.name = nameField.getText();
3454
3480
         //objEditor.applySelf();
3455
3481
 
3456
-        assert (objEditor == this);
3482
+        // OCT2018: assert (objEditor == this);
3457
3483
         if (copy.selection == null || copy.selection.size() == 0)
3458
3484
 			//super.applySelf()
3459
3485
                                 ; else
..
..
@@ -3477,12 +3503,18 @@
3477
3503
                 objEditor.copy = keep;
3478
3504
             }
3479
3505
         }
3506
+        
3507
+        if (normalpushField != null)
3508
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3480
3509
     }
3481
3510
 
3482
3511
         void SnapObject()
3483
3512
         {
3484
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3485
-            SnapObject(obj);
3513
+            if (copy.selection.size() > 0)
3514
+            {
3515
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3516
+                    SnapObject(obj);
3517
+            }
3486
3518
         }
3487
3519
         
3488
3520
         void SnapObject(Object3D obj)
..
..
@@ -3596,7 +3628,7 @@
3596
3628
 
3597
3629
         if (obj.parent != null)
3598
3630
         {
3599
-            obj.parent.TransformToWorld(interest);
3631
+//            obj.parent.TransformToWorld(interest);
3600
3632
         }
3601
3633
 
3602
3634
         if (!CameraPane.TRACK)
..
..
@@ -3728,7 +3760,7 @@
3728
3760
 
3729
3761
             radioPanel.revalidate();
3730
3762
             radioPanel.repaint();
3731
-            ctrlPanel.revalidate(); // ? new
3763
+            ctrlPanel.validate(); // ? new
3732
3764
             ctrlPanel.repaint();
3733
3765
         }
3734
3766
     }
..
..
@@ -4376,7 +4408,8 @@
4376
4408
     MenuItem revertCameraItem;
4377
4409
     CheckboxMenuItem toggleLiveItem;
4378
4410
     MenuItem stepItem;
4379
-    CheckboxMenuItem toggleFullItem;
4411
+    CheckboxMenuItem toggleFullScreenItem;
4412
+    CheckboxMenuItem toggleTimelineItem;
4380
4413
     CheckboxMenuItem toggleRenderItem;
4381
4414
     CheckboxMenuItem toggleDebugItem;
4382
4415
     CheckboxMenuItem toggleFrustumItem;
..
..
@@ -4394,20 +4427,23 @@
4394
4427
     JPanel treePanel;
4395
4428
     JPanel radioPanel;
4396
4429
     ButtonGroup buttonGroup;
4397
-    JPanel ctrlPanel;
4398
-    JPanel materialPanel;
4430
+    cGridBag ctrlPanel;
4431
+    cGridBag materialPanel;
4399
4432
     JScrollPane infoPanel;
4400
-    JPanel optionsPanel;
4433
+    cGridBag optionsPanel;
4401
4434
     JTabbedPane objectPanel;
4402
-    JPanel XYZPanel;
4435
+    cGridBag XYZPanel;
4403
4436
     JSplitPane gridPanel;
4404
4437
     JSplitPane bigPanel;
4405
-    JPanel bigThree;
4406
-    JTabbedPane jtp;
4407
-    JPanel cameraPanel;
4438
+    cGridBag bigThree;
4439
+    cGridBag scenePanel;
4440
+    cGridBag centralPanel;
4441
+    JSplitPane cameraPanel;
4442
+    JPanel timelinePanel;
4443
+    JMenuBar timelineMenubar;
4408
4444
     JSplitPane framePanel;
4409
4445
     JTextArea/*Field*/ nameField;
4410
-    cButton textureButton;
4446
+    //cButton textureButton;
4411
4447
     cButton okButton;
4412
4448
     cButton applyButton;
4413
4449
     cButton cancelButton;
..
..
@@ -4454,65 +4490,67 @@
4454
4490
     // MATERIAL
4455
4491
     JLabel materialLabel;
4456
4492
     JLabel colorLabel;
4457
-    NumberSlider colorField;
4493
+    cNumberSlider colorField;
4458
4494
     JLabel modulationLabel;
4459
-    NumberSlider modulationField;
4495
+    cNumberSlider modulationField;
4460
4496
     JLabel metalnessLabel;
4461
-    NumberSlider metalnessField;
4497
+    cNumberSlider metalnessField;
4462
4498
     JLabel diffuseLabel;
4463
-    NumberSlider diffuseField;
4499
+    cNumberSlider diffuseField;
4464
4500
     JLabel specularLabel;
4465
-    NumberSlider specularField;
4501
+    cNumberSlider specularField;
4466
4502
     JLabel shininessLabel;
4467
-    NumberSlider shininessField;
4503
+    cNumberSlider shininessField;
4468
4504
     JLabel shiftLabel;
4469
-    NumberSlider shiftField;
4505
+    cNumberSlider shiftField;
4470
4506
     JLabel ambientLabel;
4471
-    NumberSlider ambientField;
4507
+    cNumberSlider ambientField;
4472
4508
     JLabel lightareaLabel;
4473
-    NumberSlider lightareaField;
4509
+    cNumberSlider lightareaField;
4474
4510
     JLabel diffusenessLabel;
4475
-    NumberSlider diffusenessField;
4511
+    cNumberSlider diffusenessField;
4476
4512
     JLabel velvetLabel;
4477
-    NumberSlider velvetField;
4513
+    cNumberSlider velvetField;
4478
4514
     JLabel sheenLabel;
4479
-    NumberSlider sheenField;
4515
+    cNumberSlider sheenField;
4480
4516
     JLabel subsurfaceLabel;
4481
-    NumberSlider subsurfaceField;
4517
+    cNumberSlider subsurfaceField;
4482
4518
     //JLabel bumpLabel;
4483
4519
     //NumberSlider bumpField;
4484
4520
     JLabel backlitLabel;
4485
-    NumberSlider backlitField;
4521
+    cNumberSlider backlitField;
4486
4522
     JLabel anisoLabel;
4487
-    NumberSlider anisoField;
4523
+    cNumberSlider anisoField;
4488
4524
     JLabel anisoVLabel;
4489
-    NumberSlider anisoVField;
4525
+    cNumberSlider anisoVField;
4490
4526
     JLabel cameraLabel;
4491
-    NumberSlider cameraField;
4527
+    cNumberSlider cameraField;
4492
4528
     JLabel selfshadowLabel;
4493
-    NumberSlider selfshadowField;
4529
+    cNumberSlider selfshadowField;
4494
4530
     JLabel shadowLabel;
4495
-    NumberSlider shadowField;
4531
+    cNumberSlider shadowField;
4496
4532
     JLabel textureLabel;
4497
-    NumberSlider textureField;
4533
+    cNumberSlider textureField;
4498
4534
     JLabel opacityLabel;
4499
-    NumberSlider opacityField;
4535
+    cNumberSlider opacityField;
4500
4536
     JLabel fakedepthLabel;
4501
-    NumberSlider fakedepthField;
4537
+    cNumberSlider fakedepthField;
4502
4538
     JLabel shadowbiasLabel;
4503
-    NumberSlider shadowbiasField;
4539
+    cNumberSlider shadowbiasField;
4504
4540
     JLabel bumpLabel;
4505
-    NumberSlider bumpField;
4541
+    cNumberSlider bumpField;
4506
4542
     JLabel noiseLabel;
4507
-    NumberSlider noiseField;
4543
+    cNumberSlider noiseField;
4508
4544
     JLabel powerLabel;
4509
-    NumberSlider powerField;
4545
+    cNumberSlider powerField;
4510
4546
     JLabel borderfadeLabel;
4511
-    NumberSlider borderfadeField;
4547
+    cNumberSlider borderfadeField;
4512
4548
     JLabel fogLabel;
4513
-    NumberSlider fogField;
4549
+    cNumberSlider fogField;
4514
4550
     JLabel opacityPowerLabel;
4515
-    NumberSlider opacityPowerField;
4551
+    cNumberSlider opacityPowerField;
4516
4552
     JTree jTree;
4517
4553
     //ObjectUI parent;
4554
+    
4555
+    cNumberSlider normalpushField;
4518
4556
 }