From a7682d8743353bbeca5d0907168ea6b4c4ffb3a9 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Thu, 9 May 2019 23:46:44 -0700 Subject: [PATCH] Added support for isometric offsets --- core/src/com/riiablo/camera/IsometricCamera.java | 7 ++----- tools/src/com/riiablo/CameraTool.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/com/riiablo/camera/IsometricCamera.java b/core/src/com/riiablo/camera/IsometricCamera.java index 34d70cb8..ec8308cd 100644 --- a/core/src/com/riiablo/camera/IsometricCamera.java +++ b/core/src/com/riiablo/camera/IsometricCamera.java @@ -28,7 +28,7 @@ public class IsometricCamera extends OrthographicCamera { public void translate(float x, float y) { position.add(x, y); toScreen(position.x, position.y, tmp); - super.position.set(tmp, 0); + super.position.set(tmp, 0).add(offset.x, offset.y, 0); } public void set(Vector2 vec) { @@ -38,7 +38,7 @@ public class IsometricCamera extends OrthographicCamera { public void set(float x, float y) { position.set(x, y); toScreen(position.x, position.y, tmp); - super.position.set(tmp.x, tmp.y, 0); + super.position.set(tmp.x, tmp.y, 0).add(offset.x, offset.y, 0); } public Vector2 toScreen(Vector2 worldCoords) { @@ -54,9 +54,6 @@ public class IsometricCamera extends OrthographicCamera { } public Vector2 toWorld(float x, float y, Vector2 dst) { - x += offset.x; - y += offset.y; - //y += offset.y; x /= Tile.SUBTILE_WIDTH50; y /= Tile.SUBTILE_HEIGHT50; dst.x = ( x - y) / 2; diff --git a/tools/src/com/riiablo/CameraTool.java b/tools/src/com/riiablo/CameraTool.java index d0fe813a..e751dd87 100644 --- a/tools/src/com/riiablo/CameraTool.java +++ b/tools/src/com/riiablo/CameraTool.java @@ -53,7 +53,7 @@ public class CameraTool extends ApplicationAdapter { idt.set(shapes.getProjectionMatrix()); iso.setToOrtho(false); - //iso.offset(0, -Tile.SUBTILE_HEIGHT50); + iso.offset(0, -Tile.SUBTILE_HEIGHT50); iso.set(0, 0); Gdx.gl.glClearColor(0.3f, 0.3f, 0.3f, 1.0f);