Normand Briere
2019-05-05 1e3de699b037989e8deded5c7830139f97c64136
No use of META ("Windows") modifier.
3 files modified
12 ■■■■ changed files
CameraPane.java 8 ●●●● patch | view | raw | blame | history
Object3D.java 2 ●●● patch | view | raw | blame | history
Spline.java 2 ●●● patch | view | raw | blame | history
CameraPane.java
....@@ -12758,7 +12758,7 @@
1275812758 "MUL final.y, fragment.texcoord[0].x, c256;" +
1275912759 "FLR final.x, final.y;" +
1276012760 "SUB final.y, final.y, final.x;" +
12761
- //"MUL final.x, final.x, c256i;" +
12761
+ "MUL final.x, final.x, c256i;" +
1276212762 "MOV final.z, zero.x;" +
1276312763 "MOV final.a, one.w;":""
1276412764 ) +
....@@ -12766,7 +12766,7 @@
1276612766 "MUL final.y, fragment.texcoord[0].y, c256;" +
1276712767 "FLR final.x, final.y;" +
1276812768 "SUB final.y, final.y, final.x;" +
12769
- //"MUL final.x, final.x, c256i;" +
12769
+ "MUL final.x, final.x, c256i;" +
1277012770 "MOV final.z, zero.x;" +
1277112771 "MOV final.a, one.w;":""
1277212772 ) +
....@@ -14489,7 +14489,7 @@
1448914489 }
1449014490
1449114491 boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14492
- if (capsLocked || (modifiers & META) == META)
14492
+ if (capsLocked) // || (modifiers & META) == META)
1449314493 {
1449414494 mouseMode |= VR; // BACKFORTH;
1449514495 }
....@@ -15126,7 +15126,7 @@
1512615126 {
1512715127 //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
1512815128 //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15129
- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
15129
+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
1513015130 {
1513115131 mouseMoved(e);
1513215132 } else
Object3D.java
....@@ -6984,7 +6984,7 @@
69846984 }
69856985
69866986 //System.out.println("info.modifiers = " + info.modifiers);
6987
- modified = (info.modifiers & CameraPane.META) != 0;
6987
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
69886988 //System.out.println("modified = " + modified);
69896989 //new Exception().printStackTrace();
69906990 //viewCode = info.pane.renderCamera.viewCode;
Spline.java
....@@ -189,7 +189,7 @@
189189
190190 boolean doEditClick(ClickInfo info, int level)
191191 {
192
- boolean modified = (info.modifiers & CameraPane.META) != 0;
192
+ boolean modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
193193 startX = info.x;
194194 startY = info.y;
195195 int nPoints = ctrlPnts.size();