parent: 1e3de699 | patch | commit
Normand Briere
2019-05-05 44b1501b5c4cd60ea67cc3d0971ed53f53b594e6 
Support for right click.
6 files modified
76 ■■■■■ changed files
CameraPane.java 51 ●●●●● patch | view | raw | blame | history
Cone.java 4 ●●●●● patch | view | raw | blame | history
GroupEditor.java 2 ●●●●● patch | view | raw | blame | history
ObjEditor.java 2 ●●●●● patch | view | raw | blame | history
Object3D.java 13 ●●●●● patch | view | raw | blame | history
Torus.java 4 ●●●●● patch | view | raw | blame | history 
 CameraPane.java
....@@ -13519,7 +13519,7 @@
1351913519     public void mousePressed(MouseEvent e)
1352013520     {
1352113521         //System.out.println("mousePressed: " + e);
13522
-        clickStart(e.getX(), e.getY(), e.getModifiersEx());
13522
+        clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1352313523     }
1352413524 
1352513525     static long prevtime = 0;
....@@ -13595,8 +13595,8 @@
1359513595       //      mode |= META;
1359613596         //}
1359713597         
13598
-        SetMouseMode(WHEEL | e.getModifiersEx());
13599
-        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
13598
+        SetMouseMode(e.getModifiers(), WHEEL | e.getModifiersEx());
13599
+        drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
1360013600         anchorX = ax;
1360113601         anchorY = ay;
1360213602         prevX = px;
....@@ -13694,7 +13694,7 @@
1369413694     
1369513695     javax.swing.Timer timer = new javax.swing.Timer(350, this);
1369613696 
13697
-    void clickStart(int x, int y, int modifiers)
13697
+    void clickStart(int x, int y, int modifiers, int modifiersex)
1369813698     {
1369913699         if (!wasliveok)
1370013700             return;
....@@ -13711,7 +13711,7 @@
1371113711 //        touched = true; // main DL
1371213712         if (isRenderer)
1371313713         {
13714
-            SetMouseMode(modifiers);
13714
+            SetMouseMode(modifiers, modifiersex);
1371513715         }
1371613716 
1371713717         selectX = anchorX = x;
....@@ -13724,7 +13724,7 @@
1372413724         clicked = true;
1372513725         hold = false;
1372613726 
13727
-        if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
13727
+        if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
1372813728         // june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
1372913729         {
1373013730       //  System.out.println("RESTART II " + modifiers);
....@@ -13755,7 +13755,7 @@
1375513755             info.camera = renderCamera;
1375613756             info.x = x;
1375713757             info.y = y;
13758
-            info.modifiers = modifiers;
13758
+            info.modifiers = modifiersex;
1375913759             editObj = object.doEditClick(info, 0);
1376013760             if (!editObj)
1376113761             {
....@@ -13784,7 +13784,7 @@
1378413784             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1378513785         }
1378613786         else
13787
-            drag(e.getX(), e.getY(), e.getModifiersEx());
13787
+            drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1378813788         
1378913789     //try { Thread.sleep(1); } catch (Exception ex) {}
1379013790     }
....@@ -14021,7 +14021,7 @@
1402114021                     {
1402214022                         Globals.lighttouched = true;
1402314023                     }
14024
-                    drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
14024
+                    drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
1402514025                 }
1402614026             //else
1402714027             }
....@@ -14121,7 +14121,7 @@
1412114121     int X, Y;
1412214122     boolean SX, SY;
1412314123 
14124
-    void drag(int x, int y, int modifiers)
14124
+    void drag(int x, int y, int modifiers, int modifiersex)
1412514125     {
1412614126         if (IsFrozen())
1412714127         {
....@@ -14130,17 +14130,17 @@
1413014130 
1413114131         drag = true; // NEW
1413214132         
14133
-        boolean continuous = (modifiers & COMMAND) == COMMAND;
14133
+        boolean continuous = (modifiersex & COMMAND) == COMMAND;
1413414134 
1413514135         X = x;
1413614136         Y = y;
1413714137         // floating state for animation
14138
-        MODIFIERS = modifiers;
14139
-        modifiers &= ~1024;
14138
+        MODIFIERS = modifiersex;
14139
+        modifiersex &= ~1024;
1414014140         if (false) // modifiers != 0)
1414114141         {
1414214142             //new Exception().printStackTrace();
14143
-            System.out.println("mouseDragged: " + modifiers);
14143
+            System.out.println("mouseDragged: " + modifiersex);
1414414144             System.out.println("SHIFT = " + SHIFT);
1414514145             System.out.println("CONTROL = " + COMMAND);
1414614146             System.out.println("META = " + META);
....@@ -14160,7 +14160,7 @@
1416014160                 info.camera = renderCamera;
1416114161                 info.x = x;
1416214162                 info.y = y;
14163
-                object.editWindow.copy.doEditDrag(info);
14163
+                object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1416414164             } else
1416514165             {
1416614166                 if (x < startX)
....@@ -14361,7 +14361,7 @@
1436114361         
1436214362         if (control || command || IsFrozen())
1436314363             timeout = true;
14364
-        else
14364
+// ?? May 2019        else
1436514365        // timer.setDelay((modifiers & 128) != 0?0:350);
1436614366         mouseDown = false;
1436714367     if (!control && !command) // june 2013
....@@ -14471,7 +14471,7 @@
1447114471         System.out.println("keyReleased: " + e);
1447214472     }
1447314473 
14474
-    void SetMouseMode(int modifiers)
14474
+    void SetMouseMode(int modifiers, int modifiersex)
1447514475     {
1447614476         //System.out.println("SetMouseMode = " + modifiers);
1447714477         //modifiers &= ~1024;
....@@ -14483,7 +14483,7 @@
1448314483         //if (modifiers == 0) // || (modifiers == (1024 | CONTROL)))
1448414484         //	return;
1448514485         //System.out.println("SetMode = " + modifiers);
14486
-        if ((modifiers & WHEEL) == WHEEL)
14486
+        if ((modifiersex & WHEEL) == WHEEL)
1448714487         {
1448814488             mouseMode |= ZOOM;
1448914489         }
....@@ -14493,15 +14493,15 @@
1449314493         {
1449414494             mouseMode |= VR; // BACKFORTH;
1449514495         }
14496
-        if ((modifiers & CTRLCLICK) == CTRLCLICK)
14496
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
1449714497         {
1449814498             mouseMode |= SELECT;
1449914499         }
14500
-        if ((modifiers & COMMAND) == COMMAND)
14500
+        if ((modifiersex & COMMAND) == COMMAND)
1450114501         {
1450214502             mouseMode |= SELECT;
1450314503         }
14504
-        if ((modifiers & SHIFT) == SHIFT || forcetranslate)
14504
+        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1450514505         {
1450614506             mouseMode &= ~VR;
1450714507             mouseMode |= TRANSLATE;
....@@ -14530,7 +14530,7 @@
1453014530 
1453114531         if (isRenderer) //
1453214532         {
14533
-            SetMouseMode(modifiers);
14533
+            SetMouseMode(0, modifiers);
1453414534         }
1453514535 
1453614536         Globals.theRenderer.keyPressed(key);
....@@ -14990,7 +14990,7 @@
1499014990         //mode = ROTATE;
1499114991         if ((MODIFIERS & COMMAND) == 0) // VR??
1499214992         {
14993
-            SetMouseMode(modifiers);
14993
+            SetMouseMode(0, modifiers);
1499414994         }
1499514995     }
1499614996 
....@@ -15563,6 +15563,7 @@
1556315563     public boolean mouseDown(Event evt, int x, int y)
1556415564     {
1556515565         System.out.println("mouseDown: " + evt);
15566
+        System.exit(0);
1556615567         /*
1556715568         locked = true;
1556815569         drag = false;
....@@ -15606,7 +15607,7 @@
1560615607         {
1560715608             keyPressed(0, modifiers);
1560815609         }
15609
-        clickStart(x, y, modifiers);
15610
+ //       clickStart(x, y, modifiers);
1561015611         return true;
1561115612     }
1561215613 
....@@ -15724,7 +15725,7 @@
1572415725         {
1572515726             keyReleased(0, 0);
1572615727         }
15727
-        drag(x, y, modifiers);
15728
+        drag(x, y, 0, modifiers);
1572815729         return true;
1572915730     }
1573015731 


 Cone.java
....@@ -314,13 +314,13 @@
314314         return true;
315315     }
316316 
317
-    void doEditDrag(ClickInfo info)
317
+    void doEditDrag(ClickInfo info, boolean opposite)
318318     {
319319         if (hitSomething == 0)
320320             return;
321321         if (hitSomething == 1)
322322         {
323
-            super.doEditDrag(info);
323
+            super.doEditDrag(info, opposite);
324324             return;
325325         }
326326         double deltaR = info.x - startX;


 GroupEditor.java
....@@ -969,7 +969,7 @@
969969                     
970970                     flashIt = false;
971971                     CameraPane pane = (CameraPane) target;
972
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
972
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973973                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974974                     
975975                     if (group.selection.size() == 1)


 ObjEditor.java
....@@ -1939,7 +1939,7 @@
19391939 
19401940         //? flashIt = false;
19411941         CameraPane pane = (CameraPane) cameraView;
1942
-        pane.clickStart(location.x, location.y, 0);
1942
+        pane.clickStart(location.x, location.y, 0, 0);
19431943         pane.clickEnd(location.x, location.y, 0, true);
19441944 
19451945         if (group.selection.size() == 1)


 Object3D.java
....@@ -2477,13 +2477,13 @@
24772477         return retval;
24782478     }
24792479 
2480
-    void doEditDrag(ClickInfo info)
2480
+    void doEditDrag(ClickInfo info, boolean opposite)
24812481     {
24822482         switch (doSomething)
24832483         {
24842484             case 1: // '\001'
24852485                 //super.
2486
-                        doEditDrag0(info);
2486
+                        doEditDrag0(info, opposite);
24872487                 break;
24882488 
24892489             case 2: // '\002'
....@@ -2496,11 +2496,11 @@
24962496                     {
24972497                         //sel.hitSomething = childToDrag.hitSomething;
24982498                         //childToDrag.doEditDrag(info);
2499
-                        sel.doEditDrag(info);
2499
+                        sel.doEditDrag(info, opposite);
25002500                     } else
25012501                     {
25022502                         //super.
2503
-                                doEditDrag0(info);
2503
+                                doEditDrag0(info, opposite);
25042504                     }
25052505                 }
25062506                 break;
....@@ -7012,7 +7012,7 @@
70127012         return true;
70137013     }
70147014 
7015
-    void doEditDrag0(ClickInfo info)
7015
+    void doEditDrag0(ClickInfo info, boolean opposite)
70167016     {
70177017         if (hitSomething == 0)
70187018         {
....@@ -7039,7 +7039,7 @@
70397039                 
70407040                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
70417041                 
7042
-                if (modified)
7042
+                if (modified || opposite)
70437043                 {
70447044                     //assert(false);
70457045                             /*
....@@ -7133,6 +7133,7 @@
71337133 
71347134                 if (modified)
71357135                 {
7136
+                    // Rotate 90 degrees
71367137                     angle /= (Math.PI / 4);
71377138                     angle = Math.floor(angle + 0.5);
71387139                     angle *= (Math.PI / 4);


 Torus.java
....@@ -176,13 +176,13 @@
176176         return true;
177177     }
178178 
179
-    void doEditDrag(ClickInfo info)
179
+    void doEditDrag(ClickInfo info, boolean opposite)
180180     {
181181         if (hitSomething == 0)
182182             return;
183183         if (hitSomething == 1)
184184         {
185
-            super.doEditDrag(info);
185
+            super.doEditDrag(info, opposite);
186186             return;
187187         }
188188         double deltaR = info.x - startX;