Add inventory bar

[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 299dfa15ebefa8e54453e710422f7ff89f221352..efdce0440b8bb2a74d179fdd6188ee211ff59671 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -13,9 +13,10 @@ public class GameScreen implements Screen {
     private GameInputHandler gameInput;
 
     public GameScreen() {
+        Assets.load();
+        BlocksLoader.load();
         gameProc = new GameProc();
         gameInput = new GameInputHandler(gameProc);
-
         Gdx.input.setInputProcessor(new InputHandler());
     }
 
@@ -40,7 +41,7 @@ public class GameScreen implements Screen {
 
     @Override
     public void resize(int width, int height) {
-
+        gameProc.resetRenderer();
     }
 
     @Override
@@ -67,11 +68,13 @@ public class GameScreen implements Screen {
 
         @Override
         public boolean keyDown(int keycode) {
+            gameInput.keyDown(keycode);
             return false;
         }
 
         @Override
         public boolean keyUp(int keycode) {
+            gameInput.keyUp(keycode);
             return false;
         }
 
@@ -82,30 +85,39 @@ public class GameScreen implements Screen {
 
         @Override
         public boolean touchDown(int screenX, int screenY, int pointer, int button) {
+            screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
+            screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
             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();
             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;
         }
     }