X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=c77c9e08032e6efe725cb6be42d07f248873464d;hb=e31e819b4fc6afdc3612e0ada5066dab638e89ac;hp=e1eea188e0d7ab2335260d776f7a573ad819a8b8;hpb=c9d399d3ae0b7f797d6fd62a4c22202a12a8825b;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index e1eea18..c77c9e0 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -1,23 +1,29 @@
 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 ru.deadsoftware.cavecraft.game.GameInputHandler;
+import ru.deadsoftware.cavecraft.game.GameItems;
 import ru.deadsoftware.cavecraft.game.GameProc;
+import ru.deadsoftware.cavecraft.game.GameSaver;
+import ru.deadsoftware.cavecraft.menu.MenuRenderer;
+import ru.deadsoftware.cavecraft.misc.*;
 
 public class GameScreen implements Screen {
 
     public static int FPS;
+    public static boolean SHOW_DEBUG = false;
+    public static int NEW_GAME_MODE = 0;
 
-    private GameProc gameProc;
+    private GameProc gp;
+    private Renderer renderer;
+    private MenuRenderer menuRenderer;
 
     public GameScreen() {
         Assets.load();
-        Items.load();
-        gameProc = new GameProc();
-        Gdx.input.setInputProcessor(new InputHandler(gameProc));
+        GameItems.load();
+        menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
+        renderer = menuRenderer;
+        Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
     }
 
     public static int getWidth() {
@@ -28,21 +34,72 @@ public class GameScreen implements Screen {
         return Gdx.graphics.getHeight();
     }
 
+    private void game(float delta) {
+        gp.update(delta);
+    }
+
+    private void menu() {
+    }
+
     @Override
     public void show() {
-
     }
 
     @Override
     public void render(float delta) {
-        FPS = (int)(1/delta);
-        gameProc.update(delta);
-        gameProc.renderer.render();
+        FPS = (int) (1 / delta);
+        switch (CaveGame.STATE) {
+            case GAME_PLAY:
+            case GAME_CREATIVE_INV:
+                game(delta);
+                break;
+
+            case MENU_MAIN:
+                menu();
+                break;
+
+            case NEW_GAME:
+                gp = new GameProc(NEW_GAME_MODE);
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
+                CaveGame.STATE = AppState.GAME_PLAY;
+                break;
+
+            case LOAD_GAME:
+                gp = GameSaver.load();
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
+                CaveGame.STATE = AppState.GAME_PLAY;
+                break;
+
+            case SAVE_GAME:
+                GameSaver.save(gp);
+                CaveGame.STATE = AppState.MENU_MAIN;
+                break;
+
+            case GOTO_MENU:
+                menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
+                renderer = menuRenderer;
+                Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+                break;
+        }
+        renderer.render();
     }
 
     @Override
     public void resize(int width, int height) {
-        gameProc.resetRenderer();
+        switch (CaveGame.STATE) {
+            case MENU_MAIN:
+
+                menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
+                renderer = menuRenderer;
+                break;
+            case GAME_PLAY:
+            case GAME_CREATIVE_INV:
+                gp.resetRenderer();
+                renderer = gp.renderer;
+                break;
+        }
     }
 
     @Override