X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInputHandler.java;h=c3aa564c9b25c0ad45c104eaa6e0effe537db918;hp=1273c05a7c6ebb97b0e3a17d6402b7a6ca7d788f;hb=a6ec412e508cfa8679dcf32e69600fbb939122af;hpb=5f7d6ee2ded67d412e861f09e102b52efb74d12c

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
index 1273c05..c3aa564 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
@@ -11,9 +11,27 @@ public class GameInputHandler {
         this.gameProc = gameProc;
     }
 
+    public void  keyDown(int keyCode) {
+        if (keyCode == Input.Keys.LEFT) {
+            gameProc.player.moveX.add(-GamePhysics.PL_SPEED,0);
+            gameProc.player.dir = 0;
+        }
+        if (keyCode == Input.Keys.RIGHT) {
+            gameProc.player.moveX.add(GamePhysics.PL_SPEED,0);
+            gameProc.player.dir = 1;
+        }
+        if (keyCode == Input.Keys.UP) gameProc.player.moveY.add(0,-12);
+    }
+
+    public void keyUp(int keyCode) {
+        if (keyCode == Input.Keys.RIGHT || keyCode == Input.Keys.LEFT) {
+            gameProc.player.moveX.x = 0;
+        }
+    }
+
     public void mouseMoved(int screenX, int screenY) {
-        gameProc.cursorX = (int)((screenX+gameProc.renderer.camera.position.x)/32);
-        gameProc.cursorY = (int)((screenY+gameProc.renderer.camera.position.y)/32);
+        gameProc.cursorX = (int)((screenX+gameProc.renderer.camera.position.x)/16);
+        gameProc.cursorY = (int)((screenY+gameProc.renderer.camera.position.y)/16);
         if (gameProc.cursorX < 0)
             gameProc.cursorX = 0;
         if (gameProc.cursorX >= gameProc.world.getWidth())
@@ -26,26 +44,33 @@ public class GameInputHandler {
     }
 
     public void touchDown(int screenX, int screenY, int button) {
-        if (button == Input.Buttons.LEFT) {
-            if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
-                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
-            } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) {
-                gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0);
-            }
-        } else {
-            gameProc.touchDownTime = TimeUtils.millis();
-            gameProc.isTouchDown = true;
-        }
+        gameProc.touchDownX = screenX;
+        gameProc.touchDownY = screenY;
+        gameProc.touchDownTime = TimeUtils.millis();
+        gameProc.isTouchDown = true;
     }
 
     public void touchUp(int screenX, int screenY, int button) {
-        if (gameProc.isTouchDown && button == Input.Buttons.RIGHT){
+        if (gameProc.isTouchDown) {
+            if (button == Input.Buttons.RIGHT){
                 gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 1);
+            } else if (button == Input.Buttons.LEFT) {
+                if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                    gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
+                } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                    gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0);
+                }
+            }
         }
         gameProc.isTouchDown = false;
     }
 
     public void touchDragged(int screenX, int screenY) {
+        gameProc.renderer.camera.position.x += (gameProc.touchDownX-screenX);
+        gameProc.renderer.camera.position.y += (gameProc.touchDownY-screenY);
+        gameProc.touchDownX = screenX;
+        gameProc.touchDownY = screenY;
+        gameProc.isTouchDown = false;
     }
 
 }