From aa24075874dccc4370db12718a8bf8d6f36fcba9 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 26 Feb 2020 20:33:43 +0100 Subject: [PATCH] Forbedrer translateToDirection funksjonen i GameLauncher --- .../java/inf112/fiasko/roborally/GameLauncher.java | 10 ++++++---- .../fiasko/roborally/objects/DrawableObjectTest.java | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java index 5ab714e..740bab8 100644 --- a/src/main/java/inf112/fiasko/roborally/GameLauncher.java +++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java @@ -160,16 +160,18 @@ public class GameLauncher extends ApplicationAdapter implements InputProcessor { private int[] translateToDirection(float x, float y) { int outX = 0; int outY = 0; - if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == 1) { + int upX = Math.round(camera.up.x); + int upY = Math.round(camera.up.y); + if (upX == 0 && Math.round(camera.up.y) == 1) { outX = (int)-x; outY = (int)y; - } else if (Math.round(camera.up.x) == 0 && Math.round(camera.up.y) == -1) { + } else if (upX == 0 && upY == -1) { outX = (int)x; outY = (int)-y; - } else if (Math.round(camera.up.x) == -1 && Math.round(camera.up.y) == 0) { + } else if (upX == -1 && upY == 0) { outX = (int)-y; outY = (int)-x; - } else if (Math.round(camera.up.x) == 1 && Math.round(camera.up.y) == 0) { + } else if (upX == 1 && upY == 0) { outX = (int)y; outY = (int)x; } diff --git a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java index 44a3599..0ba1e52 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java @@ -89,7 +89,6 @@ public class DrawableObjectTest { assertEquals(HEIGHT_MAX_ARG, drawableObjectMaximumArguments.getHeight()); } - @Test public void getRotationMinArg() { assertEquals(0, drawableObjectMinimumArguments.getRotation());