X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=8bfea89aad345ff07b257dba81527c258858bc2e;hp=e177f40cf043e410458884c8b316650f99a56638;hb=99a56427db13dd0ecd025e433a438b77245cb739;hpb=c217099d21a0703347236f2d83e4d20c266f9be1 diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java index e177f40..8bfea89 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java @@ -3,180 +3,203 @@ package ru.deadsoftware.cavecraft.game; import com.badlogic.gdx.Input; import com.badlogic.gdx.utils.TimeUtils; import ru.deadsoftware.cavecraft.CaveGame; +import ru.deadsoftware.cavecraft.GameScreen; import ru.deadsoftware.cavecraft.game.mobs.Pig; import ru.deadsoftware.cavecraft.misc.AppState; import ru.deadsoftware.cavecraft.misc.Assets; public class GameInput { - private GameProc gameProc; + private GameProc gp; - public GameInput(GameProc gameProc) { - this.gameProc = gameProc; + public GameInput(GameProc gp) { + this.gp = gp; + } + + private boolean checkSwim() { + return GameItems.isFluid(gp.world.getForeMap(gp.player.getMapX(), gp.player.getMapY())); + } + + 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.moveX.x = -GamePhysics.PL_SPEED; - gameProc.player.dir = 0; + 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.moveX.x = GamePhysics.PL_SPEED; - gameProc.player.dir = 1; + 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; } + gp.blockDmg = 0; } } - public void keyDown(int keycode) { - gameProc.isKeyDown = true; - gameProc.keyDownCode = keycode; + public void keyDown(int 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 (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 (checkSwim()) { + 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.moveY.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; - else CaveGame.STATE = AppState.GAME_PLAY; + 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.ESCAPE: case Input.Keys.BACK: + case Input.Keys.ESCAPE: + case Input.Keys.BACK: CaveGame.STATE = AppState.GOTO_MENU; break; + + case Input.Keys.F1: + GameScreen.SHOW_DEBUG = !GameScreen.SHOW_DEBUG; + break; } } public void keyUp(int keycode) { switch (keycode) { - case Input.Keys.A: case Input.Keys.D: - gameProc.player.moveX.x = 0; + case Input.Keys.A: + case Input.Keys.D: + 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.moveY.setZero(); + case Input.Keys.SPACE: + case Input.Keys.CONTROL_LEFT: + 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) { - if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && - screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 && - screenXgameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 && - screenY= 0 && item < Items.BLOCKS.size) { - for (int i = 8; i > 0; i--) { - gameProc.player.inventory[i] = gameProc.player.inventory[i - 1]; - } - gameProc.player.inventory[0] = item; - } - } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) { - CaveGame.STATE = AppState.GAME_PLAY; - } - gameProc.touchDownX = screenX; - gameProc.touchDownY = screenY; - gameProc.touchDownTime = TimeUtils.millis(); - gameProc.isTouchDown = true; - gameProc.touchDownButton = button; + 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 (gameProc.isKeyDown) { - keyUp(gameProc.keyDownCode); - gameProc.isKeyDown = false; + if (CaveGame.TOUCH && gp.isKeyDown) { + keyUp(gp.keyDownCode); + gp.isKeyDown = false; } - if (gameProc.isTouchDown) { - if (button == Input.Buttons.RIGHT){ - gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, - gameProc.player.inventory[gameProc.invSlot]); - } else if (button == Input.Buttons.LEFT) { - if (screenYgameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 && - screenX 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 (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 < GameItems.getItemsSize()) { + for (int i = 8; i > 0; i--) { + gp.player.inv[i] = gp.player.inv[i - 1]; + } + 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 > 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) { + gp.useItem(gp.curX, gp.curY, + gp.player.inv[gp.player.invSlot], false); + } else if (button == Input.Buttons.LEFT) { + 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) { - 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; + } } } 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; } }