Fix bugs

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / GameScreen.java

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index f227302c5febd06e0ef93b1fe9c47d08f3a137f6..2a2c262a6f4fe3cb0a36feb45f33f996080cc091 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -1,15 +1,23 @@
 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.GameRenderer;
+import ru.deadsoftware.cavecraft.game.GameInputHandler;
+import ru.deadsoftware.cavecraft.game.GameProc;
 
 public class GameScreen implements Screen {
 
-    private GameRenderer renderer;
+    public static int FPS;
+
+    private GameProc gameProc;
 
     public GameScreen() {
-        renderer = new GameRenderer();
+        Assets.load();
+        Items.load();
+        gameProc = new GameProc();
+        Gdx.input.setInputProcessor(new InputHandler(gameProc));
     }
 
     public static int getWidth() {
@@ -27,12 +35,19 @@ public class GameScreen implements Screen {
 
     @Override
     public void render(float delta) {
-        renderer.render();
+        if (CaveGame.STATE == GameState.RESTART) {
+            gameProc = new GameProc();
+            Gdx.input.setInputProcessor(new InputHandler(gameProc));
+            CaveGame.STATE = GameState.GAME_PLAY;
+        }
+        FPS = (int)(1/delta);
+        gameProc.update(delta);
+        gameProc.renderer.render();
     }
 
     @Override
     public void resize(int width, int height) {
-
+        gameProc.resetRenderer();
     }
 
     @Override
@@ -54,4 +69,5 @@ public class GameScreen implements Screen {
     public void dispose() {
 
     }
+
 }