diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 6ae0752..e1e54f1 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,4 +1,4 @@ -build.sh:22308eae5fd9c88aa16fef54cf03ae21 - +build.sh:bd24d92a5b7f9fa42e98478e5e945b26 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar.sh:343cf505530401fb696296bc25a9b090 - diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java index 1048564..7be4e6a 100644 --- a/src/sig/RabiClone.java +++ b/src/sig/RabiClone.java @@ -1,12 +1,19 @@ package sig; +import javax.sound.midi.ControllerEventListener; +import javax.sound.midi.ShortMessage; import javax.swing.JFrame; import net.java.games.input.Component; import net.java.games.input.Controller; import net.java.games.input.ControllerEnvironment; +import net.java.games.input.ControllerEvent; +import net.java.games.input.ControllerListener; +import net.java.games.input.DirectAndRawInputEnvironmentPlugin; +import net.java.games.input.DirectInputEnvironmentPlugin; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import sig.engine.Panel; @@ -33,7 +40,6 @@ public class RabiClone{ public static JFrame f; public static List OBJ = new ArrayList(); - boolean newSizeSet=false; public static int BASE_WIDTH=512; public static int BASE_HEIGHT=288; @@ -47,6 +53,8 @@ public class RabiClone{ public static Maps CURRENT_MAP = Maps.WORLD1; public static Controller[] CONTROLLERS = new Controller[]{}; + + public static long lastControllerScan = System.currentTimeMillis(); public static void main(String[] args) { Key.InitializeKeyConversionMap(); @@ -83,6 +91,7 @@ public class RabiClone{ double updateMult = Math.min(1/60d,timePassed/1000000000d); CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers(); + //System.out.println(CONTROLLERS.length); for (int i=0;i