From ec0aa2d2f323b958410c7f0234da8f7f5ecd1f5e Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 29 Jun 2017 15:06:24 -0400 Subject: [PATCH] Fixed minor bug with camera panning out of bounds --- core/src/io/anuke/mindustry/Control.java | 9 ++++++++- core/src/io/anuke/mindustry/input/AndroidInput.java | 2 ++ core/src/io/anuke/mindustry/input/GestureHandler.java | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 9a6c04b050..0a6f27a487 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -13,6 +13,7 @@ import io.anuke.mindustry.input.GestureHandler; import io.anuke.mindustry.input.Input; import io.anuke.mindustry.world.Generator; import io.anuke.mindustry.world.blocks.ProductionBlocks; +import io.anuke.ucore.UCore; import io.anuke.ucore.core.*; import io.anuke.ucore.entities.Entities; import io.anuke.ucore.graphics.Atlas; @@ -23,7 +24,6 @@ import io.anuke.ucore.util.Timers; public class Control extends RendererModule{ public int rangex = 10, rangey = 10; public float targetzoom = 1f; - private float targetx, targety; //GifRecorder recorder = new GifRecorder(batch); public Control(){ @@ -148,8 +148,15 @@ public class Control extends RendererModule{ } updateShake(); + float prevx = camera.position.x, prevy = camera.position.y; clampCamera(-tilesize / 2f, -tilesize / 2f, pixsize - tilesize / 2f, pixsize - tilesize / 2f); + if(android){ + UCore.log(camera.position.x-prevx, camera.position.y-prevy); + player.x += camera.position.x-prevx; + player.y += camera.position.y-prevy; + } + float lastx = camera.position.x, lasty = camera.position.y; if(android){ diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index 64f4ffa700..e02bd2f7df 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -104,6 +104,8 @@ public class AndroidInput extends InputAdapter{ Tile sel = selected(); + if(sel == null) return; + if(warmup > warmupDelay && sel.block() != ProductionBlocks.core && sel.breakable()){ breaktime += Mathf.delta(); diff --git a/core/src/io/anuke/mindustry/input/GestureHandler.java b/core/src/io/anuke/mindustry/input/GestureHandler.java index a49afc6158..63e021f317 100644 --- a/core/src/io/anuke/mindustry/input/GestureHandler.java +++ b/core/src/io/anuke/mindustry/input/GestureHandler.java @@ -45,8 +45,6 @@ public class GestureHandler extends GestureAdapter{ return false; } - - @Override public boolean pinch (Vector2 initialPointer1, Vector2 initialPointer2, Vector2 pointer1, Vector2 pointer2) { if(recipe == null)