Control pane

Normand Briere

2019-05-01 504890a7b930ab6b853c49de825ae848e0535339

 ObjEditor.java
..
..
@@ -138,34 +138,40 @@
138
138
     public void closeUI()
139
139
     {
140
140
         //new Exception().printStackTrace();
141
-        System.out.println("this = " + this);
142
-        System.out.println("objEditor = " + objEditor);
141
+//        System.out.println("this = " + this);
142
+//        System.out.println("objEditor = " + objEditor);
143
143
         //nameField.removeActionListener(this);
144
-        objEditor.ctrlPanel.remove(nameField);
144
+//        objEditor.ctrlPanel.remove(nameField);
145
145
         
146
146
         if (!GroupEditor.allparams)
147
147
             return;
148
148
         
149
-        objEditor.ctrlPanel.remove(liveCB);
150
-        objEditor.ctrlPanel.remove(hideCB);
151
-        objEditor.ctrlPanel.remove(markCB);
152
-
153
-        objEditor.ctrlPanel.remove(randomCB);
154
-        objEditor.ctrlPanel.remove(speedupCB);
155
-        objEditor.ctrlPanel.remove(rewindCB);
156
-
157
-        objEditor.ctrlPanel.remove(resetButton);
158
-        objEditor.ctrlPanel.remove(stepButton);
159
-//                objEditor.ctrlPanel.remove(stepAllButton);
160
-//                objEditor.ctrlPanel.remove(resetAllButton);
161
-        objEditor.ctrlPanel.remove(link2masterCB);
162
-        //objEditor.ctrlPanel.remove(flipVCB);
163
-        //objEditor.ctrlPanel.remove(texresMenu);
164
-        objEditor.ctrlPanel.remove(slowerButton);
165
-        objEditor.ctrlPanel.remove(fasterButton);
166
-        objEditor.ctrlPanel.remove(remarkButton);
149
+//        objEditor.ctrlPanel.remove(liveCB);
150
+//        objEditor.ctrlPanel.remove(hideCB);
151
+//        objEditor.ctrlPanel.remove(markCB);
152
+//
153
+//        objEditor.ctrlPanel.remove(randomCB);
154
+//        objEditor.ctrlPanel.remove(speedupCB);
155
+//        objEditor.ctrlPanel.remove(rewindCB);
156
+//
157
+//        objEditor.ctrlPanel.remove(resetButton);
158
+//        objEditor.ctrlPanel.remove(stepButton);
159
+////                objEditor.ctrlPanel.remove(stepAllButton);
160
+////                objEditor.ctrlPanel.remove(resetAllButton);
161
+//        objEditor.ctrlPanel.remove(link2masterCB);
162
+//        //objEditor.ctrlPanel.remove(flipVCB);
163
+//        //objEditor.ctrlPanel.remove(texresMenu);
164
+//        objEditor.ctrlPanel.remove(slowerButton);
165
+//        objEditor.ctrlPanel.remove(fasterButton);
166
+//        objEditor.ctrlPanel.remove(remarkButton);
167
167
         
168
-        Remove(normalpushField);
168
+        objEditor.ctrlPanel.remove(namePanel);
169
+        objEditor.ctrlPanel.remove(setupPanel);
170
+        objEditor.ctrlPanel.remove(commandsPanel);
171
+        objEditor.ctrlPanel.remove(pushPanel);
172
+        //objEditor.ctrlPanel.remove(fillPanel);
173
+        
174
+        //Remove(normalpushField);
169
175
     }
170
176
 
171
177
     public ObjEditor GetEditor()
..
..
@@ -355,7 +361,7 @@
355
361
         toolbarPanel.setName("Toolbar");
356
362
         treePanel = new JPanel();
357
363
         treePanel.setName("Tree");
358
-        ctrlPanel = new cGridBag(); // new GridBagLayout());
364
+        ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359
365
         ctrlPanel.setName("Edit");
360
366
         materialPanel = new cGridBag().setVertical(true);
361
367
         materialPanel.setName("Material");
..
..
@@ -386,7 +392,7 @@
386
392
         //mainPanel.setLayout(new GridBagLayout());
387
393
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388
394
         treePanel.setLayout(new GridBagLayout());
389
-        ctrlPanel.setLayout(new GridBagLayout());
395
+        //ctrlPanel.setLayout(new GridBagLayout());
390
396
         //materialPanel.setLayout(new GridBagLayout());
391
397
 
392
398
         aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..
..
@@ -767,54 +773,44 @@
767
773
     JButton slowerButton;
768
774
     JButton fasterButton;
769
775
     JButton remarkButton;
776
+    
777
+    cGridBag namePanel;
778
+    cGridBag setupPanel;
779
+    cGridBag commandsPanel;
780
+    cGridBag pushPanel;
781
+    cGridBag fillPanel;
770
782
 
771
-    JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
783
+    JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772
784
     {
773
785
         JCheckBox cb;
774
786
 
775
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776
-        oe.aConstraints.gridwidth = 1; // 3;
777
-//        oe.aConstraints.weightx = 1;
778
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
779
-        oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
787
+        panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780
788
         cb.addItemListener(this);
781
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
782
-        oe.aConstraints.gridwidth = 1;
783
-        oe.aConstraints.gridx += 1;
784
789
 
785
790
         return cb;
786
791
     }
787
792
 
788
-    cButton AddButton(ObjEditor oe, String label)
793
+    cButton AddButton(cGridBag panel, String label)
789
794
     {
790
795
         cButton cb;
791
796
 
792
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793
-        oe.aConstraints.gridwidth = 1;
794
-//        oe.aConstraints.weightx = 1;
795
-//        oe.aConstraints.anchor = GridBagConstraints.WEST;
796
-        oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797
+        panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797
798
         cb.addActionListener(this);
798
-//        oe.aConstraints.anchor = GridBagConstraints.EAST;
799
-        oe.aConstraints.gridwidth = 1;
800
-        oe.aConstraints.gridx += 1;
801
799
 
802
800
         return cb;
803
801
     }
804
802
 
805
-    JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
803
+    JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806
804
     {
807
805
         JComboBox combo;
808
806
 
809
-        oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810
-        oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811
-        oe.aConstraints.gridx += 1;
807
+        panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812
808
         combo.addActionListener(this);
813
809
 
814
810
         return combo;
815
811
     }
816
812
 
817
-    cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
813
+    cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818
814
     {
819
815
         cGridBag control = new cGridBag();
820
816
             
..
..
@@ -826,12 +822,12 @@
826
822
         control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827
823
         combo.setFloat(current);
828
824
         
829
-        ctrlPanel.add(control);
825
+        panel.add(control);
830
826
         
831
-        return combo;
827
+        return control;
832
828
     }
833
829
 
834
-    cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
830
+    cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835
831
     {
836
832
         cGridBag control = new cGridBag();
837
833
         
..
..
@@ -839,25 +835,21 @@
839
835
 
840
836
         JLabel jlabel = new JLabel(label);
841
837
         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842
-        ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
-        ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
838
+        control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
839
+        control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844
840
         combo.setInteger(current);
845
841
 
846
-        ctrlPanel.add(control);
842
+        panel.add(control);
847
843
         
848
-        return combo;
844
+        return control;
849
845
     }
850
846
 
851
847
     JTextArea AddText(cGridBag ctrlPanel, String name)
852
848
     {
853
849
         JTextArea text;
854
850
 
855
-        aConstraints.fill = GridBagConstraints.HORIZONTAL;
856
-        aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857
851
         ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858
852
         text.addCaretListener(this);
859
-        aConstraints.gridx += 1;
860
-        aConstraints.gridwidth = 1;
861
853
 
862
854
         return text;
863
855
     }
..
..
@@ -896,7 +888,7 @@
896
888
 
897
889
     /*
898
890
      */
899
-    void Return() // ObjEditor oe)
891
+    void Return0() // ObjEditor oe)
900
892
     {
901
893
         aConstraints.gridy += 1;
902
894
         aConstraints.gridx = 0;
..
..
@@ -955,33 +947,52 @@
955
947
 //            oe.aConstraints.weighty = 0;
956
948
 //            oe.aConstraints.gridx = 0;
957
949
 //            oe.aConstraints.gridy = 0;
958
-        SetupName(oe);
950
+        //SetupName(oe);
951
+        
952
+            namePanel = new cGridBag();
953
+            
954
+        nameField = AddText(namePanel, copy.GetName());
955
+        namePanel.add(nameField);
956
+        oe.ctrlPanel.add(namePanel);
957
+        
958
+        oe.ctrlPanel.Return();
959
959
         
960
960
         if (!GroupEditor.allparams)
961
961
             return;
962
962
 
963
-        liveCB = AddCheckBox(oe, "Live", copy.live);
964
-        link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965
-        hideCB = AddCheckBox(oe, "Hide", copy.hide);
963
+            setupPanel = new cGridBag().setVertical(false);
964
+            
965
+        liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966
+        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
966
968
 //            Return();
967
-        markCB = AddCheckBox(oe, "Mark", copy.marked);
968
-        rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969
-        randomCB = AddCheckBox(oe, "Rand", copy.random);
970
-        Return();
971
-        resetButton = AddButton(oe, "Reset");
972
-        stepButton = AddButton(oe, "Step");
969
+        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970
+        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971
+        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
972
+
973
+        oe.ctrlPanel.add(setupPanel);
974
+        oe.ctrlPanel.Return();
975
+        
976
+            commandsPanel = new cGridBag().setVertical(false);
977
+        
978
+        resetButton = AddButton(commandsPanel, "Reset");
979
+        stepButton = AddButton(commandsPanel, "Step");
973
980
 //            resetAllButton = AddButton(oe, "Reset All");
974
981
 //            stepAllButton = AddButton(oe, "Step All");
975
-        speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
982
+        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
976
983
 //            Return();
977
-        slowerButton = AddButton(oe, "Slow");
978
-        fasterButton = AddButton(oe, "Fast");
979
-        remarkButton = AddButton(oe, "Rem");
984
+        slowerButton = AddButton(commandsPanel, "Slow");
985
+        fasterButton = AddButton(commandsPanel, "Fast");
986
+        remarkButton = AddButton(commandsPanel, "Remark");
980
987
 
981
-        Return();
988
+        oe.ctrlPanel.add(commandsPanel);
989
+        oe.ctrlPanel.Return();
982
990
 
983
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
-    Return();
991
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
992
+    normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993
+    //Return();
994
+
995
+        oe.ctrlPanel.Return();
985
996
             
986
997
 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987
998
 //        ObjEditor.aConstraints.gridx += 1;
..
..
@@ -1076,7 +1087,7 @@
1076
1087
         oe.aConstraints.gridwidth = 1;
1077
1088
         /**/
1078
1089
         nameField = AddText(oe.ctrlPanel, copy.GetName());
1079
-        Return();
1090
+        oe.ctrlPanel.Return();
1080
1091
 
1081
1092
         //ctrlPanel.add(textureButton = new Button("Texture..."));
1082
1093
         //textureButton.setEnabled(false);
..
..
@@ -1253,10 +1264,11 @@
1253
1264
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254
1265
         //tmp.setName("Edit");
1255
1266
         objectPanel.add(materialPanel);
1256
-        JPanel north = new JPanel(new BorderLayout());
1257
-        north.setName("Edit");
1258
-        north.add(ctrlPanel, BorderLayout.NORTH);
1259
-        objectPanel.add(north);
1267
+//        JPanel north = new JPanel(new BorderLayout());
1268
+//        north.setName("Edit");
1269
+//        north.add(ctrlPanel, BorderLayout.NORTH);
1270
+//        objectPanel.add(north);
1271
+        objectPanel.add(ctrlPanel);
1260
1272
         objectPanel.add(infoPanel);
1261
1273
 
1262
1274
         /*
..
..
@@ -1415,7 +1427,7 @@
1415
1427
         ctrlPanel.removeAll();
1416
1428
     }
1417
1429
 
1418
-    void SetupMaterial(cGridBag ctrlPanel)
1430
+    void SetupMaterial(cGridBag panel)
1419
1431
     {
1420
1432
          /*
1421
1433
         ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..
..
@@ -1435,7 +1447,7 @@
1435
1447
         editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436
1448
         editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1437
1449
 
1438
-        ctrlPanel.add(editBar);
1450
+        panel.add(editBar);
1439
1451
         
1440
1452
         /**/
1441
1453
         //aConstraints.weighty = 0;
..
..
@@ -1445,17 +1457,13 @@
1445
1457
         //aConstraints.gridx += 1;
1446
1458
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447
1459
 
1448
-        JPanel colorPanel = new JPanel(new BorderLayout());
1449
-        colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
-        
1451
1460
         cGridBag colorSection = new cGridBag().setVertical(true);
1452
-        
1453
-        colorPanel.add(colorSection);
1454
1461
         
1455
1462
         cGridBag color = new cGridBag();
1456
1463
                 color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
1464
                 colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
1465
                 color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1466
+        //colorField.preferredWidth = 200;
1459
1467
         colorSection.add(color);
1460
1468
 
1461
1469
         cGridBag modulation = new cGridBag();
..
..
@@ -1488,16 +1496,13 @@
1488
1496
                 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
1497
         colorSection.add(shadowbias);
1490
1498
 
1491
-        ctrlPanel.add(colorPanel);
1499
+        panel.add(new JSeparator());
1500
+        
1501
+        panel.add(colorSection);
1492
1502
         
1493
1503
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494
1504
         
1495
-        JPanel diffusePanel = new JPanel(new BorderLayout());
1496
-        diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
-        
1498
1505
         cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
-        
1500
-        diffusePanel.add(diffuseSection);
1501
1506
         
1502
1507
         cGridBag diffuse = new cGridBag();
1503
1508
                 diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..
..
@@ -1541,16 +1546,13 @@
1541
1546
                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
1547
         diffuseSection.add(fakedepth);
1543
1548
 
1544
-        ctrlPanel.add(diffusePanel);
1549
+        panel.add(new JSeparator());
1550
+        
1551
+        panel.add(diffuseSection);
1545
1552
         
1546
1553
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547
1554
         
1548
-        JPanel specularPanel = new JPanel(new BorderLayout());
1549
-        specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
-        
1551
1555
         cGridBag specularSection = new cGridBag().setVertical(true);
1552
-        
1553
-        specularPanel.add(specularSection);
1554
1556
 
1555
1557
         cGridBag specular = new cGridBag();
1556
1558
                 specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..
..
@@ -1582,7 +1584,7 @@
1582
1584
                 velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583
1585
         specularSection.add(velvet);
1584
1586
 
1585
-        shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1587
+        shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586
1588
         //Return();
1587
1589
 //		ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588
1590
 //		shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..
..
@@ -1595,16 +1597,13 @@
1595
1597
 //		aConstraints.gridwidth = 1;
1596
1598
 
1597
1599
 
1598
-        ctrlPanel.add(specularPanel);
1600
+        panel.add(new JSeparator());
1601
+        
1602
+        panel.add(specularSection);
1599
1603
         
1600
1604
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601
1605
         
1602
-        JPanel globalPanel = new JPanel(new BorderLayout());
1603
-        globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
-        
1605
1606
         cGridBag globalSection = new cGridBag().setVertical(true);
1606
-        
1607
-        globalPanel.add(globalSection);
1608
1607
 
1609
1608
         cGridBag camera = new cGridBag();
1610
1609
                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
..
..
@@ -1630,16 +1629,13 @@
1630
1629
                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
1630
         globalSection.add(opacity);
1632
1631
 
1633
-        ctrlPanel.add(globalPanel);
1632
+        panel.add(new JSeparator());
1633
+        
1634
+        panel.add(globalSection);
1634
1635
         
1635
1636
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636
1637
         
1637
-        JPanel texturePanel = new JPanel(new BorderLayout());
1638
-        texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
-        
1640
1638
         cGridBag textureSection = new cGridBag().setVertical(true);
1641
-        
1642
-        texturePanel.add(textureSection);
1643
1639
 
1644
1640
         cGridBag bump = new cGridBag();
1645
1641
                 bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..
..
@@ -1677,7 +1673,9 @@
1677
1673
                 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1678
1674
         textureSection.add(opacityPower);
1679
1675
 
1680
-        ctrlPanel.add(texturePanel);
1676
+        panel.add(new JSeparator());
1677
+        
1678
+        panel.add(textureSection);
1681
1679
         
1682
1680
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683
1681
 
..
..
@@ -2496,6 +2494,7 @@
2496
2494
                 }
2497
2495
                 if (input == null)
2498
2496
                 {
2497
+                new Exception().printStackTrace();
2499
2498
                     System.exit(0);
2500
2499
                 }
2501
2500
 
..
..
@@ -3225,6 +3224,7 @@
3225
3224
             callee.refreshContents();
3226
3225
         } else
3227
3226
         {
3227
+                new Exception().printStackTrace();
3228
3228
             System.exit(0);
3229
3229
         }
3230
3230
     }
..
..
@@ -3435,6 +3435,7 @@
3435
3435
                 || e.getSource() == apertureField
3436
3436
                 || e.getSource() == shadowblurField)
3437
3437
         {
3438
+                new Exception().printStackTrace();
3438
3439
             System.exit(0);
3439
3440
             cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440
3441
             cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..
..
@@ -4406,8 +4407,8 @@
4406
4407
     //MenuItem normalLensItem;
4407
4408
     MenuItem editCameraItem;
4408
4409
     MenuItem revertCameraItem;
4409
-    CheckboxMenuItem toggleLiveItem;
4410
4410
     MenuItem stepItem;
4411
+    CheckboxMenuItem toggleLiveItem;
4411
4412
     CheckboxMenuItem toggleFullScreenItem;
4412
4413
     CheckboxMenuItem toggleTimelineItem;
4413
4414
     CheckboxMenuItem toggleRenderItem;