X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=ea5296a4f226aa93c4d3bb594d0071de41c8ec91;hb=cfadf32a4a39d1e437b141b88e103610561ce6ef;hp=4de979050583c688ef682ed3205ac2655bfcb3e0;hpb=ba457424d8669a21df8352bdb77fc327332bc096;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java index 4de9790..ea5296a 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java @@ -1,28 +1,22 @@ package ru.deadsoftware.cavedroid.game; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input; import com.badlogic.gdx.utils.Disposable; -import com.badlogic.gdx.utils.TimeUtils; import ru.deadsoftware.cavedroid.CaveGame; import ru.deadsoftware.cavedroid.GameScreen; import ru.deadsoftware.cavedroid.game.mobs.FallingGravel; import ru.deadsoftware.cavedroid.game.mobs.FallingSand; import ru.deadsoftware.cavedroid.game.mobs.Mob; +import ru.deadsoftware.cavedroid.game.mobs.Player; import ru.deadsoftware.cavedroid.game.objects.Drop; -import ru.deadsoftware.cavedroid.game.objects.Player; import ru.deadsoftware.cavedroid.misc.ControlMode; -import ru.deadsoftware.cavedroid.misc.Assets; -import ru.deadsoftware.cavedroid.misc.states.GameState; +import javax.annotation.Nullable; import java.io.Serializable; -import java.util.ArrayList; - -import static ru.deadsoftware.cavedroid.game.GameItems.*; +import java.util.LinkedList; public class GameProc implements Serializable, Disposable { - static final int MAX_CREATIVE_SCROLL = getItemsSize() / 8; + static final int MAX_CREATIVE_SCROLL = GameItems.getItemsSize() / 8; private static final int WORLD_WIDTH = 1024; private static final int WORLD_HEIGHT = 256; @@ -30,39 +24,32 @@ public class GameProc implements Serializable, Disposable { static boolean DO_UPD = false; static int UPD_X = -1, UPD_Y = -1; - - private transient GameFluidsThread fluidThread; + public final Player player; + public final LinkedList mobs; + final LinkedList drops; public transient GameWorld world; public transient GameRenderer renderer; - transient GamePhysics physics; - + public transient GameInput input; public ControlMode controlMode; - public Player player; - public ArrayList mobs; - ArrayList drops; - - public boolean isTouchDown, isKeyDown; - public int touchDownX, touchDownY, touchDownBtn, keyDownCode; - long touchDownTime; - - int curX, curY; - int creativeScroll; - int blockDmg = 0; + transient GamePhysics physics; + @Nullable private transient GameFluidsThread fluidThread; public GameProc(int gameMode) { world = new GameWorld(WORLD_WIDTH, WORLD_HEIGHT); player = new Player(gameMode); - drops = new ArrayList<>(); - mobs = new ArrayList<>(); + drops = new LinkedList<>(); + mobs = new LinkedList<>(); physics = new GamePhysics(); + input = new GameInput(); controlMode = CaveGame.TOUCH ? ControlMode.WALK : ControlMode.CURSOR; - resetRenderer(); + renderer = resetRenderer(); startFluidThread(); } - public void resetRenderer() { + public GameRenderer resetRenderer() { int scale = CaveGame.TOUCH ? 320 : 480; - renderer = new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth()); + renderer = new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth()); + return renderer; } private void startFluidThread() { @@ -70,52 +57,6 @@ public class GameProc implements Serializable, Disposable { fluidThread.start(); } - private boolean isNotAutoselectable(int x, int y) { - return (!world.hasForeAt(x, y) || !world.getForeMapBlock(x, y).hasCollision()); - } - - private void checkCursorBounds() { - if (curY < 0) { - curY = 0; - } else if (curY >= world.getHeight()) { - curY = world.getHeight() - 1; - } - - if (controlMode == ControlMode.CURSOR) { - if (curX * 16 + 8 < player.pos.x + player.getWidth() / 2) { - player.setDir(0); - } else { - player.setDir(1); - } - } - } - - private void moveCursor() { - int pastX = curX; - int pastY = curY; - - if (controlMode == ControlMode.WALK && CaveGame.TOUCH) { - curX = player.getMapX() + (player.looksLeft() ? -1 : 1); - curY = player.getUpperMapY(); - for (int i = 0; i < 2 && isNotAutoselectable(curX, curY); i++) { - curY++; - } - if (isNotAutoselectable(curX, curY)) { - curX += player.looksLeft() ? 1 : -1; - } - } else if (!CaveGame.TOUCH) { - curX = (int) (Gdx.input.getX() * (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) / 16; - curY = (int) (Gdx.input.getY() * (renderer.getHeight() / GameScreen.getHeight()) + renderer.getCamY()) / 16; - if (curX < 0) curX--; - } - - if (pastX != curX || pastY != curY) { - blockDmg = 0; - } - - checkCursorBounds(); - } - private void updateBlock(int x, int y) { if (world.getForeMap(x, y) == 10) { if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) { @@ -142,7 +83,7 @@ public class GameProc implements Serializable, Disposable { if (world.getForeMap(x, y) == 2) { if (world.hasForeAt(x, y - 1) && (world.getForeMapBlock(x, y - 1).hasCollision() || - isFluid(world.getForeMap(x, y - 1)))) { + GameItems.isFluid(world.getForeMap(x, y - 1)))) { world.setForeMap(x, y, 3); } } @@ -159,87 +100,19 @@ public class GameProc implements Serializable, Disposable { } } - void useItem(int x, int y, int id, boolean bg) { - String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id); - if (id > 0) { - if (getItem(id).isBlock()) { - if (!bg) { - world.placeToForeground(x, y, getBlockIdByItemId(id)); - } else { - world.placeToBackground(x, y, getBlockIdByItemId(id)); - } - } else { - switch (key) { - case "bucket_water": - world.placeToForeground(x, y, getBlockId("water")); - player.inventory[player.slot] = getItemId("bucket_empty"); - break; - case "bucket_lava": - world.placeToForeground(x, y, getBlockId("lava")); - player.inventory[player.slot] = getItemId("bucket_empty"); - break; - } - } - } - } - - private void pressLMB() { - if ((world.hasForeAt(curX, curY) && world.getForeMapBlock(curX, curY).getHp() >= 0) || - (!world.hasForeAt(curX, curY) && world.hasBackAt(curX, curY) && - world.getBackMapBlock(curX, curY).getHp() >= 0)) { - if (player.gameMode == 0) { - blockDmg++; - if (world.hasForeAt(curX, curY)) { - if (blockDmg >= world.getForeMapBlock(curX, curY).getHp()) { - world.destroyForeMap(curX, curY); - blockDmg = 0; - } - } else if (world.hasBackAt(curX, curY)) { - if (blockDmg >= world.getBackMapBlock(curX, curY).getHp()) { - world.destroyBackMap(curX, curY); - blockDmg = 0; - } - } - } else { - if (world.hasForeAt(curX, curY)) { - world.placeToForeground(curX, curY, 0); - } else if (world.hasBackAt(curX, curY)) { - world.placeToBackground(curX, curY, 0); - } - isTouchDown = false; - } - } - } - - private void holdMB() { - switch (touchDownBtn) { - case Input.Buttons.RIGHT: - useItem(curX, curY, player.inventory[player.slot], true); - isTouchDown = false; - break; - case Input.Buttons.LEFT: - break; - default: - if (touchDownY < Assets.invBar.getRegionHeight() && - touchDownX > renderer.getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 && - touchDownX < renderer.getWidth() / 2 + (float) Assets.invBar.getRegionWidth() / 2) { - CaveGame.GAME_STATE= GameState.CREATIVE_INV; - isTouchDown = false; - } - } - } - public void update() { physics.update(); - moveCursor(); - - if (isTouchDown && touchDownBtn == Input.Buttons.LEFT) pressLMB(); - if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) holdMB(); - if (fluidThread == null || !fluidThread.isAlive()) startFluidThread(); + input.update(); + blockUpdater(); + if (fluidThread == null || !fluidThread.isAlive()) { + startFluidThread(); + } } @Override public void dispose() { - fluidThread.interrupt(); + if (fluidThread != null) { + fluidThread.interrupt(); + } } }