Complete advanced mode.

Normand Briere

2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f

 ObjEditor.java
..
..
@@ -309,44 +309,60 @@
309
309
         //normalLensItem.addActionListener(this);
310
310
         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311
311
         revertCameraItem.addActionListener(this);
312
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313
-        toggleTimelineItem.addItemListener(this);
312
+        
314
313
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315
314
         toggleFullScreenItem.addItemListener(this);
316
315
         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317
316
         cameraMenu.add("-");
317
+        
318
318
         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319
319
         toggleTextureItem.addItemListener(this);
320
320
         toggleTextureItem.setState(CameraPane.textureon);
321
-        cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322
-        toggleLiveItem.addItemListener(this);
323
-        toggleLiveItem.setState(Globals.isLIVE());
324
-        cameraMenu.add(stepItem = new MenuItem("Step"));
325
-        stepItem.addActionListener(this);
326
-//		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327
-//		toggleDLItem.addItemListener(this);
328
-//                toggleDLItem.setState(false);
329
-        cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330
-        toggleRenderItem.addItemListener(this);
331
-        toggleRenderItem.setState(!CameraPane.frozen);
332
-        cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333
-        toggleDebugItem.addItemListener(this);
334
-        toggleDebugItem.setState(CameraPane.DEBUG);
335
-        cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336
-        toggleFrustumItem.addItemListener(this);
337
-        toggleFrustumItem.setState(CameraPane.FRUSTUM);
338
-        cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339
-        toggleFootContactItem.addItemListener(this);
340
-        toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341
-        cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342
-        toggleRandomItem.addItemListener(this);
343
-        toggleRandomItem.setState(CameraPane.RANDOM);
321
+        
322
+        if (Globals.ADVANCED)
323
+        {
324
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325
+                toggleLiveItem.addItemListener(this);
326
+                toggleLiveItem.setState(Globals.isLIVE());
327
+
328
+                cameraMenu.add(stepItem = new MenuItem("Step"));
329
+                stepItem.addActionListener(this);
330
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331
+        //		toggleDLItem.addItemListener(this);
332
+        //                toggleDLItem.setState(false);
333
+
334
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335
+                toggleRenderItem.addItemListener(this);
336
+                toggleRenderItem.setState(!CameraPane.frozen);
337
+
338
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339
+                toggleDebugItem.addItemListener(this);
340
+                toggleDebugItem.setState(CameraPane.DEBUG);
341
+
342
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343
+                toggleFrustumItem.addItemListener(this);
344
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
345
+
346
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347
+                toggleFootContactItem.addItemListener(this);
348
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349
+                
350
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351
+                toggleTimelineItem.addItemListener(this);
352
+        }
353
+        
354
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355
+        toggleSwitchItem.addItemListener(this);
356
+        toggleSwitchItem.setState(CameraPane.SWITCH);
357
+        
344
358
         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345
359
         toggleHandleItem.addItemListener(this);
346
360
         toggleHandleItem.setState(CameraPane.HANDLES);
361
+        
347
362
         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348
363
         togglePaintItem.addItemListener(this);
349
364
         togglePaintItem.setState(CameraPane.PAINTMODE);
365
+        
350
366
 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351
367
 //		toggleRootItem.addItemListener(this);
352
368
 //                    toggleRootItem.setState(false);
..
..
@@ -1469,9 +1485,12 @@
1469
1485
         editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1470
1486
                 clearMaterialButton.setToolTipText("Clear material");
1471
1487
         
1472
-        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474
-        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1488
+        if (Globals.ADVANCED)
1489
+        {
1490
+                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1491
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493
+        }
1475
1494
 
1476
1495
         editBar.preferredHeight = 15;
1477
1496
         
..
..
@@ -1740,12 +1759,15 @@
1740
1759
         opacityPowerField.addChangeListener(this);
1741
1760
         /**/
1742
1761
 
1743
-        resetSlidersButton.addActionListener(this);
1744
1762
         clearMaterialButton.addActionListener(this);
1745
1763
         createMaterialButton.addActionListener(this);
1746
-
1747
-        propagateToggle.addItemListener(this);
1748
-        multiplyToggle.addItemListener(this);
1764
+        
1765
+        if (Globals.ADVANCED)
1766
+        {
1767
+                resetSlidersButton.addActionListener(this);
1768
+                propagateToggle.addItemListener(this);
1769
+                multiplyToggle.addItemListener(this);
1770
+        }
1749
1771
     }
1750
1772
 
1751
1773
     void DropFile(java.io.File[] files, boolean textures)
..
..
@@ -2737,7 +2759,8 @@
2737
2759
             return;
2738
2760
         }
2739
2761
 
2740
-        multiplyToggle.setSelected(mat.multiply);
2762
+        if (multiplyToggle != null)
2763
+                multiplyToggle.setSelected(mat.multiply);
2741
2764
 
2742
2765
         assert (object.projectedVertices != null);
2743
2766
 
..
..
@@ -2952,7 +2975,7 @@
2952
2975
             frame.validate();
2953
2976
 
2954
2977
             return;
2955
-        } else if (event.getSource() == toggleRandomItem)
2978
+        } else if (event.getSource() == toggleSwitchItem)
2956
2979
         {
2957
2980
             cameraView.ToggleRandom();
2958
2981
             cameraView.repaint();
..
..
@@ -3283,7 +3306,7 @@
3283
3306
     void CreateMaterial()
3284
3307
     {
3285
3308
         //copy.ClearMaterial(); // PATCH
3286
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3309
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287
3310
         if (copy.selection.size() > 0)
3288
3311
         //SetMaterial(copy);
3289
3312
         {
..
..
@@ -3342,11 +3365,11 @@
3342
3365
     {
3343
3366
         copy.ResetBlockLoop(); // temporary problem
3344
3367
 
3345
-        boolean random = CameraPane.RANDOM;
3346
-        CameraPane.RANDOM = false; // parse everything
3368
+        boolean random = CameraPane.SWITCH;
3369
+        CameraPane.SWITCH = false; // parse everything
3347
3370
         copy.ResetDisplayList();
3348
3371
         copy.HardTouch();
3349
-        CameraPane.RANDOM = random;
3372
+        CameraPane.SWITCH = random;
3350
3373
     }
3351
3374
 
3352
3375
 //	public void applySelf()
..
..
@@ -4446,7 +4469,7 @@
4446
4469
     CheckboxMenuItem toggleFootContactItem;
4447
4470
     CheckboxMenuItem toggleDLItem;
4448
4471
     CheckboxMenuItem toggleTextureItem;
4449
-    CheckboxMenuItem toggleRandomItem;
4472
+    CheckboxMenuItem toggleSwitchItem;
4450
4473
     CheckboxMenuItem toggleRootItem;
4451
4474
     CheckboxMenuItem animationItem;
4452
4475
     CheckboxMenuItem toggleHandleItem;