X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInputHandler.java;h=490960b8986efffa5c4a24a81b1ef55136a0b65a;hp=c288afface0331516b5feb2969414f3fecfd1c46;hb=c9d399d3ae0b7f797d6fd62a4c22202a12a8825b;hpb=e5f474791112f95004f7e8f8ec96661884d7373f

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
index c288aff..490960b 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
@@ -15,28 +15,32 @@ public class GameInputHandler {
         this.gameProc = gameProc;
     }
 
-    public void  keyDown(int keyCode) {
+    private void wasdPressed(int keyCode) {
         if (gameProc.ctrlMode==0) {
-            if (keyCode == Input.Keys.A) {
-                gameProc.player.moveX.add(-GamePhysics.PL_SPEED, 0);
-                gameProc.player.dir = 0;
-            }
-            if (keyCode == Input.Keys.D) {
-                gameProc.player.moveX.add(GamePhysics.PL_SPEED, 0);
-                gameProc.player.dir = 1;
+            switch (keyCode) {
+                case Input.Keys.A:
+                    gameProc.player.moveX.add(-GamePhysics.PL_SPEED, 0);
+                    gameProc.player.dir = 0;
+                    break;
+                case Input.Keys.D:
+                    gameProc.player.moveX.add(GamePhysics.PL_SPEED, 0);
+                    gameProc.player.dir = 1;
+                    break;
             }
         } else {
-            if (keyCode == Input.Keys.A) {
-                gameProc.cursorX--;
-            }
-            if (keyCode == Input.Keys.D) {
-                gameProc.cursorX++;
-            }
-            if (keyCode == Input.Keys.W) {
-                gameProc.cursorY--;
-            }
-            if (keyCode == Input.Keys.S) {
-                gameProc.cursorY++;
+            switch (keyCode) {
+                case Input.Keys.A:
+                    gameProc.cursorX--;
+                    break;
+                case Input.Keys.D:
+                    gameProc.cursorX++;
+                    break;
+                case Input.Keys.W:
+                    gameProc.cursorY--;
+                    break;
+                case Input.Keys.S:
+                    gameProc.cursorY++;
+                    break;
             }
             if (gameProc.cursorX < 0)
                 gameProc.cursorX = 0;
@@ -47,39 +51,50 @@ public class GameInputHandler {
             if (gameProc.cursorY >= gameProc.world.getHeight())
                 gameProc.cursorY = gameProc.world.getHeight()-1;
         }
-        if (keyCode == Input.Keys.ALT_LEFT) {
-            gameProc.ctrlMode++;
-            gameProc.cursorX = (int)(gameProc.player.position.x/16);
-            gameProc.cursorY = (int)(gameProc.player.position.y/16);
-            if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
-        }
-        if (keyCode == Input.Keys.SPACE) {
-            if (gameProc.player.canJump) {
-                gameProc.player.moveY.add(0, -7);
-            } else if (!gameProc.player.flyMode) {
-                gameProc.player.flyMode = true;
-                gameProc.player.moveY.setZero();
-            } else {
-                gameProc.player.moveY.y = -GamePhysics.PL_SPEED;
-            }
-        }
-        if (keyCode == Input.Keys.CONTROL_LEFT) {
-            gameProc.player.moveY.y = GamePhysics.PL_SPEED;
-        }
-        if (keyCode == Input.Keys.E) {
-            gameProc.renderer.showCreative = !gameProc.renderer.showCreative;
+    }
+
+    public void  keyDown(int keyCode) {
+        if (keyCode == Input.Keys.W || keyCode == Input.Keys.A ||
+                keyCode == Input.Keys.S || keyCode == Input.Keys.D) {
+            wasdPressed(keyCode);
+        } else switch (keyCode) {
+            case Input.Keys.ALT_LEFT:
+                gameProc.ctrlMode++;
+                gameProc.cursorX = (int)(gameProc.player.position.x/16);
+                gameProc.cursorY = (int)(gameProc.player.position.y/16);
+                if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+                break;
+
+            case Input.Keys.SPACE:
+                if (gameProc.player.canJump) {
+                    gameProc.player.moveY.add(0, -7);
+                } else if (!gameProc.player.flyMode) {
+                    gameProc.player.flyMode = true;
+                    gameProc.player.moveY.setZero();
+                } else {
+                    gameProc.player.moveY.y = -GamePhysics.PL_SPEED;
+                }
+                break;
+
+            case Input.Keys.CONTROL_LEFT:
+                gameProc.player.moveY.y = GamePhysics.PL_SPEED;
+                break;
+
+            case Input.Keys.E:
+                gameProc.renderer.showCreative = !gameProc.renderer.showCreative;
+                break;
         }
     }
 
     public void keyUp(int keyCode) {
-        if (keyCode == Input.Keys.A || keyCode == Input.Keys.D) {
-            gameProc.player.moveX.x = 0;
-        }
-        if (keyCode == Input.Keys.SPACE) {
-            if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
-        }
-        if (keyCode == Input.Keys.CONTROL_LEFT) {
-            if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+        switch (keyCode) {
+            case Input.Keys.A: case Input.Keys.D:
+                gameProc.player.moveX.x = 0;
+                break;
+
+            case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT:
+                if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+                break;
         }
     }
 
@@ -87,35 +102,53 @@ public class GameInputHandler {
     }
 
     public void touchDown(int screenX, int screenY, int button) {
-        gameProc.touchDownX = screenX;
-        gameProc.touchDownY = screenY;
-        gameProc.touchDownTime = TimeUtils.millis();
-        gameProc.isTouchDown = true;
-        if (gameProc.renderer.showCreative) {
+        if (gameProc.renderer.showCreative &&
+                screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
+                screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
+                screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
+                screenY<gameProc.renderer.camera.viewportHeight/2+Assets.creativeInv.getRegionHeight()/2) {
             try {
-                int ix = (int)(screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2+8))/18;
-                int iy = (int)(screenY-(gameProc.renderer.camera.viewportHeight/2 - Assets.creativeInv.getRegionHeight()/2+18))/18;
-                int item = ix+iy*8;
-                for (int i=8; i>0; i--) {
-                    gameProc.player.inventory[i] = gameProc.player.inventory[i-1];
+                int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
+                int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
+                int item = ix + iy * 8;
+                for (int i = 8; i > 0; i--) {
+                    gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
                 }
-                if (item>=0 && item<Items.BLOCKS.size) gameProc.player.inventory[0] = item;
+                if (item >= 0 && item < Items.BLOCKS.size) gameProc.player.inventory[0] = item;
             } catch (Exception e) {
                 Gdx.app.error("GameInputHandler", e.toString());
             }
+        } else if (gameProc.renderer.showCreative) {
+            gameProc.renderer.showCreative = !gameProc.renderer.showCreative;
+        } else {
+            gameProc.touchDownX = screenX;
+            gameProc.touchDownY = screenY;
+            gameProc.touchDownTime = TimeUtils.millis();
+            gameProc.isTouchDown = true;
+            gameProc.touchDownButton = button;
         }
     }
 
     public void touchUp(int screenX, int screenY, int button) {
         if (gameProc.isTouchDown) {
             if (button == Input.Buttons.RIGHT){
-                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
-                        gameProc.player.inventory[gameProc.invSlot]);
+                if (gameProc.ctrlMode==1) {
+                    gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
+                            gameProc.player.inventory[gameProc.invSlot]);
+                }
             } 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);
+                if (gameProc.ctrlMode==1) {
+                    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 {
+                    if (screenY<Assets.invBar.getRegionHeight() &&
+                            screenX>gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
+                            screenX<gameProc.renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
+                        gameProc.invSlot = (int)((screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2))/20);
+                    }
                 }
             }
         }