From a43f1f7189ba27e50b0845b468a7d7b356872532 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 7 Jun 2022 23:56:48 -0500 Subject: [PATCH] COntinued modifications to controller monitoring Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com> Co-authored-by: sigonasr2 --- src/sig/RabiClone.java | 44 +++++++++++++--------- src/sig/engine/Action.java | 5 +-- src/sig/engine/KeyBind.java | 52 +++++++++++++------------- src/sig/objects/ConfigureControls.java | 3 +- 4 files changed, 56 insertions(+), 48 deletions(-) diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java index 85936a4..c3d6a4f 100644 --- a/src/sig/RabiClone.java +++ b/src/sig/RabiClone.java @@ -5,6 +5,7 @@ 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.ControllerListener; import java.util.ArrayList; import java.util.List; @@ -85,28 +86,35 @@ public class RabiClone{ lastGameTime=System.nanoTime(); double updateMult = Math.min(1/60d,timePassed/1000000000d); - if (System.currentTimeMillis()-lastControllerScan>=5000) { - CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers(); - lastControllerScan=System.currentTimeMillis(); - } //System.out.println(CONTROLLERS.length); - for (int i=0;i=5000) { + if (CONTROLLERS.length==0) { + CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers(); + lastControllerScan=System.currentTimeMillis(); + } else { + for (int i=0;i(Arrays.asList(keybinds))); } - Action(Controller c, Identifier.Axis axis,float val) { + Action(byte port, Identifier.Axis axis,float val) { ArrayList comps = new ArrayList(); - comps.add(new KeyBind(c,axis,val)); + comps.add(new KeyBind(port,axis,val)); KeyBind.KEYBINDS.put(this,comps); } } diff --git a/src/sig/engine/KeyBind.java b/src/sig/engine/KeyBind.java index 3d8d329..91b8aa4 100644 --- a/src/sig/engine/KeyBind.java +++ b/src/sig/engine/KeyBind.java @@ -12,21 +12,21 @@ public class KeyBind { public static HashMap> KEYBINDS = new HashMap<>(); static HashMap KEYS = new HashMap<>(); - public Controller c; + public byte port; public Identifier id; float val; - public KeyBind(Controller c, Identifier id) { - this.c=c; + public KeyBind(byte port, Identifier id) { + this.port=port; this.id=id; } public KeyBind(int keycode) { - this(null,new Key(keycode)); + this((byte)-1,new Key(keycode)); } - public KeyBind(Controller c, Identifier id, float val) { - this.c=c; + public KeyBind(byte port, Identifier id, float val) { + this.port=port; this.id=id; this.val=val; } @@ -34,39 +34,39 @@ public class KeyBind { public boolean isKeyHeld() { if (id instanceof Key) { return ((Key)id).isKeyHeld(); - } else if (id instanceof Identifier.Button) { - return c.getComponent(id).getPollData()>0.0f; + } else if (RabiClone.CONTROLLERS.length>port && id instanceof Identifier.Button) { + return RabiClone.CONTROLLERS[port].getComponent(id).getPollData()>0.0f; } else - if (c.getComponent(id).getIdentifier()==Identifier.Axis.POV) { + if (RabiClone.CONTROLLERS.length>port && RabiClone.CONTROLLERS[port].getComponent(id).getIdentifier()==Identifier.Axis.POV) { if (val==POV.DOWN) { - return c.getComponent(id).getPollData()==POV.DOWN|| - c.getComponent(id).getPollData()==POV.DOWN_LEFT|| - c.getComponent(id).getPollData()==POV.DOWN_RIGHT; + return RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.DOWN|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.DOWN_LEFT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.DOWN_RIGHT; } else if (val==POV.UP) { - return c.getComponent(id).getPollData()==POV.UP|| - c.getComponent(id).getPollData()==POV.UP_LEFT|| - c.getComponent(id).getPollData()==POV.UP_RIGHT; + return RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.UP|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.UP_LEFT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.UP_RIGHT; } else if (val==POV.RIGHT) { - return c.getComponent(id).getPollData()==POV.RIGHT|| - c.getComponent(id).getPollData()==POV.UP_RIGHT|| - c.getComponent(id).getPollData()==POV.DOWN_RIGHT; + return RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.RIGHT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.UP_RIGHT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.DOWN_RIGHT; } else if (val==POV.LEFT) { - return c.getComponent(id).getPollData()==POV.LEFT|| - c.getComponent(id).getPollData()==POV.DOWN_LEFT|| - c.getComponent(id).getPollData()==POV.UP_LEFT; + return RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.LEFT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.DOWN_LEFT|| + RabiClone.CONTROLLERS[port].getComponent(id).getPollData()==POV.UP_LEFT; } else { System.err.println("Unexpected value for POV! Must be a cardinal direction! Given value: "+val); return false; } } else - if (id instanceof Identifier.Axis) { - return Math.abs(c.getComponent(id).getPollData())>=c.getComponent(id).getDeadZone()&&Math.signum(c.getComponent(id).getPollData())==Math.signum(val); + if (RabiClone.CONTROLLERS.length>port && id instanceof Identifier.Axis) { + return Math.abs(RabiClone.CONTROLLERS[port].getComponent(id).getPollData())>=RabiClone.CONTROLLERS[port].getComponent(id).getDeadZone()&&Math.signum(RabiClone.CONTROLLERS[port].getComponent(id).getPollData())==Math.signum(val); } else { - System.out.println("Could not find proper recognition for component "+id.getName()); + //System.out.println("Could not find proper recognition for component "+id.getName()); return false; } } @@ -125,8 +125,8 @@ public class KeyBind { } public String getName() { - if (c!=null) { - return c.getComponent(id).getName(); + if (RabiClone.CONTROLLERS.length>port&&port!=-1) { + return RabiClone.CONTROLLERS[port].getComponent(id).getName(); } else if (id instanceof Key) { return ((Key)id).getName(); diff --git a/src/sig/objects/ConfigureControls.java b/src/sig/objects/ConfigureControls.java index 9b09d7a..e143bd8 100644 --- a/src/sig/objects/ConfigureControls.java +++ b/src/sig/objects/ConfigureControls.java @@ -4,6 +4,7 @@ import java.awt.event.MouseEvent; import java.util.List; import net.java.games.input.Component; +import net.java.games.input.Controller; import net.java.games.input.Event; import net.java.games.input.Component.Identifier; import net.java.games.input.Component.POV; @@ -49,7 +50,7 @@ public class ConfigureControls extends Object{ continue; //Can't add ordinal directions, only cardinal. } } - clist.add(new KeyBind(RabiClone.CONTROLLERS[i],id,e.getValue())); + clist.add(new KeyBind((byte)i,id,e.getValue())); KeyBind.KEYBINDS.put(selectedAction,clist); assigningKey=false; }