X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=e2877e3d23c267ec4c7faea3442c0884f36f2d9c;hb=22eccb137bf9642700f762dd39cf02ea144bdca3;hp=7cac744d3b8d4403d0f29effeaea4fb268e21492;hpb=84b8cd80e39699174969bfed0734e78b8ec09615;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 7cac744..e2877e3 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
@@ -8,90 +8,103 @@ import ru.deadsoftware.cavecraft.game.mobs.Pig;
 import ru.deadsoftware.cavecraft.misc.AppState;
 import ru.deadsoftware.cavecraft.misc.Assets;
 
-public class GameInput {
+import static ru.deadsoftware.cavecraft.GameScreen.GP;
 
-    private GameProc gameProc;
+public class GameInput {
 
-    public GameInput(GameProc gameProc) {
-        this.gameProc = gameProc;
+    private boolean checkSwim() {
+        return GameItems.isFluid(GP.world.getForeMap(GP.player.getMapX(), GP.player.getMapY()));
     }
 
-    private boolean checkSwim() {
-        return (Items.isFluid(gameProc.world.getForeMap((int) (gameProc.player.position.x + gameProc.player.width / 2) / 16,
-                (int) (gameProc.player.position.y + gameProc.player.height / 4 * 3) / 16)));
+    private boolean insideCreativeInv(int screenX, int screenY) {
+        return (screenX > GP.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 &&
+                screenX < GP.renderer.getWidth() / 2 + Assets.creativeInv.getRegionWidth() / 2 &&
+                screenY > GP.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 &&
+                screenY < GP.renderer.getHeight() / 2 + Assets.creativeInv.getRegionHeight() / 2);
     }
 
     private void wasdPressed(int keycode) {
-        if (gameProc.ctrlMode == 0 || !CaveGame.TOUCH) {
+        if (GP.ctrlMode == 0 || !CaveGame.TOUCH) {
             switch (keycode) {
                 case Input.Keys.A:
-                    gameProc.player.move.x = -GamePhysics.PL_SPEED;
-                    gameProc.player.dir = 0;
-                    if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true;
+                    GP.player.mov.x = -GamePhysics.PL_SPEED;
+                    GP.player.setDir(0);
+                    if (CaveGame.TOUCH && checkSwim()) GP.player.swim = true;
                     break;
                 case Input.Keys.D:
-                    gameProc.player.move.x = GamePhysics.PL_SPEED;
-                    gameProc.player.dir = 1;
-                    if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true;
+                    GP.player.mov.x = GamePhysics.PL_SPEED;
+                    GP.player.setDir(1);
+                    if (CaveGame.TOUCH && checkSwim()) GP.player.swim = true;
                     break;
             }
-        } else if (CaveGame.TOUCH) {
+        } else {
             switch (keycode) {
                 case Input.Keys.A:
-                    gameProc.cursorX--;
+                    GP.curX--;
                     break;
                 case Input.Keys.D:
-                    gameProc.cursorX++;
+                    GP.curX++;
                     break;
                 case Input.Keys.W:
-                    gameProc.cursorY--;
+                    GP.curY--;
                     break;
                 case Input.Keys.S:
-                    gameProc.cursorY++;
+                    GP.curY++;
                     break;
             }
-            gameProc.blockDmg = 0;
+            GP.blockDmg = 0;
         }
     }
 
     public void keyDown(int keycode) {
-        gameProc.isKeyDown = true;
-        gameProc.keyDownCode = keycode;
+        GP.isKeyDown = true;
+        GP.keyDownCode = 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:
                 if (CaveGame.TOUCH) {
-                    gameProc.ctrlMode++;
-                    if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+                    GP.ctrlMode++;
+                    if (GP.ctrlMode > 1) GP.ctrlMode = 0;
                 }
                 break;
 
             case Input.Keys.SPACE:
                 if (checkSwim()) {
-                    gameProc.swim = true;
-                } else if (gameProc.player.canJump) {
-                    gameProc.player.move.add(0, -7);
-                } else if (!gameProc.player.flyMode) {
-                    gameProc.player.flyMode = true;
-                    gameProc.player.move.y = 0;
-                } else {
-                    gameProc.player.move.y = -GamePhysics.PL_SPEED;
+                    GP.player.swim = true;
+                } else if (GP.player.canJump) {
+                    GP.player.mov.add(0, -7);
+                } else if (!GP.player.flyMode && GP.player.gameMode == 1) {
+                    GP.player.flyMode = true;
+                    GP.player.mov.y = 0;
+                } else if (GP.player.flyMode) {
+                    GP.player.mov.y = -GamePhysics.PL_SPEED;
                 }
                 break;
 
             case Input.Keys.CONTROL_LEFT:
-                gameProc.player.move.y = GamePhysics.PL_SPEED;
+                GP.player.mov.y = GamePhysics.PL_SPEED;
                 break;
 
             case Input.Keys.E:
-                if (CaveGame.STATE == AppState.GAME_PLAY) CaveGame.STATE = AppState.GAME_CREATIVE_INV;
+                if (CaveGame.STATE == AppState.GAME_PLAY) switch (GP.player.gameMode) {
+                    case 0:
+                        //TODO survival inv
+                        break;
+                    case 1:
+                        CaveGame.STATE = AppState.GAME_CREATIVE_INV;
+                        break;
+                }
                 else CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
             case Input.Keys.G:
-                gameProc.mobs.add(new Pig(gameProc.cursorX * 16, gameProc.cursorY * 16));
+                GP.mobs.add(new Pig(GP.curX * 16, GP.curY * 16));
+                break;
+
+            case Input.Keys.Q:
+                GP.world.placeToForeground(GP.curX, GP.curY, 8);
                 break;
 
             case Input.Keys.ESCAPE:
@@ -109,78 +122,68 @@ public class GameInput {
         switch (keycode) {
             case Input.Keys.A:
             case Input.Keys.D:
-                gameProc.player.move.x = 0;
-                if (CaveGame.TOUCH && gameProc.swim) gameProc.swim = false;
+                GP.player.mov.x = 0;
+                if (CaveGame.TOUCH && GP.player.swim) GP.player.swim = false;
                 break;
 
             case Input.Keys.SPACE:
             case Input.Keys.CONTROL_LEFT:
-                if (gameProc.player.flyMode) gameProc.player.move.y = 0;
-                if (gameProc.swim) gameProc.swim = false;
+                if (GP.player.flyMode) GP.player.mov.y = 0;
+                if (GP.player.swim) GP.player.swim = false;
                 break;
         }
     }
 
-    public void mouseMoved(int screenX, int screenY) {
-    }
-
     public void touchDown(int screenX, int screenY, int button) {
-        gameProc.touchDownTime = TimeUtils.millis();
-        gameProc.isTouchDown = true;
-        gameProc.touchDownButton = button;
-        gameProc.touchDownX = screenX;
-        gameProc.touchDownY = screenY;
+        GP.touchDownTime = TimeUtils.millis();
+        GP.isTouchDown = true;
+        GP.touchDownBtn = button;
+        GP.touchDownX = screenX;
+        GP.touchDownY = screenY;
     }
 
     public void touchUp(int screenX, int screenY, int button) {
-        if (CaveGame.TOUCH && gameProc.isKeyDown) {
-            keyUp(gameProc.keyDownCode);
-            gameProc.isKeyDown = false;
+        if (CaveGame.TOUCH && GP.isKeyDown) {
+            keyUp(GP.keyDownCode);
+            GP.isKeyDown = false;
         }
-        if (gameProc.isTouchDown) {
-            if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
-                    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) {
-                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 = gameProc.creativeScroll * 8 + (ix + iy * 8);
+        if (GP.isTouchDown) {
+            if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && insideCreativeInv(screenX, screenY)) {
+                int ix = (int) (screenX - (GP.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
+                int iy = (int) (screenY - (GP.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
+                int item = GP.creativeScroll * 8 + (ix + iy * 8);
                 if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) item = -1;
-                if (item >= 0 && item < Items.ITEMS.size()) {
+                if (item >= 0 && item < GameItems.getItemsSize()) {
                     for (int i = 8; i > 0; i--) {
-                        gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
+                        GP.player.inv[i] = GP.player.inv[i - 1];
                     }
-                    gameProc.player.inventory[0] = item;
+                    GP.player.inv[0] = item;
                 }
             } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
                 CaveGame.STATE = AppState.GAME_PLAY;
             } 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);
+                    screenX > GP.renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 &&
+                    screenX < GP.renderer.getWidth() / 2 + Assets.invBar.getRegionWidth() / 2) {
+                GP.player.invSlot = (int) ((screenX - (GP.renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2)) / 20);
             } else if (button == Input.Buttons.RIGHT) {
-                gameProc.useItem(gameProc.cursorX, gameProc.cursorY,
-                        gameProc.player.inventory[gameProc.invSlot], false);
+                GP.useItem(GP.curX, GP.curY,
+                        GP.player.inv[GP.player.invSlot], false);
             } else if (button == Input.Buttons.LEFT) {
-                gameProc.blockDmg = 0;
+                GP.blockDmg = 0;
             }
         }
-        gameProc.isTouchDown = false;
+        GP.isTouchDown = false;
     }
 
     public void touchDragged(int screenX, int screenY) {
-        if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY - gameProc.touchDownY) > 16) {
-            if (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) {
-                gameProc.creativeScroll -= (screenY - gameProc.touchDownY) / 16;
-                gameProc.touchDownX = screenX;
-                gameProc.touchDownY = screenY;
-                if (gameProc.creativeScroll < 0) gameProc.creativeScroll = 0;
-                if (gameProc.creativeScroll > gameProc.maxCreativeScroll)
-                    gameProc.creativeScroll = gameProc.maxCreativeScroll;
+        if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY - GP.touchDownY) > 16) {
+            if (insideCreativeInv(screenX, screenY)) {
+                GP.creativeScroll -= (screenY - GP.touchDownY) / 16;
+                GP.touchDownX = screenX;
+                GP.touchDownY = screenY;
+                if (GP.creativeScroll < 0) GP.creativeScroll = 0;
+                if (GP.creativeScroll > GP.maxCreativeScroll)
+                    GP.creativeScroll = GP.maxCreativeScroll;
             }
         }
     }
@@ -188,15 +191,15 @@ public class GameInput {
     public void scrolled(int amount) {
         switch (CaveGame.STATE) {
             case GAME_PLAY:
-                gameProc.invSlot += amount;
-                if (gameProc.invSlot < 0) gameProc.invSlot = 8;
-                if (gameProc.invSlot > 8) gameProc.invSlot = 0;
+                GP.player.invSlot += amount;
+                if (GP.player.invSlot < 0) GP.player.invSlot = 8;
+                if (GP.player.invSlot > 8) GP.player.invSlot = 0;
                 break;
             case GAME_CREATIVE_INV:
-                gameProc.creativeScroll += amount;
-                if (gameProc.creativeScroll < 0) gameProc.creativeScroll = 0;
-                if (gameProc.creativeScroll > gameProc.maxCreativeScroll)
-                    gameProc.creativeScroll = gameProc.maxCreativeScroll;
+                GP.creativeScroll += amount;
+                if (GP.creativeScroll < 0) GP.creativeScroll = 0;
+                if (GP.creativeScroll > GP.maxCreativeScroll)
+                    GP.creativeScroll = GP.maxCreativeScroll;
                 break;
         }
     }