diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java b/core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java
index 0ab0bac0af1bfb6f7f778c3764816c026b9f1586..2b645207cd010c0f197694457abb59bbe6556f0b 100644 (file)
package ru.deadsoftware.cavedroid.menu;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.ObjectMap;
import ru.deadsoftware.cavedroid.CaveGame;
-import ru.deadsoftware.cavedroid.GameScreen;
+import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.menu.objects.Button;
import ru.deadsoftware.cavedroid.menu.submenus.Menu;
import ru.deadsoftware.cavedroid.menu.submenus.MenuMain;
import ru.deadsoftware.cavedroid.menu.submenus.MenuNewGame;
import ru.deadsoftware.cavedroid.misc.Renderer;
-import ru.deadsoftware.cavedroid.misc.states.AppState;
-import ru.deadsoftware.cavedroid.misc.states.GameState;
-import ru.deadsoftware.cavedroid.misc.states.MenuState;
+
+import javax.inject.Inject;
import static ru.deadsoftware.cavedroid.misc.Assets.*;
+@MenuScope
public class MenuProc extends Renderer {
- private MenuMain mainMenu;
- private MenuNewGame newGameMenu;
+ public class Input {
+ private void startNewGame(int gameMode) {
+ mMainConfig.getCaveGame().newGame();
+ }
+
+ public void newGameClicked() {
+ mCurrentMenu = mMenuNewGame;
+ }
+
+ public void loadGameClicked() {
+ mMainConfig.getCaveGame().loadGame();
+ }
+
+ public void quitClicked() {
+ Gdx.app.exit();
+ }
+
+ public void survivalClicked() {
+ startNewGame(0);
+ }
+
+ public void creativeClicked() {
+ startNewGame(1);
+ }
+
+ public void backClicked() {
+ mCurrentMenu = mMenuMain;
+ }
+ }
+
+ private final MainConfig mMainConfig;
+
+ private final MenuMain mMenuMain;
+ private final MenuNewGame mMenuNewGame;
+
+ private Menu mCurrentMenu;
+
+ @Inject
+ public MenuProc(
+ MainConfig mainConfig,
+ MenuMain.Factory menuMainFactory,
+ MenuNewGame.Factory menuNewGameFactory
+ ) {
+ super(mainConfig.getWidth(), mainConfig.getHeight());
+
+ mMainConfig = mainConfig;
+
+ Input menuInput = new Input();
- private Menu currentMenu;
+ mMenuMain = menuMainFactory.get(getWidth(), getHeight(), this::drawButton, menuInput);
+ mMenuNewGame = menuNewGameFactory.get(getWidth(), getHeight(), this::drawButton, menuInput);
- public MenuProc(int width) {
- super(width, width * GameScreen.getHeight() / GameScreen.getWidth());
- mainMenu = new MenuMain(getWidth(), getHeight());
- newGameMenu = new MenuNewGame(getWidth(), getHeight());
- currentMenu = mainMenu;
+ mCurrentMenu = mMenuMain;
}
private void drawButton(Button button) {
@Override
public boolean touchUp(int screenX, int screenY, int pointer, int mb) {
- screenX *= getWidth() / GameScreen.getWidth();
- screenY *= getHeight() / GameScreen.getHeight();
- for (ObjectMap.Entry<String, Button> entry : currentMenu.getButtons()) {
+ screenX *= getWidth() / Gdx.graphics.getWidth();
+ screenY *= getHeight() / Gdx.graphics.getHeight();
+ for (ObjectMap.Entry<String, Button> entry : mCurrentMenu.getButtons()) {
Button button = entry.value;
if (button.getRect().contains(screenX, screenY)) {
if (button.getType() > 0) {
}
@Override
- public void render() {
+ public void render(float delta) {
spriter.begin();
- switch (CaveGame.MENU_STATE) {
- case MAIN:
- currentMenu = mainMenu;
- break;
- case NEW_GAME:
- currentMenu = newGameMenu;
- break;
- case LOADING:
- drawString("Generating World...");
- CaveGame.APP_STATE = AppState.GAME;
- CaveGame.GAME_STATE = GameState.PLAY;
- break;
- case SAVING:
- drawString("Saving Game...");
- CaveGame.APP_STATE = AppState.MENU;
- CaveGame.MENU_STATE = MenuState.MAIN;
- break;
- }
- currentMenu.draw(spriter, this::drawButton, getWidth(), getHeight());
+ mCurrentMenu.draw(spriter);
drawString("CaveDroid " + CaveGame.VERSION, 0,
getHeight() - getStringHeight("CaveDroid " + CaveGame.VERSION) * 1.5f);
spriter.end();
}
+
+ public void reset() {
+ mCurrentMenu = mMenuMain;
+ }
}