From 15545f41f0a2d4cd287a62a896920cc4a9fc5b27 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 16 Sep 2021 18:43:03 +0200 Subject: Improve makefile + m MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 15 ++++++++++----- src/v/D3.java | 12 +++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7e724d6..84e531d 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,17 @@ +.POSIX: + JAVAC = javac -.PHONY: all -all: +SRC =\ + srv/v/D3.java\ + srv/v/VMaths.java + + +all: $(SRC) @mkdir -p bin $(JAVAC) -cp src -s src -d bin src/v/D3.java - -.PHONY: clean clean: - -rm -r bin + -rm -r -- bin +.PHONY: all clean 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)); -- cgit v1.2.3-70-g09d2