X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=52c3dcf5c8f2dbf1cedd7952d97fefe8a2648e82;hb=f7cc93fff73659b11d3666cdfd92efca1bf403dd;hp=3301805e5854acafb14a33263b1e32ec447167b6;hpb=48de33432d9615967da21b22b950bd526b330572;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 3301805..52c3dcf 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -1,23 +1,24 @@
 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.GameProc;
+import ru.deadsoftware.cavecraft.menu.MenuRenderer;
 
 public class GameScreen implements Screen {
 
+    public static int FPS;
+
     private GameProc gameProc;
-    private GameInputHandler gameInput;
+    private Renderer renderer;
+    private MenuRenderer menuRenderer;
 
     public GameScreen() {
         Assets.load();
         Items.load();
-        gameProc = new GameProc();
-        gameInput = new GameInputHandler(gameProc);
-        Gdx.input.setInputProcessor(new InputHandler());
+        menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+        renderer = menuRenderer;
+        Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
     }
 
     public static int getWidth() {
@@ -28,6 +29,13 @@ public class GameScreen implements Screen {
         return Gdx.graphics.getHeight();
     }
 
+    private void game(float delta) {
+        gameProc.update(delta);
+    }
+
+    private void menu() {
+    }
+
     @Override
     public void show() {
 
@@ -35,13 +43,44 @@ public class GameScreen implements Screen {
 
     @Override
     public void render(float 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 RESTART:
+                gameProc = new GameProc();
+                renderer = gameProc.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+                CaveGame.STATE = GameState.GAME_PLAY;
+                break;
+
+            case GOTO_MENU:
+                renderer = menuRenderer;
+                Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+                CaveGame.STATE = GameState.MENU_MAIN;
+                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:
+                gameProc.resetRenderer();
+                renderer = gameProc.renderer;
+                break;
+        }
     }
 
     @Override
@@ -64,123 +103,4 @@ public class GameScreen implements Screen {
 
     }
 
-    private class InputHandler implements InputProcessor {
-
-        @Override
-        public boolean keyDown(int keycode) {
-            gameInput.keyDown(keycode);
-            return false;
-        }
-
-        @Override
-        public boolean keyUp(int keycode) {
-            gameInput.keyUp(keycode);
-            return false;
-        }
-
-        @Override
-        public boolean keyTyped(char character) {
-            return false;
-        }
-
-        @Override
-        public boolean touchDown(int screenX, int screenY, int pointer, int button) {
-            screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
-            screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
-            if (CaveGame.TOUCH) {
-                if (screenX > 26 && screenX < 52 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 52 &&
-                        screenY < gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.W);
-                } else if (screenX > 0 && screenX < 26 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.A);
-                } else if (screenX > 26 && screenX < 52 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.S);
-                } else if (screenX > 52 && screenX < 78 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.D);
-                } else if (screenX > 78 && screenX < 104 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.ALT_LEFT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth - 52 &&
-                        screenX < gameProc.renderer.camera.viewportWidth - 26 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.touchDown(screenX, screenY, Input.Buttons.LEFT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth - 26 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.touchDown(screenX, screenY, Input.Buttons.RIGHT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth / 2 - 52 &&
-                        screenX < gameProc.renderer.camera.viewportWidth / 2 + 52 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyDown(Input.Keys.SPACE);
-                }
-            } else {
-                gameInput.touchDown(screenX, screenY, button);
-            }
-            return false;
-        }
-
-        @Override
-        public boolean touchUp(int screenX, int screenY, int pointer, int button) {
-            screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
-            screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
-            if (CaveGame.TOUCH) {
-                if (screenX>26 && screenX<52 &&
-                        screenY>gameProc.renderer.camera.viewportHeight-52 &&
-                        screenY<gameProc.renderer.camera.viewportHeight-26) {
-                    gameInput.keyUp(Input.Keys.W);
-                } else if (screenX>0 && screenX<26 &&
-                        screenY>gameProc.renderer.camera.viewportHeight-26) {
-                    gameInput.keyUp(Input.Keys.A);
-                } else if (screenX>26 && screenX<52 &&
-                        screenY>gameProc.renderer.camera.viewportHeight-26) {
-                    gameInput.keyUp(Input.Keys.S);
-                } else if (screenX>52 && screenX<78 &&
-                        screenY>gameProc.renderer.camera.viewportHeight-26) {
-                    gameInput.keyUp(Input.Keys.D);
-                } else if (screenX > 78 && screenX < 104 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyUp(Input.Keys.ALT_LEFT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth - 52 &&
-                        screenX < gameProc.renderer.camera.viewportWidth - 26 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.touchUp(screenX, screenY, Input.Buttons.LEFT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth - 26 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.touchUp(screenX, screenY, Input.Buttons.RIGHT);
-                } else if (screenX > gameProc.renderer.camera.viewportWidth / 2 - 52 &&
-                        screenX < gameProc.renderer.camera.viewportWidth / 2 + 52 &&
-                        screenY > gameProc.renderer.camera.viewportHeight - 26) {
-                    gameInput.keyUp(Input.Keys.SPACE);
-                }
-            } else {
-                gameInput.touchUp(screenX, screenY, button);
-            }
-            return false;
-        }
-
-        @Override
-        public boolean touchDragged(int screenX, int screenY, int pointer) {
-            screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
-            screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
-            gameInput.touchDragged(screenX, screenY);
-            return false;
-        }
-
-        @Override
-        public boolean mouseMoved(int screenX, int screenY) {
-            screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
-            screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
-            gameInput.mouseMoved(screenX,screenY);
-            return false;
-        }
-
-        @Override
-        public boolean scrolled(int amount) {
-            gameInput.scrolled(amount);
-            return false;
-        }
-    }
 }