More tools.

Normand Briere

2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577

 ObjEditor.java
..
..
@@ -383,6 +383,27 @@
383
383
         closeItem.addActionListener(this);
384
384
 
385
385
         objectPanel = new JTabbedPane();
386
+        
387
+        ChangeListener changeListener = new ChangeListener()
388
+        {
389
+            public void stateChanged(ChangeEvent changeEvent)
390
+            {
391
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
392
+//                {
393
+//                    if (latestObject != null)
394
+//                    {
395
+//                        refreshContents(true);
396
+//                        SetMaterial(latestObject);
397
+//                    }
398
+//                    
399
+//                    materialFlushed = true;
400
+//                }
401
+
402
+                refreshContents(false); // To refresh Info tab
403
+            }
404
+        };
405
+        objectPanel.addChangeListener(changeListener);
406
+    
386
407
         toolbarPanel = new JPanel();
387
408
         toolbarPanel.setName("Toolbar");
388
409
         treePanel = new cGridBag();
..
..
@@ -884,7 +905,12 @@
884
905
     JCheckBox speedupCB;
885
906
     JCheckBox rewindCB;
886
907
     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
887
912
     JComboBox texresMenu;
913
+    
888
914
     JButton resetButton;
889
915
     JButton stepButton;
890
916
     JButton stepAllButton;
..
..
@@ -1412,8 +1438,8 @@
1412
1438
 
1413
1439
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414
1440
         //tmp.setName("Edit");
1415
-        objectPanel.add(toolboxPanel);
1416
1441
         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
1417
1443
 //        JPanel north = new JPanel(new BorderLayout());
1418
1444
 //        north.setName("Edit");
1419
1445
 //        north.add(ctrlPanel, BorderLayout.NORTH);
..
..
@@ -1445,9 +1471,7 @@
1445
1471
         JTabbedPane tabbedPane = new JTabbedPane();
1446
1472
         tabbedPane.add(scrollpane);
1447
1473
 
1448
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1449
-
1450
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
1451
1475
 
1452
1476
         optionsPanel.setName("Options");
1453
1477
         
..
..
@@ -1455,6 +1479,8 @@
1455
1479
         
1456
1480
         tabbedPane.add(optionsPanel);
1457
1481
         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
1458
1484
         scenePanel.add(tabbedPane);
1459
1485
 
1460
1486
         /*
..
..
@@ -1547,6 +1573,8 @@
1547
1573
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548
1574
 
1549
1575
         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
1550
1578
         frame.setVisible(true);
1551
1579
 
1552
1580
                     cameraView.requestFocusInWindow();
..
..
@@ -2866,6 +2894,8 @@
2866
2894
 
2867
2895
     void SetMaterial(Object3D object)
2868
2896
     {
2897
+        latestObject = object;
2898
+        
2869
2899
         cMaterial mat = object.material;
2870
2900
 
2871
2901
         if (mat == null)
..
..
@@ -3051,7 +3081,7 @@
3051
3081
             cameraView.ToggleDL();
3052
3082
             cameraView.repaint();
3053
3083
             return;
3054
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
3055
3085
         {
3056
3086
             cameraView.ToggleTexture();
3057
3087
             // june 2013           copy.HardTouch();
..
..
@@ -3090,7 +3120,7 @@
3090
3120
             frame.validate();
3091
3121
 
3092
3122
             return;
3093
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
3094
3124
         {
3095
3125
             cameraView.ToggleSwitch();
3096
3126
             cameraView.repaint();
..
..
@@ -4945,6 +4975,8 @@
4945
4975
     cGridBag optionsPanel;
4946
4976
     
4947
4977
     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4948
4980
     
4949
4981
     cGridBag XYZPanel;
4950
4982