From 363b26464e250c29adc0a24ba6d8dcde8144f7dd Mon Sep 17 00:00:00 2001 From: Nils Schmidt Date: Fri, 15 Mar 2024 14:29:32 +0100 Subject: [PATCH] Fixed issue #1024. --- .../ldparteditor/helper/Manipulator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/nschmidt/ldparteditor/helper/Manipulator.java b/src/org/nschmidt/ldparteditor/helper/Manipulator.java index c89f47a9e..4988f94b8 100644 --- a/src/org/nschmidt/ldparteditor/helper/Manipulator.java +++ b/src/org/nschmidt/ldparteditor/helper/Manipulator.java @@ -914,7 +914,7 @@ private GColour manipulatorStatusHelper(float r, float g, float b, int type, Com calmDownCounter = -2; xRotatingForwards = true; } - }else { + } else { if (calmDownCounter < 0) { calmDownCounter += 1; break; @@ -933,7 +933,7 @@ private GColour manipulatorStatusHelper(float r, float g, float b, int type, Com calmDownCounter = -2; yRotatingForwards = true; } - }else { + } else { if (calmDownCounter < 0) { calmDownCounter += 1; break; @@ -952,7 +952,7 @@ private GColour manipulatorStatusHelper(float r, float g, float b, int type, Com calmDownCounter = -2; zRotatingForwards = true; } - }else { + } else { if (calmDownCounter < 0) { calmDownCounter += 1; break; @@ -971,7 +971,7 @@ private GColour manipulatorStatusHelper(float r, float g, float b, int type, Com calmDownCounter = -2; vRotatingForwards = true; } - }else { + } else { if (calmDownCounter < 0) { calmDownCounter += 1; break; @@ -1274,7 +1274,7 @@ public Vector4f transform(Vector2f oldMousePosition, int newX, int newY, Composi accurateResult = Matrix.mul(View.ACCURATE_ID.translate(new BigDecimal[] { accuratePosition[0].negate(), accuratePosition[1].negate(), accuratePosition[2].negate() }), accurateResult); } - if (xRotate && xRotatingForwards || xRotatingBackwards) { + if (xRotate && (xRotatingForwards || xRotatingBackwards)) { if (xRotatingForwards) { transformation.rotate(snapXrotate.floatValue(), new Vector3f(xAxis.x, xAxis.y, xAxis.z)); accurateTransformation = View.ACCURATE_ID.rotate(snapXrotate, snapXrotateFlag, accurateXaxis); @@ -1319,7 +1319,7 @@ public Vector4f transform(Vector2f oldMousePosition, int newX, int newY, Composi modified = true; } - if (yRotate && yRotatingForwards || yRotatingBackwards) { + if (yRotate && (yRotatingForwards || yRotatingBackwards)) { if (yRotatingForwards) { transformation.rotate(snapYrotate.floatValue(), new Vector3f(yAxis.x, yAxis.y, yAxis.z)); accurateTransformation = View.ACCURATE_ID.rotate(snapYrotate, snapYrotateFlag, accurateYaxis); @@ -1364,7 +1364,7 @@ public Vector4f transform(Vector2f oldMousePosition, int newX, int newY, Composi modified = true; } - if (zRotate && zRotatingForwards || zRotatingBackwards) { + if (zRotate && (zRotatingForwards || zRotatingBackwards)) { if (zRotatingForwards) { transformation.rotate(snapZrotate.floatValue(), new Vector3f(zAxis.x, zAxis.y, zAxis.z)); accurateTransformation = View.ACCURATE_ID.rotate(snapZrotate, snapZrotateFlag, accurateZaxis); @@ -1409,7 +1409,7 @@ public Vector4f transform(Vector2f oldMousePosition, int newX, int newY, Composi modified = true; } - if (vRotate && vRotatingForwards || vRotatingBackwards) { + if (vRotate && (vRotatingForwards || vRotatingBackwards)) { Vector4f[] gen = c3d.getGenerator(); if (vRotatingForwards) { transformation.rotate(snapVrotate.floatValue(), new Vector3f(gen[2].x, gen[2].y, gen[2].z));