diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index ca1118675451390d5d289f8469bc6d77d90514df..53d4310bcd08a6c6dd5f5dead75f2b6f5713eab2 100644 (file)
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
-import ru.deadsoftware.cavedroid.misc.AppState;
+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 class CaveGame extends Game {
- public static final String VERSION = "alpha 0.4";
- public static String GAME_FOLDER;
+ private static final String TAG = "CaveGame";
+
+ public static final String VERSION = "alpha 0.5.1";
+
+ 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 STATE;
+ public CaveGame(String gameFolder, boolean touch, @Nullable String assetsPackPath) {
+ mGameFolder = gameFolder;
+ mTouch = touch;
+ mAssetsPackPath = assetsPackPath;
+
+ mMainComponent = DaggerMainComponent.builder().caveGame(this).build();
+
+ mMainConfig = mMainComponent.getMainConfig();
+ mAssetLoader = mMainComponent.getAssetLoader();
+ }
+
+ public void setDebug(boolean debug) {
+ mDebug = debug;
+ }
- public static boolean TOUCH;
+ private void initConfig() {
+ int width = mTouch ? 320 : 480;
+ int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
- public CaveGame(String gameFolder) {
- this(gameFolder, false);
+ mMainConfig.setMainComponent(mMainComponent);
+ mMainConfig.setGameFolder(mGameFolder);
+ mMainConfig.setTouch(mTouch);
+ mMainConfig.setWidth(width);
+ mMainConfig.setHeight(height);
+ mMainConfig.setShowInfo(mDebug);
+ mMainConfig.setAssetsPackPath(mAssetsPackPath);
}
}
- public CaveGame(String gameFolder, boolean touch) {
- GAME_FOLDER = gameFolder;
- TOUCH = touch;
- STATE = AppState.MENU_MAIN;
+ 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() {
+ if (screen != null) {
+ screen.dispose();
+ }
+ setScreen(mMainComponent.getMenuScreen());
}
@Override
public void create() {
}
@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());
}
}
+ @Override
+ public void dispose() {
+ if (screen != null) {
+ screen.dispose();
+ }
+ }
}
}