Allow keyboard binds to be added as inputs

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
main
sigonasr2, Sig, Sigo 3 years ago
parent 135f3d07e0
commit 5ccc30b296
  1. 1
      src/sig/engine/KeyBind.java
  2. 7
      src/sig/engine/Panel.java
  3. 13
      src/sig/objects/ConfigureControls.java

@ -3,7 +3,6 @@ package sig.engine;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import net.java.games.input.Controller;
import net.java.games.input.Component.Identifier; import net.java.games.input.Component.Identifier;
import net.java.games.input.Component.POV; import net.java.games.input.Component.POV;
import sig.RabiClone; import sig.RabiClone;

@ -22,6 +22,7 @@ import java.awt.event.KeyListener;
import sig.DrawLoop; import sig.DrawLoop;
import sig.RabiClone; import sig.RabiClone;
import sig.objects.ConfigureControls;
public class Panel extends JPanel implements Runnable,KeyListener { public class Panel extends JPanel implements Runnable,KeyListener {
JFrame window; JFrame window;
@ -403,6 +404,12 @@ public class Panel extends JPanel implements Runnable,KeyListener {
if (!Key.isKeyHeld(e.getKeyCode())) { if (!Key.isKeyHeld(e.getKeyCode())) {
Key.setKeyHeld(e.getKeyCode(), true); Key.setKeyHeld(e.getKeyCode(), true);
} }
for (Object o : RabiClone.OBJ) {
if (o instanceof ConfigureControls) {
((ConfigureControls)o).rawKeyPressed(e.getKeyCode());
break;
}
}
//System.out.println("Key List: "+KEYS); //System.out.println("Key List: "+KEYS);
} }

@ -3,8 +3,6 @@ package sig.objects;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.List; 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.Event;
import net.java.games.input.Component.Identifier; import net.java.games.input.Component.Identifier;
import net.java.games.input.Component.POV; import net.java.games.input.Component.POV;
@ -46,7 +44,7 @@ public class ConfigureControls extends Object{
clist.add(new KeyBind((byte)i,id,e.getValue())); clist.add(new KeyBind((byte)i,id,e.getValue()));
KeyBind.KEYBINDS.put(selectedAction,clist); KeyBind.KEYBINDS.put(selectedAction,clist);
assigningKey=false; assigningKey=false;
} }.
//System.out.println(e.getComponent().getName()+" value: "+e.getValue()); //System.out.println(e.getComponent().getName()+" value: "+e.getValue());
} }
} }
@ -69,6 +67,15 @@ public class ConfigureControls extends Object{
} }
} }
public void rawKeyPressed(int keyCode) {
if (assigningKey) {
List<KeyBind> clist = KeyBind.KEYBINDS.get(selectedAction);
clist.add(new KeyBind(keyCode));
KeyBind.KEYBINDS.put(selectedAction,clist);
assigningKey=false;
}
}
@Override @Override
protected void MousePressed(MouseEvent e) { protected void MousePressed(MouseEvent e) {
if (e.getButton()==MouseEvent.BUTTON1) { if (e.getButton()==MouseEvent.BUTTON1) {

Loading…
Cancel
Save