Support for right click.

Normand Briere

2019-05-05 44b1501b5c4cd60ea67cc3d0971ed53f53b594e6

 ObjEditor.java
..
..
@@ -309,44 +309,61 @@
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
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+        toggleSwitchItem.addItemListener(this);
324
+        toggleSwitchItem.setState(CameraPane.SWITCH);
325
+        
344
326
         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345
327
         toggleHandleItem.addItemListener(this);
346
328
         toggleHandleItem.setState(CameraPane.HANDLES);
329
+        
347
330
         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348
331
         togglePaintItem.addItemListener(this);
349
332
         togglePaintItem.setState(CameraPane.PAINTMODE);
333
+        
334
+        if (Globals.ADVANCED)
335
+        {
336
+        cameraMenu.add("-");
337
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
+                toggleLiveItem.addItemListener(this);
339
+                toggleLiveItem.setState(Globals.isLIVE());
340
+
341
+                cameraMenu.add(stepItem = new MenuItem("Step"));
342
+                stepItem.addActionListener(this);
343
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
+        //		toggleDLItem.addItemListener(this);
345
+        //                toggleDLItem.setState(false);
346
+
347
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
+                toggleRenderItem.addItemListener(this);
349
+                toggleRenderItem.setState(!CameraPane.frozen);
350
+
351
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
+                toggleDebugItem.addItemListener(this);
353
+                toggleDebugItem.setState(CameraPane.DEBUG);
354
+
355
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
+                toggleFrustumItem.addItemListener(this);
357
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
+
359
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
+                toggleFootContactItem.addItemListener(this);
361
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
+                
363
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
+                toggleTimelineItem.addItemListener(this);
365
+        }
366
+        
350
367
 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351
368
 //		toggleRootItem.addItemListener(this);
352
369
 //                    toggleRootItem.setState(false);
..
..
@@ -1313,7 +1330,7 @@
1313
1330
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1314
1331
 
1315
1332
         /*JTabbedPane*/ scenePanel = new cGridBag();
1316
-        scenePanel.preferredWidth = 7;
1333
+        scenePanel.preferredWidth = 6;
1317
1334
         
1318
1335
         JTabbedPane tabbedPane = new JTabbedPane();
1319
1336
         tabbedPane.add(scrollpane);
..
..
@@ -1419,8 +1436,8 @@
1419
1436
 
1420
1437
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421
1438
 
1422
-        frame.setSize(1024, 768);
1423
-        frame.show();
1439
+        frame.setSize(1280, 860);
1440
+        frame.setVisible(true);
1424
1441
 
1425
1442
         gridPanel.setDividerLocation(1.0);
1426
1443
 
..
..
@@ -1469,9 +1486,12 @@
1469
1486
         editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1470
1487
                 clearMaterialButton.setToolTipText("Clear material");
1471
1488
         
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);
1489
+        if (Globals.ADVANCED)
1490
+        {
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1492
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494
+        }
1475
1495
 
1476
1496
         editBar.preferredHeight = 15;
1477
1497
         
..
..
@@ -1740,12 +1760,15 @@
1740
1760
         opacityPowerField.addChangeListener(this);
1741
1761
         /**/
1742
1762
 
1743
-        resetSlidersButton.addActionListener(this);
1744
1763
         clearMaterialButton.addActionListener(this);
1745
1764
         createMaterialButton.addActionListener(this);
1746
-
1747
-        propagateToggle.addItemListener(this);
1748
-        multiplyToggle.addItemListener(this);
1765
+        
1766
+        if (Globals.ADVANCED)
1767
+        {
1768
+                resetSlidersButton.addActionListener(this);
1769
+                propagateToggle.addItemListener(this);
1770
+                multiplyToggle.addItemListener(this);
1771
+        }
1749
1772
     }
1750
1773
 
1751
1774
     void DropFile(java.io.File[] files, boolean textures)
..
..
@@ -1916,7 +1939,7 @@
1916
1939
 
1917
1940
         //? flashIt = false;
1918
1941
         CameraPane pane = (CameraPane) cameraView;
1919
-        pane.clickStart(location.x, location.y, 0);
1942
+        pane.clickStart(location.x, location.y, 0, 0);
1920
1943
         pane.clickEnd(location.x, location.y, 0, true);
1921
1944
 
1922
1945
         if (group.selection.size() == 1)
..
..
@@ -2377,7 +2400,7 @@
2377
2400
         {
2378
2401
             /**/
2379
2402
             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380
-            browser.show();
2403
+            browser.setVisible(true);
2381
2404
             String filename = browser.getFile();
2382
2405
             if (filename != null && filename.length() > 0)
2383
2406
             {
..
..
@@ -2737,7 +2760,8 @@
2737
2760
             return;
2738
2761
         }
2739
2762
 
2740
-        multiplyToggle.setSelected(mat.multiply);
2763
+        if (multiplyToggle != null)
2764
+                multiplyToggle.setSelected(mat.multiply);
2741
2765
 
2742
2766
         assert (object.projectedVertices != null);
2743
2767
 
..
..
@@ -2952,7 +2976,7 @@
2952
2976
             frame.validate();
2953
2977
 
2954
2978
             return;
2955
-        } else if (event.getSource() == toggleRandomItem)
2979
+        } else if (event.getSource() == toggleSwitchItem)
2956
2980
         {
2957
2981
             cameraView.ToggleRandom();
2958
2982
             cameraView.repaint();
..
..
@@ -3253,7 +3277,6 @@
3253
3277
             callee.refreshContents();
3254
3278
         } else
3255
3279
         {
3256
-                new Exception().printStackTrace();
3257
3280
             System.exit(0);
3258
3281
         }
3259
3282
     }
..
..
@@ -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;