Complete advanced mode.

Normand Briere

2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f

 ObjEditor.java
..
..
@@ -143,6 +143,8 @@
143
143
         //nameField.removeActionListener(this);
144
144
 //        objEditor.ctrlPanel.remove(nameField);
145
145
         
146
+        objEditor.ctrlPanel.remove(namePanel);
147
+        
146
148
         if (!GroupEditor.allparams)
147
149
             return;
148
150
         
..
..
@@ -165,7 +167,6 @@
165
167
 //        objEditor.ctrlPanel.remove(fasterButton);
166
168
 //        objEditor.ctrlPanel.remove(remarkButton);
167
169
         
168
-        objEditor.ctrlPanel.remove(namePanel);
169
170
         objEditor.ctrlPanel.remove(setupPanel);
170
171
         objEditor.ctrlPanel.remove(commandsPanel);
171
172
         objEditor.ctrlPanel.remove(pushPanel);
..
..
@@ -308,44 +309,60 @@
308
309
         //normalLensItem.addActionListener(this);
309
310
         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310
311
         revertCameraItem.addActionListener(this);
311
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312
-        toggleTimelineItem.addItemListener(this);
312
+        
313
313
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314
314
         toggleFullScreenItem.addItemListener(this);
315
315
         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316
316
         cameraMenu.add("-");
317
+        
317
318
         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318
319
         toggleTextureItem.addItemListener(this);
319
320
         toggleTextureItem.setState(CameraPane.textureon);
320
-        cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321
-        toggleLiveItem.addItemListener(this);
322
-        toggleLiveItem.setState(Globals.isLIVE());
323
-        cameraMenu.add(stepItem = new MenuItem("Step"));
324
-        stepItem.addActionListener(this);
325
-//		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326
-//		toggleDLItem.addItemListener(this);
327
-//                toggleDLItem.setState(false);
328
-        cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329
-        toggleRenderItem.addItemListener(this);
330
-        toggleRenderItem.setState(!CameraPane.frozen);
331
-        cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332
-        toggleDebugItem.addItemListener(this);
333
-        toggleDebugItem.setState(CameraPane.DEBUG);
334
-        cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335
-        toggleFrustumItem.addItemListener(this);
336
-        toggleFrustumItem.setState(CameraPane.FRUSTUM);
337
-        cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338
-        toggleFootContactItem.addItemListener(this);
339
-        toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340
-        cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341
-        toggleRandomItem.addItemListener(this);
342
-        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
+        
343
358
         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344
359
         toggleHandleItem.addItemListener(this);
345
360
         toggleHandleItem.setState(CameraPane.HANDLES);
361
+        
346
362
         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347
363
         togglePaintItem.addItemListener(this);
348
364
         togglePaintItem.setState(CameraPane.PAINTMODE);
365
+        
349
366
 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350
367
 //		toggleRootItem.addItemListener(this);
351
368
 //                    toggleRootItem.setState(false);
..
..
@@ -967,28 +984,45 @@
967
984
             setupPanel = new cGridBag().setVertical(false);
968
985
             
969
986
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970
-        if (Globals.ADVANCED)
971
-                link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
987
+                liveCB.setToolTipText("Animate object");
972
988
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989
+                hideCB.setToolTipText("Hide object");
973
990
 //            Return();
974
991
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976
-        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
992
+        markCB.setToolTipText("Set the animation target transform");
993
+        
994
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
995
+        rewindCB.setToolTipText("Rewind animation");
996
+        
997
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998
+        randomCB.setToolTipText("Option for switch node");
977
999
 
1000
+        if (Globals.ADVANCED)
1001
+        {
1002
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1003
+                link2masterCB.setToolTipText("Attach to support");
1004
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1005
+                speedupCB.setToolTipText("Option motion capture");
1006
+        }
1007
+        
978
1008
         oe.ctrlPanel.add(setupPanel);
979
1009
         oe.ctrlPanel.Return();
980
1010
         
981
1011
             commandsPanel = new cGridBag().setVertical(false);
982
1012
         
983
1013
         resetButton = AddButton(commandsPanel, "Reset");
1014
+        resetButton.setToolTipText("Jump to frame zero");
984
1015
         stepButton = AddButton(commandsPanel, "Step");
1016
+        stepButton.setToolTipText("Step one frame");
985
1017
 //            resetAllButton = AddButton(oe, "Reset All");
986
1018
 //            stepAllButton = AddButton(oe, "Step All");
987
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988
1019
 //            Return();
989
1020
         slowerButton = AddButton(commandsPanel, "Slow");
1021
+        slowerButton.setToolTipText("Decrease animation speed");
990
1022
         fasterButton = AddButton(commandsPanel, "Fast");
1023
+        fasterButton.setToolTipText("Increase animation speed");
991
1024
         remarkButton = AddButton(commandsPanel, "Remark");
1025
+        remarkButton.setToolTipText("Set the current transform as the target");
992
1026
 
993
1027
         oe.ctrlPanel.add(commandsPanel);
994
1028
         oe.ctrlPanel.Return();
..
..
@@ -1451,9 +1485,12 @@
1451
1485
         editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1452
1486
                 clearMaterialButton.setToolTipText("Clear material");
1453
1487
         
1454
-        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1456
-        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
+        }
1457
1494
 
1458
1495
         editBar.preferredHeight = 15;
1459
1496
         
..
..
@@ -1722,12 +1759,15 @@
1722
1759
         opacityPowerField.addChangeListener(this);
1723
1760
         /**/
1724
1761
 
1725
-        resetSlidersButton.addActionListener(this);
1726
1762
         clearMaterialButton.addActionListener(this);
1727
1763
         createMaterialButton.addActionListener(this);
1728
-
1729
-        propagateToggle.addItemListener(this);
1730
-        multiplyToggle.addItemListener(this);
1764
+        
1765
+        if (Globals.ADVANCED)
1766
+        {
1767
+                resetSlidersButton.addActionListener(this);
1768
+                propagateToggle.addItemListener(this);
1769
+                multiplyToggle.addItemListener(this);
1770
+        }
1731
1771
     }
1732
1772
 
1733
1773
     void DropFile(java.io.File[] files, boolean textures)
..
..
@@ -2719,7 +2759,8 @@
2719
2759
             return;
2720
2760
         }
2721
2761
 
2722
-        multiplyToggle.setSelected(mat.multiply);
2762
+        if (multiplyToggle != null)
2763
+                multiplyToggle.setSelected(mat.multiply);
2723
2764
 
2724
2765
         assert (object.projectedVertices != null);
2725
2766
 
..
..
@@ -2934,7 +2975,7 @@
2934
2975
             frame.validate();
2935
2976
 
2936
2977
             return;
2937
-        } else if (event.getSource() == toggleRandomItem)
2978
+        } else if (event.getSource() == toggleSwitchItem)
2938
2979
         {
2939
2980
             cameraView.ToggleRandom();
2940
2981
             cameraView.repaint();
..
..
@@ -2979,6 +3020,7 @@
2979
3020
         if (event.getSource() == randomCB)
2980
3021
         {
2981
3022
             copy.random ^= true;
3023
+            objEditor.refreshContents();
2982
3024
             return;
2983
3025
         }
2984
3026
         if (event.getSource() == speedupCB)
..
..
@@ -3264,7 +3306,7 @@
3264
3306
     void CreateMaterial()
3265
3307
     {
3266
3308
         //copy.ClearMaterial(); // PATCH
3267
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3309
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3268
3310
         if (copy.selection.size() > 0)
3269
3311
         //SetMaterial(copy);
3270
3312
         {
..
..
@@ -3323,11 +3365,11 @@
3323
3365
     {
3324
3366
         copy.ResetBlockLoop(); // temporary problem
3325
3367
 
3326
-        boolean random = CameraPane.RANDOM;
3327
-        CameraPane.RANDOM = false; // parse everything
3368
+        boolean random = CameraPane.SWITCH;
3369
+        CameraPane.SWITCH = false; // parse everything
3328
3370
         copy.ResetDisplayList();
3329
3371
         copy.HardTouch();
3330
-        CameraPane.RANDOM = random;
3372
+        CameraPane.SWITCH = random;
3331
3373
     }
3332
3374
 
3333
3375
 //	public void applySelf()
..
..
@@ -4427,7 +4469,7 @@
4427
4469
     CheckboxMenuItem toggleFootContactItem;
4428
4470
     CheckboxMenuItem toggleDLItem;
4429
4471
     CheckboxMenuItem toggleTextureItem;
4430
-    CheckboxMenuItem toggleRandomItem;
4472
+    CheckboxMenuItem toggleSwitchItem;
4431
4473
     CheckboxMenuItem toggleRootItem;
4432
4474
     CheckboxMenuItem animationItem;
4433
4475
     CheckboxMenuItem toggleHandleItem;