diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 8c4fefbffc683801228073cb9bba571e4c9de8c9..ef33b8ee9c66b5f27e81d7ae1c55eff3464df014 100644 (file)
package ru.deadsoftware.cavedroid.game;
import com.badlogic.gdx.utils.Disposable;
package ru.deadsoftware.cavedroid.game;
import com.badlogic.gdx.utils.Disposable;
-import ru.deadsoftware.cavedroid.game.world.GameWorld;
+import com.badlogic.gdx.utils.Timer;
+import ru.deadsoftware.cavedroid.game.mobs.MobsController;
+import ru.deadsoftware.cavedroid.game.world.GameWorldBlocksLogicControllerTask;
+import ru.deadsoftware.cavedroid.game.world.GameWorldFluidsLogicControllerTask;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
import javax.inject.Inject;
@GameScope
public class GameProc implements Disposable {
import javax.inject.Inject;
@GameScope
public class GameProc implements Disposable {
- public 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 final GamePhysics mGamePhysics;
private final GameInput mGameInput;
private final GameRenderer mGameRenderer;
+ private final MobsController mMobsController;
+ private final GameWorldFluidsLogicControllerTask mGameWorldFluidsLogicControllerTask;
+ private final GameWorldBlocksLogicControllerTask mGameWorldBlocksLogicControllerTask;
+ private final GameItemsHolder mGameItemsHolder;
+
+ private final Timer mWorldLogicTimer = new Timer();
@Inject
@Inject
- public GameProc(GameWorld gameWorld,
- GamePhysics gamePhysics,
+ public GameProc(GamePhysics gamePhysics,
GameInput gameInput,
GameInput gameInput,
- GameRenderer gameRenderer) {
- mGameWorld = gameWorld;
+ GameRenderer gameRenderer,
+ MobsController mobsController,
+ GameWorldFluidsLogicControllerTask gameWorldFluidsLogicControllerTask,
+ GameWorldBlocksLogicControllerTask gameWorldBlocksLogicControllerTask,
+ GameItemsHolder gameItemsHolder,
+ AssetLoader assetLoader
+ ) {
mGamePhysics = gamePhysics;
mGameInput = gameInput;
mGameRenderer = gameRenderer;
mGamePhysics = gamePhysics;
mGameInput = gameInput;
mGameRenderer = gameRenderer;
+ mMobsController = mobsController;
+ mGameWorldFluidsLogicControllerTask = gameWorldFluidsLogicControllerTask;
+ mGameWorldBlocksLogicControllerTask = gameWorldBlocksLogicControllerTask;
+ mGameItemsHolder = gameItemsHolder;
+
+ mGameItemsHolder.initialize();
+
+ mWorldLogicTimer.scheduleTask(gameWorldFluidsLogicControllerTask, 0,
+ GameWorldFluidsLogicControllerTask.FLUID_UPDATE_INTERVAL_SEC);
+ mWorldLogicTimer.scheduleTask(gameWorldBlocksLogicControllerTask, 0,
+ GameWorldBlocksLogicControllerTask.WORLD_BLOCKS_LOGIC_UPDATE_INTERVAL_SEC);
+ }
- mGameWorld.startFluidsThread();
+ public void setPlayerGameMode(int gameMode) {
+ mMobsController.getPlayer().gameMode = gameMode;
}
public void update(float delta) {
mGamePhysics.update(delta);
mGameInput.update();
}
public void update(float delta) {
mGamePhysics.update(delta);
mGameInput.update();
- mGameWorld.update();
mGameRenderer.render(delta);
}
@Override
public void dispose() {
mGameRenderer.render(delta);
}
@Override
public void dispose() {
- mGameWorld.dispose();
+ mWorldLogicTimer.stop();
+ mGameWorldFluidsLogicControllerTask.cancel();
+ mGameWorldBlocksLogicControllerTask.cancel();
}
}
}
}