X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInput.java;h=32672ed2ca3223a8efc9846999816e6cf56aee77;hb=59d07dd8a43cfb159045e6313cca4d519f67a6fc;hp=85d736dd4cd99c1e21d8b3cf7fa0231b6066aa6c;hpb=084218324e5251bde73361f90549563c16026b34;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java index 85d736d..32672ed 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java @@ -1,30 +1,35 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.TimeUtils; import ru.deadsoftware.cavedroid.CaveGame; import ru.deadsoftware.cavedroid.GameScreen; import ru.deadsoftware.cavedroid.game.mobs.Pig; -import ru.deadsoftware.cavedroid.misc.AppState; import ru.deadsoftware.cavedroid.misc.Assets; +import ru.deadsoftware.cavedroid.misc.ControlMode; +import ru.deadsoftware.cavedroid.misc.states.AppState; +import ru.deadsoftware.cavedroid.misc.states.GameState; import static ru.deadsoftware.cavedroid.GameScreen.GP; public class GameInput { private boolean checkSwim() { - return GameItems.isFluid(GP.world.getForeMap(GP.player.getMapX(), GP.player.getMapY())); + return GameItems.isFluid(GP.world.getForeMap(GP.player.getMapX(), GP.player.getLowerMapY())); } - 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); + @SuppressWarnings("IntegerDivisionInFloatingPointContext") + private boolean insideCreativeInv(float screenX, float screenY) { + TextureRegion creative = Assets.textureRegions.get("creative"); + return (screenX > GP.renderer.getWidth() / 2 - creative.getRegionWidth() / 2 && + screenX < GP.renderer.getWidth() / 2 + creative.getRegionWidth() / 2 && + screenY > GP.renderer.getHeight() / 2 - creative.getRegionHeight() / 2 && + screenY < GP.renderer.getHeight() / 2 + creative.getRegionHeight() / 2); } private void wasdPressed(int keycode) { - if (GP.ctrlMode == 0 || !CaveGame.TOUCH) { + if (GP.controlMode == ControlMode.WALK || !CaveGame.TOUCH) { switch (keycode) { case Input.Keys.A: GP.player.mov.x = -GamePhysics.PL_SPEED; @@ -65,8 +70,7 @@ public class GameInput { } else switch (keycode) { case Input.Keys.ALT_LEFT: if (CaveGame.TOUCH) { - GP.ctrlMode++; - if (GP.ctrlMode > 1) GP.ctrlMode = 0; + GP.controlMode = GP.controlMode == ControlMode.WALK ? ControlMode.CURSOR : ControlMode.WALK; } break; @@ -88,15 +92,18 @@ public class GameInput { break; case Input.Keys.E: - 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; + if (CaveGame.GAME_STATE == GameState.PLAY){ + switch (GP.player.gameMode) { + case 0: + //TODO survival inv + break; + case 1: + CaveGame.GAME_STATE = GameState.CREATIVE_INV; + break; + } + } else { + CaveGame.GAME_STATE = GameState.PLAY; } - else CaveGame.STATE = AppState.GAME_PLAY; break; case Input.Keys.G: @@ -109,7 +116,8 @@ public class GameInput { case Input.Keys.ESCAPE: case Input.Keys.BACK: - CaveGame.STATE = AppState.GOTO_MENU; + CaveGame.APP_STATE = AppState.SAVE; + CaveGame.GAME_STATE = GameState.PAUSE; break; case Input.Keys.F1: @@ -138,40 +146,40 @@ public class GameInput { } } - public void touchDown(int screenX, int screenY, int button) { + public void touchDown(float touchX, float touchY, int button) { GP.touchDownTime = TimeUtils.millis(); GP.isTouchDown = true; GP.touchDownBtn = button; - GP.touchDownX = screenX; - GP.touchDownY = screenY; + GP.touchDownX = touchX; + GP.touchDownY = touchY; } - public void touchUp(int screenX, int screenY, int button) { + public void touchUp(float screenX, float screenY, int button) { if (CaveGame.TOUCH && GP.isKeyDown) { keyUp(GP.keyDownCode); GP.isKeyDown = false; } + TextureRegion hotbar = Assets.textureRegions.get("hotbar"); + TextureRegion creative = Assets.textureRegions.get("creative"); 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; + if (CaveGame.GAME_STATE == GameState.CREATIVE_INV && insideCreativeInv(screenX, screenY)) { + int ix = (int) (screenX - (GP.renderer.getWidth() / 2 - creative.getRegionWidth() / 2 + 8)) / 18; + int iy = (int) (screenY - (GP.renderer.getHeight() / 2 - creative.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 < GameItems.getItemsSize()) { - for (int i = 8; i > 0; i--) { - GP.player.inv[i] = GP.player.inv[i - 1]; - } - GP.player.inv[0] = item; + System.arraycopy(GP.player.inventory, 0, GP.player.inventory, 1, 8); + GP.player.inventory[0] = item; } - } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) { - CaveGame.STATE = AppState.GAME_PLAY; - } else if (screenY < Assets.invBar.getRegionHeight() && - 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 (CaveGame.GAME_STATE == GameState.CREATIVE_INV) { + CaveGame.GAME_STATE = GameState.PLAY; + } else if (screenY < hotbar.getRegionHeight() && + screenX > GP.renderer.getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 && + screenX < GP.renderer.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2) { + GP.player.slot = (int) ((screenX - (GP.renderer.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20); } else if (button == Input.Buttons.RIGHT) { GP.useItem(GP.curX, GP.curY, - GP.player.inv[GP.player.invSlot], false); + GP.player.inventory[GP.player.slot], false); } else if (button == Input.Buttons.LEFT) { GP.blockDmg = 0; } @@ -179,31 +187,31 @@ public class GameInput { GP.isTouchDown = false; } - public void touchDragged(int screenX, int screenY) { - if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY - GP.touchDownY) > 16) { + public void touchDragged(float screenX, float screenY) { + if (CaveGame.GAME_STATE == GameState.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; + if (GP.creativeScroll > GameProc.MAX_CREATIVE_SCROLL) + GP.creativeScroll = GameProc.MAX_CREATIVE_SCROLL; } } } public void scrolled(int amount) { - switch (CaveGame.STATE) { - case GAME_PLAY: - GP.player.invSlot += amount; - if (GP.player.invSlot < 0) GP.player.invSlot = 8; - if (GP.player.invSlot > 8) GP.player.invSlot = 0; + switch (CaveGame.GAME_STATE) { + case PLAY: + GP.player.slot += amount; + if (GP.player.slot < 0) GP.player.slot = 8; + if (GP.player.slot > 8) GP.player.slot = 0; break; - case GAME_CREATIVE_INV: + case CREATIVE_INV: GP.creativeScroll += amount; if (GP.creativeScroll < 0) GP.creativeScroll = 0; - if (GP.creativeScroll > GP.maxCreativeScroll) - GP.creativeScroll = GP.maxCreativeScroll; + if (GP.creativeScroll > GameProc.MAX_CREATIVE_SCROLL) + GP.creativeScroll = GameProc.MAX_CREATIVE_SCROLL; break; } }