diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index f1fb3eed43b8be66c7f358e028561085358bdcdb..9ca34b8e0507a5a42523accf769469847185661a 100644 (file)
package ru.deadsoftware.cavedroid;
package ru.deadsoftware.cavedroid;
+import com.badlogic.gdx.Application;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
-import ru.deadsoftware.cavedroid.game.GameItems;
+import com.badlogic.gdx.Graphics;
+import ru.deadsoftware.cavedroid.game.GameScreen;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
+import ru.deadsoftware.cavedroid.prefs.PreferencesStore;
+
+import javax.annotation.Nullable;
public class CaveGame extends Game {
private static final String TAG = "CaveGame";
public class CaveGame extends Game {
private static final String TAG = "CaveGame";
- public static final String VERSION = "alpha 0.4";
+ public static final String VERSION = "alpha 0.9.2";
+
+ private final MainConfig mMainConfig;
+ private final MainComponent mMainComponent;
+ private final AssetLoader mAssetLoader;
private final String mGameFolder;
private final boolean mTouch;
private boolean mDebug;
private final String mGameFolder;
private final boolean mTouch;
private boolean mDebug;
- public CaveGame(String gameFolder, boolean touch) {
+ @Nullable
+ private final String mAssetsPackPath;
+
+ public CaveGame(String gameFolder,
+ boolean touch,
+ PreferencesStore preferencesStore,
+ @Nullable String assetsPackPath) {
mGameFolder = gameFolder;
mTouch = touch;
mGameFolder = gameFolder;
mTouch = touch;
+ mAssetsPackPath = assetsPackPath;
+
+ mMainComponent = DaggerMainComponent
+ .builder()
+ .caveGame(this)
+ .preferencesStore(preferencesStore)
+ .build();
+
+ mMainConfig = mMainComponent.getMainConfig();
+ mAssetLoader = mMainComponent.getAssetLoader();
}
public void setDebug(boolean debug) {
mDebug = debug;
}
}
public void setDebug(boolean debug) {
mDebug = debug;
}
- private void initConfig(MainConfig mainConfig, MainComponent mainComponent) {
- int width = mTouch ? 320 : 480;
+ private void initConfig() {
+ int width = 480;
int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
- mainConfig.setMainComponent(mainComponent);
- mainConfig.setGameFolder(mGameFolder);
- mainConfig.setTouch(mTouch);
- mainConfig.setWidth(width);
- mainConfig.setHeight(height);
- mainConfig.setShowInfo(true);
+ mMainConfig.setMainComponent(mMainComponent);
+ mMainConfig.setGameFolder(mGameFolder);
+ mMainConfig.setTouch(mTouch);
+ mMainConfig.setWidth(width);
+ mMainConfig.setHeight(height);
+ mMainConfig.setShowInfo(mDebug);
+ mMainConfig.setAssetsPackPath(mAssetsPackPath);
+
+ if (mDebug) {
+ Gdx.app.setLogLevel(Application.LOG_DEBUG);
+ } else {
+ Gdx.app.setLogLevel(Application.LOG_ERROR);
+ }
+
+ mMainConfig.setFullscreenToggleListener((value) -> {
+ if (value) {
+ Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
+ } else {
+ Gdx.graphics.setWindowedMode(width, height);
+ }
+ });
+ }
+
+ public void newGame(int gameMode) {
+ GameScreen gameScreen = mMainComponent.getGameScreen();
+ gameScreen.newGame(gameMode);
+ 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(TAG, mGameFolder);
Gdx.files.absolute(mGameFolder).mkdirs();
Gdx.files.absolute(mGameFolder).mkdirs();
+ initConfig();
- Assets.load();
- GameItems.load();
-
- MainComponent mainComponent = DaggerMainComponent.create();
- initConfig(mainComponent.getGameConfig(), mainComponent);
- setScreen(mainComponent.getGameScreen());
+ Gdx.app.debug(TAG, mGameFolder);
+ Assets.load(mAssetLoader);
+ setScreen(mMainComponent.getMenuScreen());
}
}
+ @Override
+ public void dispose() {
+ if (screen != null) {
+ screen.dispose();
+ }
+ Assets.dispose();
+ }
}
}