From 740b996c69ebcd0f4498793c35db3ebd44a8169f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 24 Dec 2017 20:07:27 -0500 Subject: [PATCH] Final attempts at implementing Windows/GWT controller support --- core/src/io/anuke/mindustry/core/Control.java | 5 ++++- core/src/io/anuke/mindustry/core/UI.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 0532392312..acbc16a3c7 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -9,6 +9,9 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Buttons; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.audio.Music; +import com.badlogic.gdx.controllers.Controller; +import com.badlogic.gdx.controllers.ControllerAdapter; +import com.badlogic.gdx.controllers.Controllers; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.reflect.ClassReflection; @@ -77,7 +80,7 @@ public class Control extends Module{ if(Mindustry.args.contains("-debug", false)) Vars.debug = true; - Inputs.useControllers(!gwt); + Inputs.useControllers(false); log("Total blocks loaded: " + Block.getAllBlocks().size); diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 619fbc86ba..287fe3ddf4 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -4,6 +4,9 @@ import static io.anuke.mindustry.Vars.*; import static io.anuke.ucore.scene.actions.Actions.*; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.controllers.Controller; +import com.badlogic.gdx.controllers.ControllerAdapter; +import com.badlogic.gdx.controllers.Controllers; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Colors; import com.badlogic.gdx.graphics.g2d.TextureRegion; @@ -317,6 +320,7 @@ public class UI extends SceneModule{ updateItems(); build.end(); + } void invalidateAll(){