diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java b/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
index 51cc897f4a1f891e5cf044325e4c09db572e55ff..7eb35bd0c45b8a1b9c5811cc356ae2e889e42991 100644 (file)
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;
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();
}
}
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");
}
@Override
- public boolean scrolled(int amount) {
- mGameInput.scrolled(amount);
+ public boolean scrolled(float amountX, float amountY) {
+ mGameInput.scrolled(amountX, amountY);
return false;
}
}