X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=ef0821107a4e520b0d56e4c21d145e9203549992;hp=ea5296a4f226aa93c4d3bb594d0071de41c8ec91;hb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;hpb=aa867d19dc70babe1e3c091c60f903b06eb65fcf

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index ea5296a..ef08211 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
@@ -1,118 +1,35 @@
 package ru.deadsoftware.cavedroid.game;
 
-import com.badlogic.gdx.utils.Disposable;
-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.misc.ControlMode;
+import javax.inject.Inject;
 
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.LinkedList;
+@GameScope
+public class GameProc {
 
-public class GameProc implements Serializable, Disposable {
+    public static final int MAX_CREATIVE_SCROLL = GameItems.getItemsSize() / 8;
 
-    static final int MAX_CREATIVE_SCROLL = GameItems.getItemsSize() / 8;
+    private final GameWorld mGameWorld;
+    private final GamePhysics mGamePhysics;
+    private final GameInput mGameInput;
+    private final GameRenderer mGameRenderer;
 
-    private static final int WORLD_WIDTH = 1024;
-    private static final int WORLD_HEIGHT = 256;
-    private static final int UPD_RANGE = 16;
+    @Inject
+    public GameProc(GameWorld gameWorld,
+                    GamePhysics gamePhysics,
+                    GameInput gameInput,
+                    GameRenderer gameRenderer) {
+        mGameWorld = gameWorld;
+        mGamePhysics = gamePhysics;
+        mGameInput = gameInput;
+        mGameRenderer = gameRenderer;
 
-    static boolean DO_UPD = false;
-    static int UPD_X = -1, UPD_Y = -1;
-    public final Player player;
-    public final LinkedList<Mob> mobs;
-    final LinkedList<Drop> drops;
-    public transient GameWorld world;
-    public transient GameRenderer renderer;
-    public transient GameInput input;
-    public ControlMode controlMode;
-    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 LinkedList<>();
-        mobs = new LinkedList<>();
-        physics = new GamePhysics();
-        input = new GameInput();
-        controlMode = CaveGame.TOUCH ? ControlMode.WALK : ControlMode.CURSOR;
-        renderer = resetRenderer();
-        startFluidThread();
-    }
-
-    public GameRenderer resetRenderer() {
-        int scale = CaveGame.TOUCH ? 320 : 480;
-        renderer =  new GameRenderer(scale, scale * GameScreen.getHeight() / GameScreen.getWidth());
-        return renderer;
+        mGameWorld.startFluidsThread();
     }
 
-    private void startFluidThread() {
-        fluidThread = new GameFluidsThread();
-        fluidThread.start();
+    public void update(float delta) {
+        mGamePhysics.update();
+        mGameInput.update();
+        mGameWorld.update();
+        mGameRenderer.render(delta);
     }
 
-    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()) {
-                world.setForeMap(x, y, 0);
-                mobs.add(new FallingSand(x * 16, y * 16));
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (world.getForeMap(x, y) == 11) {
-            if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) {
-                world.setForeMap(x, y, 0);
-                mobs.add(new FallingGravel(x * 16, y * 16));
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (world.hasForeAt(x, y) && world.getForeMapBlock(x, y).requiresBlock()) {
-            if (!world.hasForeAt(x, y + 1) || !world.getForeMapBlock(x, y + 1).hasCollision()) {
-                world.destroyForeMap(x, y);
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (world.getForeMap(x, y) == 2) {
-            if (world.hasForeAt(x, y - 1) && (world.getForeMapBlock(x, y - 1).hasCollision() ||
-                    GameItems.isFluid(world.getForeMap(x, y - 1)))) {
-                world.setForeMap(x, y, 3);
-            }
-        }
-    }
-
-    private void blockUpdater() {
-        if (DO_UPD) {
-            for (int y = UPD_Y; y < UPD_Y + UPD_RANGE; y++) {
-                for (int x = UPD_X; x < UPD_X + UPD_RANGE; x++) {
-                    updateBlock(x, y);
-                }
-            }
-            DO_UPD = false;
-        }
-    }
-
-    public void update() {
-        physics.update();
-        input.update();
-        blockUpdater();
-        if (fluidThread == null || !fluidThread.isAlive()) {
-            startFluidThread();
-        }
-    }
-
-    @Override
-    public void dispose() {
-        if (fluidThread != null) {
-            fluidThread.interrupt();
-        }
-    }
 }