X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2FCaveGame.java;h=8b2d66b4622d80190e4a7f83e5347210e749f6b5;hb=40678b7f22c460abf9102ed61937137987ee9dcb;hp=57704d98f94f56d186c6c2c845f0dfd2f699d8d6;hpb=2948fcd9c40ebf588ef7d0e7cd8dd34ecaa1f9b2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index 57704d9..8b2d66b 100644
--- a/core/src/ru/deadsoftware/cavedroid/CaveGame.java
+++ b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
@@ -2,38 +2,85 @@ package ru.deadsoftware.cavedroid;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
-import ru.deadsoftware.cavedroid.misc.states.AppState;
-import ru.deadsoftware.cavedroid.misc.states.GameState;
-import ru.deadsoftware.cavedroid.misc.states.MenuState;
+import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameScreen;
+import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
+
+import javax.annotation.Nullable;
 
 public class CaveGame extends Game {
 
-    public static final String VERSION = "alpha 0.4";
+    private static final String TAG = "CaveGame";
+
+    public static final String VERSION = "alpha 0.4.2";
+
+    private final MainConfig mMainConfig;
+    private final MainComponent mMainComponent;
+    private final AssetLoader mAssetLoader;
+
+    private final String mGameFolder;
+    private final boolean mTouch;
+    private boolean mDebug;
+
+    @Nullable
+    private final String mAssetsPackPath;
 
-    public static AppState APP_STATE;
-    public static GameState GAME_STATE;
-    public static MenuState MENU_STATE;
+    public CaveGame(String gameFolder, boolean touch, @Nullable String assetsPackPath) {
+        mGameFolder = gameFolder;
+        mTouch = touch;
+        mAssetsPackPath = assetsPackPath;
 
-    public static String GAME_FOLDER;
-    public static boolean TOUCH;
+        mMainComponent = DaggerMainComponent.builder().caveGame(this).build();
 
-    public CaveGame(String gameFolder) {
-        this(gameFolder, false);
+        mMainConfig = mMainComponent.getMainConfig();
+        mAssetLoader = mMainComponent.getAssetLoader();
     }
 
-    public CaveGame(String gameFolder, boolean touch) {
-        GAME_FOLDER = gameFolder;
-        TOUCH = touch;
-        APP_STATE = AppState.MENU;
-        MENU_STATE = MenuState.MAIN;
-        GAME_STATE = GameState.PLAY;
+    public void setDebug(boolean debug) {
+        mDebug = debug;
+    }
+
+    private void initConfig() {
+        int width = mTouch ? 320 : 480;
+        int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
+
+        mMainConfig.setMainComponent(mMainComponent);
+        mMainConfig.setGameFolder(mGameFolder);
+        mMainConfig.setTouch(mTouch);
+        mMainConfig.setWidth(width);
+        mMainConfig.setHeight(height);
+        mMainConfig.setShowInfo(mDebug);
+        mMainConfig.setAssetsPackPath(mAssetsPackPath);
+    }
+
+    public void newGame() {
+        GameScreen gameScreen = mMainComponent.getGameScreen();
+        gameScreen.newGame();
+        setScreen(gameScreen);
+    }
+
+    public void loadGame() {
+        GameScreen gameScreen = mMainComponent.getGameScreen();
+        gameScreen.loadGame();
+        setScreen(gameScreen);
+    }
+
+    public void quitGame() {
+        setScreen(mMainComponent.getMenuScreen());
     }
 
     @Override
     public void create() {
-        Gdx.app.log("CaveGame", GAME_FOLDER);
-        Gdx.files.absolute(GAME_FOLDER).mkdirs();
-        setScreen(new GameScreen());
+        Gdx.app.log(TAG, mGameFolder);
+        Gdx.files.absolute(mGameFolder).mkdirs();
+
+        initConfig();
+
+        Assets.load(mAssetLoader);
+        GameItems.load(mAssetLoader);
+
+        setScreen(mMainComponent.getMenuScreen());
     }
 
 }