X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInputProcessor.java;h=7eb35bd0c45b8a1b9c5811cc356ae2e889e42991;hb=a21a93fd9fa33adebe52d1f4478866dcc3b66d96;hp=51cc897f4a1f891e5cf044325e4c09db572e55ff;hpb=5b3244dceab39900a44eeb4d6108715c56735626;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java b/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
index 51cc897..7eb35bd 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.JsonValue;
 import ru.deadsoftware.cavedroid.MainConfig;
 import ru.deadsoftware.cavedroid.game.objects.TouchButton;
 import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
 
 import javax.inject.Inject;
 
@@ -21,14 +22,17 @@ public class GameInputProcessor extends InputAdapter {
     private final GameInput mGameInput;
     private final GameRenderer mGameRenderer;
     private final MainConfig mMainConfig;
+    private final AssetLoader mAssetLoader;
 
     @Inject
     public GameInputProcessor(GameInput gameInput,
                               GameRenderer gameRenderer,
-                              MainConfig mainConfig) {
+                              MainConfig mainConfig,
+                              AssetLoader assetLoader) {
         mGameInput = gameInput;
         mGameRenderer = gameRenderer;
         mMainConfig = mainConfig;
+        mAssetLoader = assetLoader;
 
         loadTouchButtonsFromJSON();
     }
@@ -51,7 +55,7 @@ public class GameInputProcessor extends InputAdapter {
     }
 
     private void loadTouchButtonsFromJSON() {
-        JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/touch_buttons.json"));
+        JsonValue json = Assets.jsonReader.parse(mAssetLoader.getAssetHandle("json/touch_buttons.json"));
         for (JsonValue key = json.child(); key != null; key = key.next()) {
             float x = key.getFloat("x");
             float y = key.getFloat("y");
@@ -152,8 +156,8 @@ public class GameInputProcessor extends InputAdapter {
     }
 
     @Override
-    public boolean scrolled(int amount) {
-        mGameInput.scrolled(amount);
+    public boolean scrolled(float amountX, float amountY) {
+        mGameInput.scrolled(amountX, amountY);
         return false;
     }
 }