aboutsummaryrefslogtreecommitdiffstats
path: root/src/v
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-09-16 18:43:03 +0200
committerMattias Andrée <maandree@kth.se>2021-09-16 18:43:03 +0200
commit15545f41f0a2d4cd287a62a896920cc4a9fc5b27 (patch)
tree9bdceaadc3050deae42d6f9a396b0cf964e1728c /src/v
parentfix x key bug (diff)
downloadrotation3d-15545f41f0a2d4cd287a62a896920cc4a9fc5b27.tar.gz
rotation3d-15545f41f0a2d4cd287a62a896920cc4a9fc5b27.tar.bz2
rotation3d-15545f41f0a2d4cd287a62a896920cc4a9fc5b27.tar.xz
Improve makefile + m
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/v')
-rw-r--r--src/v/D3.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/v/D3.java b/src/v/D3.java
index 7292cd0..5873b85 100644
--- a/src/v/D3.java
+++ b/src/v/D3.java
@@ -64,6 +64,7 @@ public class D3
static float[][] Pm = UNIT;
static float[][] Qm = UNIT;
+ static boolean rreset = false;
static boolean sreset = false;
static boolean zreset = false;
static boolean camera_to_rotation = false;
@@ -294,7 +295,10 @@ public class D3
break;
case KeyEvent.VK_R:
- rotation_speed = 0;
+ if (ctrl)
+ rreset = true;
+ else
+ rotation_speed = 0;
break;
}
else if (shift && (alt == false))
@@ -371,6 +375,12 @@ public class D3
rotation_to_camera = false;
}
+ if (rreset)
+ {
+ resetRotation();
+ rreset = false;
+ }
+
if (rx * rx == 1)
{
float[] v = mul(rx * SPEED, createRotation("x", Pm));