diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 2a2c262a6f4fe3cb0a36feb45f33f996080cc091..6daa039bdb5043143300029941094c1b18a10ff5 100644 (file)
package ru.deadsoftware.cavecraft;
import com.badlogic.gdx.Gdx;
package ru.deadsoftware.cavecraft;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
-import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.Screen;
-import ru.deadsoftware.cavecraft.game.GameInputHandler;
import ru.deadsoftware.cavecraft.game.GameProc;
import ru.deadsoftware.cavecraft.game.GameProc;
+import ru.deadsoftware.cavecraft.menu.MenuRenderer;
public class GameScreen implements Screen {
public static int FPS;
private GameProc gameProc;
public class GameScreen implements Screen {
public static int FPS;
private GameProc gameProc;
+ private Renderer renderer;
public GameScreen() {
Assets.load();
Items.load();
gameProc = new GameProc();
public GameScreen() {
Assets.load();
Items.load();
gameProc = new GameProc();
- Gdx.input.setInputProcessor(new InputHandler(gameProc));
+ renderer = new MenuRenderer();
+ Gdx.input.setInputProcessor(new InputHandlerMenu());
}
public static int getWidth() {
}
public static int getWidth() {
return Gdx.graphics.getHeight();
}
return Gdx.graphics.getHeight();
}
+ private void game(float delta) {
+ gameProc.update(delta);
+ }
+
+ private void menu() {
+ }
+
@Override
public void show() {
@Override
public void show() {
@Override
public void render(float delta) {
@Override
public void render(float delta) {
- if (CaveGame.STATE == GameState.RESTART) {
- gameProc = new GameProc();
- Gdx.input.setInputProcessor(new InputHandler(gameProc));
- CaveGame.STATE = GameState.GAME_PLAY;
- }
FPS = (int)(1/delta);
FPS = (int)(1/delta);
- gameProc.update(delta);
- gameProc.renderer.render();
+ switch (CaveGame.STATE) {
+ case GAME_PLAY: case GAME_CREATIVE_INV:
+ game(delta);
+ break;
+
+ case MENU_MAIN:
+ menu();
+ break;
+
+ case RESTART:
+ gameProc = new GameProc();
+ Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+ CaveGame.STATE = GameState.GAME_PLAY;
+ break;
+ }
+ renderer.render();
}
@Override
public void resize(int width, int height) {
}
@Override
public void resize(int width, int height) {
- gameProc.resetRenderer();
+ switch (CaveGame.STATE) {
+ case MENU_MAIN:
+ renderer = new MenuRenderer();
+ break;
+ case GAME_PLAY: case GAME_CREATIVE_INV:
+ gameProc.resetRenderer();
+ break;
+ }
}
@Override
}
@Override