X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=299dfa15ebefa8e54453e710422f7ff89f221352;hb=5f7d6ee2ded67d412e861f09e102b52efb74d12c;hp=f227302c5febd06e0ef93b1fe9c47d08f3a137f6;hpb=62aa73cc7dfd177befe22784940c1bab13d94024;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index f227302..299dfa1 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -1,15 +1,22 @@
 package ru.deadsoftware.cavecraft;
 
 import com.badlogic.gdx.Gdx;
+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.game.GameRenderer;
 
 public class GameScreen implements Screen {
 
-    private GameRenderer renderer;
+    private GameProc gameProc;
+    private GameInputHandler gameInput;
 
     public GameScreen() {
-        renderer = new GameRenderer();
+        gameProc = new GameProc();
+        gameInput = new GameInputHandler(gameProc);
+
+        Gdx.input.setInputProcessor(new InputHandler());
     }
 
     public static int getWidth() {
@@ -27,7 +34,8 @@ public class GameScreen implements Screen {
 
     @Override
     public void render(float delta) {
-        renderer.render();
+        gameProc.update(delta);
+        gameProc.renderer.render();
     }
 
     @Override
@@ -54,4 +62,51 @@ public class GameScreen implements Screen {
     public void dispose() {
 
     }
+
+    private class InputHandler implements InputProcessor {
+
+        @Override
+        public boolean keyDown(int keycode) {
+            return false;
+        }
+
+        @Override
+        public boolean keyUp(int keycode) {
+            return false;
+        }
+
+        @Override
+        public boolean keyTyped(char character) {
+            return false;
+        }
+
+        @Override
+        public boolean touchDown(int screenX, int screenY, int pointer, int button) {
+            gameInput.touchDown(screenX, screenY, button);
+            return false;
+        }
+
+        @Override
+        public boolean touchUp(int screenX, int screenY, int pointer, int button) {
+            gameInput.touchUp(screenX, screenY, button);
+            return false;
+        }
+
+        @Override
+        public boolean touchDragged(int screenX, int screenY, int pointer) {
+            gameInput.touchDragged(screenX, screenY);
+            return false;
+        }
+
+        @Override
+        public boolean mouseMoved(int screenX, int screenY) {
+            gameInput.mouseMoved(screenX,screenY);
+            return false;
+        }
+
+        @Override
+        public boolean scrolled(int amount) {
+            return false;
+        }
+    }
 }