konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.2.0: added custom button names for playstation controllers

Browse Source
This commit is contained in:
Evan Debenham
2022-02-18 15:43:35 -05:00
parent e688979dac
commit 0d3d8d9c34
3 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java
View File

@@ -29,10 +29,29 @@ import com.badlogic.gdx.controllers.ControllerMapping;
import com.watabou.utils.DeviceCompat; import com.watabou.utils.DeviceCompat;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
import java.lang.annotation.Target;
public class ControllerHandler implements ControllerListener { public class ControllerHandler implements ControllerListener {
public static enum ControllerType {
XBOX,
PLAYSTATION,
NINTENDO,
OTHER
}
public static ControllerType lastUsedType = ControllerType.OTHER;
private static void setControllerType(Controller controller){
if (controller.getName().contains("Xbox")){
lastUsedType = ControllerType.XBOX;
} else if (controller.getName().contains("PS")){
lastUsedType = ControllerType.PLAYSTATION;
} else if (controller.getName().contains("Nintendo")){
lastUsedType = ControllerType.NINTENDO;
} else {
lastUsedType = ControllerType.OTHER;
}
}
public static boolean controllersSupported() { public static boolean controllersSupported() {
if (DeviceCompat.isAndroid() && Gdx.app.getVersion() < 16) { if (DeviceCompat.isAndroid() && Gdx.app.getVersion() < 16) {
return false; return false;
@@ -43,7 +62,7 @@ public class ControllerHandler implements ControllerListener {
@Override @Override
public void connected(Controller controller) { public void connected(Controller controller) {
setControllerType(controller);
} }
@Override @Override
@@ -53,6 +72,7 @@ public class ControllerHandler implements ControllerListener {
@Override @Override
public boolean buttonDown(Controller controller, int buttonCode) { public boolean buttonDown(Controller controller, int buttonCode) {
setControllerType(controller);
int keyCode = buttonToKey(controller, buttonCode); int keyCode = buttonToKey(controller, buttonCode);
if (keyCode != Input.Keys.UNKNOWN){ if (keyCode != Input.Keys.UNKNOWN){
KeyEvent.addKeyEvent(new KeyEvent(keyCode, true)); KeyEvent.addKeyEvent(new KeyEvent(keyCode, true));
@@ -63,6 +83,7 @@ public class ControllerHandler implements ControllerListener {
@Override @Override
public boolean buttonUp(Controller controller, int buttonCode) { public boolean buttonUp(Controller controller, int buttonCode) {
setControllerType(controller);
int keyCode = buttonToKey(controller, buttonCode); int keyCode = buttonToKey(controller, buttonCode);
if (keyCode != Input.Keys.UNKNOWN){ if (keyCode != Input.Keys.UNKNOWN){
KeyEvent.addKeyEvent(new KeyEvent(keyCode, false)); KeyEvent.addKeyEvent(new KeyEvent(keyCode, false));
@@ -79,6 +100,7 @@ public class ControllerHandler implements ControllerListener {
@Override @Override
public boolean axisMoved(Controller controller, int axisCode, float value) { public boolean axisMoved(Controller controller, int axisCode, float value) {
setControllerType(controller);
ControllerMapping mapping = controller.getMapping(); ControllerMapping mapping = controller.getMapping();
if (mapping.axisRightX == axisCode) rightStickPosition.x = value; if (mapping.axisRightX == axisCode) rightStickPosition.x = value;
else if (mapping.axisRightY == axisCode) rightStickPosition.y = value; else if (mapping.axisRightY == axisCode) rightStickPosition.y = value;
@@ -109,29 +131,45 @@ public class ControllerHandler implements ControllerListener {
} }
//converts controller button codes to keyEvent codes //converts controller button codes to keyEvent codes
public static int buttonToKey(Controller controller, int keyCode){ public static int buttonToKey(Controller controller, int btnCode){
ControllerMapping mapping = controller.getMapping(); ControllerMapping mapping = controller.getMapping();
if (keyCode == mapping.buttonA) return Input.Keys.BUTTON_A; if (btnCode == mapping.buttonA) return Input.Keys.BUTTON_A;
if (keyCode == mapping.buttonB) return Input.Keys.BUTTON_B; if (btnCode == mapping.buttonB) return Input.Keys.BUTTON_B;
//C button? //C button?
if (keyCode == mapping.buttonX) return Input.Keys.BUTTON_X; if (btnCode == mapping.buttonX) return Input.Keys.BUTTON_X;
if (keyCode == mapping.buttonY) return Input.Keys.BUTTON_Y; if (btnCode == mapping.buttonY) return Input.Keys.BUTTON_Y;
if (keyCode == mapping.buttonBack) return Input.Keys.BUTTON_SELECT; if (btnCode == mapping.buttonBack) return Input.Keys.BUTTON_SELECT;
if (keyCode == mapping.buttonStart) return Input.Keys.BUTTON_START; if (btnCode == mapping.buttonStart) return Input.Keys.BUTTON_START;
if (keyCode == mapping.buttonL1) return Input.Keys.BUTTON_L1; if (btnCode == mapping.buttonL1) return Input.Keys.BUTTON_L1;
if (keyCode == mapping.buttonL2) return Input.Keys.BUTTON_L2; if (btnCode == mapping.buttonL2) return Input.Keys.BUTTON_L2;
if (keyCode == mapping.buttonR1) return Input.Keys.BUTTON_R1; if (btnCode == mapping.buttonR1) return Input.Keys.BUTTON_R1;
if (keyCode == mapping.buttonR2) return Input.Keys.BUTTON_R2; if (btnCode == mapping.buttonR2) return Input.Keys.BUTTON_R2;
if (keyCode == mapping.buttonDpadUp) return Input.Keys.DPAD_UP; if (btnCode == mapping.buttonDpadUp) return Input.Keys.DPAD_UP;
if (keyCode == mapping.buttonDpadLeft) return Input.Keys.DPAD_LEFT; if (btnCode == mapping.buttonDpadLeft) return Input.Keys.DPAD_LEFT;
if (keyCode == mapping.buttonDpadDown) return Input.Keys.DPAD_DOWN; if (btnCode == mapping.buttonDpadDown) return Input.Keys.DPAD_DOWN;
if (keyCode == mapping.buttonDpadRight) return Input.Keys.DPAD_RIGHT; if (btnCode == mapping.buttonDpadRight) return Input.Keys.DPAD_RIGHT;
if (keyCode == mapping.buttonLeftStick) return Input.Keys.BUTTON_THUMBL; if (btnCode == mapping.buttonLeftStick) return Input.Keys.BUTTON_THUMBL;
if (keyCode == mapping.buttonRightStick) return Input.Keys.BUTTON_THUMBR; if (btnCode == mapping.buttonRightStick)return Input.Keys.BUTTON_THUMBR;
return Input.Keys.UNKNOWN; return Input.Keys.UNKNOWN;
} }
public static String customButtonName(int keyCode){
if (lastUsedType == ControllerType.PLAYSTATION){
if (keyCode == Input.Keys.BUTTON_A){
return "Circle Button";
} else if (keyCode == Input.Keys.BUTTON_B){
return "Cross Button";
} else if (keyCode == Input.Keys.BUTTON_X){
return "Square Button";
} else if (keyCode == Input.Keys.BUTTON_Y){
return "Triangle Button";
}
}
return null;
}
} }

4
SPD-classes/src/main/java/com/watabou/input/KeyBindings.java
View File

@@ -76,6 +76,10 @@ public class KeyBindings {
} }
public static String getKeyName( int keyCode ){ public static String getKeyName( int keyCode ){
if (ControllerHandler.customButtonName(keyCode) != null){
return ControllerHandler.customButtonName(keyCode);
}
if (keyCode == Input.Keys.UNKNOWN){ if (keyCode == Input.Keys.UNKNOWN){
return "None"; return "None";
} else if (keyCode == Input.Keys.PLUS){ } else if (keyCode == Input.Keys.PLUS){

5
SPD-classes/src/main/java/com/watabou/input/PointerEvent.java
View File

@@ -22,6 +22,7 @@
package com.watabou.input; package com.watabou.input;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.watabou.noosa.Game;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
import com.watabou.utils.Signal; import com.watabou.utils.Signal;
@@ -106,6 +107,10 @@ public class PointerEvent {
private static PointF lastHoverPos = new PointF(); private static PointF lastHoverPos = new PointF();
public static PointF currentHoverPos(){ public static PointF currentHoverPos(){
if (lastHoverPos.x == 0 && lastHoverPos.y == 0){
lastHoverPos.x = Game.width/2;
lastHoverPos.y = Game.height/2;
}
return lastHoverPos.clone(); return lastHoverPos.clone();
} }