Skip to content

Commit

Permalink
FlxGamepadInputID: Add ACCEPT/CANCEL buttons (#3276)
Browse files Browse the repository at this point in the history 
* add ACCEPT/CANCEL

* fix non-switch controllers
  • Loading branch information
@Geokureli
Geokureli authored Oct 30, 2024
1 parent f5087ea commit 65bd4b8
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 29 deletions.
16 changes: 14 additions & 2 deletions flixel/input/gamepad/FlxGamepadInputID.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ enum abstract FlxGamepadInputID(Int) from Int to Int
/**right digital "bumper"*/
var RIGHT_SHOULDER = 5;

/**also known as "select", the leftmost center button*/
/**also known as "select", the left-most center button*/
var BACK = 6;

/**the rightmost center button*/
Expand Down Expand Up @@ -127,7 +127,19 @@ enum abstract FlxGamepadInputID(Int) from Int to Int

/**left analog stick as a dpad, pushed left**/
var RIGHT_STICK_DIGITAL_LEFT = 41;


/**
* Mapped to The bottom face button on most controllers, and the
* right face button on Nintendo Switch controllers
**/
var ACCEPT = 42;

/**
* Mapped to The bottom face button on most controllers, and the
* right face button on Nintendo Switch controllers
**/
var CANCEL = 43;

@:from
public static inline function fromString(s:String)
{
Expand Down
23 changes: 23 additions & 0 deletions flixel/input/gamepad/lists/FlxGamepadButtonList.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ class FlxGamepadButtonList extends FlxBaseGamepadList
inline function get_RIGHT_SHOULDER()
return check(FlxGamepadInputID.RIGHT_SHOULDER);

/**
* Also known as "select", the left-most center button.
* Not to be confused with `CANCEL`, which is a face button (usually B)
*/
public var BACK(get, never):Bool;

inline function get_BACK()
Expand Down Expand Up @@ -210,6 +214,25 @@ class FlxGamepadButtonList extends FlxBaseGamepadList

inline function get_RIGHT_STICK_DIGITAL_LEFT()
return check(FlxGamepadInputID.RIGHT_STICK_DIGITAL_LEFT);

/**
* Mapped to The bottom face button on most controllers, and the
* right face button on Nintendo Switch controllers
**/
public var ACCEPT(get, never):Bool;

inline function get_ACCEPT()
return check(FlxGamepadInputID.ACCEPT);

/**
* Mapped to The right face button on most controllers, and the
* bottom face button on Nintendo Switch controllers.
* Not to be confused with `BACK` which is the XInput "select" button
**/
public var CANCEL(get, never):Bool;

inline function get_CANCEL()
return check(FlxGamepadInputID.CANCEL);

public function new(status:FlxInputState, gamepad:FlxGamepad)
{
Expand Down
9 changes: 8 additions & 1 deletion flixel/input/gamepad/mappings/FlxGamepadMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ class FlxGamepadMapping
*/
public function getRawID(ID:FlxGamepadInputID):Int
{
return -1;
return switch ID
{
case ACCEPT: getRawID(A);
case CANCEL: getRawID(B);
default: -1;
}
}

/**
Expand Down Expand Up @@ -139,6 +144,8 @@ class FlxGamepadMapping
case RIGHT_STICK_DIGITAL_DOWN: "rs-down";
case RIGHT_STICK_DIGITAL_LEFT: "rs-left";
case RIGHT_STICK_DIGITAL_RIGHT: "rs-right";
case ACCEPT: getInputLabel(cast getRawID(id));
case CANCEL: getInputLabel(cast getRawID(id));
#if FLX_JOYSTICK_API
case LEFT_TRIGGER_FAKE: "l2";
case RIGHT_TRIGGER_FAKE: "r2";
Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/LogitechMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class LogitechMapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: LogitechID.SEVEN;
case RIGHT_TRIGGER_FAKE: LogitechID.EIGHT;
#end
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/MFiMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class MFiMapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: MFiID.LEFT_TRIGGER;
case RIGHT_TRIGGER_FAKE: MFiID.RIGHT_TRIGGER;
#end
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
15 changes: 7 additions & 8 deletions flixel/input/gamepad/mappings/MayflashWiiRemoteMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,11 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping
case MayflashWiiRemoteID.NUNCHUK_DPAD_DOWN: DPAD_DOWN;
case MayflashWiiRemoteID.NUNCHUK_DPAD_LEFT: DPAD_LEFT;
case MayflashWiiRemoteID.NUNCHUK_DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawRight): LEFT_STICK_DIGITAL_RIGHT;
default: NONE;
}
}

Expand Down Expand Up @@ -174,7 +173,7 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping
case LEFT_STICK_DIGITAL_DOWN: MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawDown;
case LEFT_STICK_DIGITAL_LEFT: MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawLeft;
case LEFT_STICK_DIGITAL_RIGHT: MayflashWiiRemoteID.LEFT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand All @@ -193,7 +192,7 @@ class MayflashWiiRemoteMapping extends FlxGamepadMapping
case BACK: MayflashWiiRemoteID.REMOTE_MINUS;
case GUIDE: MayflashWiiRemoteID.REMOTE_HOME;
case START: MayflashWiiRemoteID.REMOTE_PLUS;
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/OUYAMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class OUYAMapping extends FlxGamepadMapping
case RIGHT_STICK_DIGITAL_DOWN: OUYAID.RIGHT_ANALOG_STICK.rawDown;
case RIGHT_STICK_DIGITAL_LEFT: OUYAID.RIGHT_ANALOG_STICK.rawLeft;
case RIGHT_STICK_DIGITAL_RIGHT: OUYAID.RIGHT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/PS4Mapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class PS4Mapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: LEFT_TRIGGER_FAKE;
case RIGHT_TRIGGER_FAKE: RIGHT_TRIGGER_FAKE;
#end
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/PSVitaMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class PSVitaMapping extends FlxGamepadMapping
case RIGHT_STICK_DIGITAL_DOWN: PSVitaID.RIGHT_ANALOG_STICK.rawDown;
case RIGHT_STICK_DIGITAL_LEFT: PSVitaID.RIGHT_ANALOG_STICK.rawLeft;
case RIGHT_STICK_DIGITAL_RIGHT: PSVitaID.RIGHT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
4 changes: 3 additions & 1 deletion flixel/input/gamepad/mappings/SwitchJoyconLeftMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ class SwitchJoyconLeftMapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: LEFT_TRIGGER_FAKE;
case RIGHT_TRIGGER_FAKE: RIGHT_TRIGGER_FAKE;
#end
default: -1;
case ACCEPT: SwitchJoyconLeftID.RIGHT;
case CANCEL: SwitchJoyconLeftID.DOWN;
default: super.getRawID(id);
}
}

Expand Down
4 changes: 3 additions & 1 deletion flixel/input/gamepad/mappings/SwitchJoyconRightMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ class SwitchJoyconRightMapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: LEFT_TRIGGER_FAKE;
case RIGHT_TRIGGER_FAKE: RIGHT_TRIGGER_FAKE;
#end
default: -1;
case ACCEPT: SwitchJoyconRightID.A;
case CANCEL: SwitchJoyconRightID.B;
default: super.getRawID(ID);
}
}

Expand Down
4 changes: 3 additions & 1 deletion flixel/input/gamepad/mappings/SwitchProMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ class SwitchProMapping extends FlxGamepadMapping
case LEFT_TRIGGER_FAKE: LEFT_TRIGGER_FAKE;
case RIGHT_TRIGGER_FAKE: RIGHT_TRIGGER_FAKE;
#end
default: -1;
case ACCEPT: SwitchProID.A;
case CANCEL: SwitchProID.B;
default: super.getRawID(ID);
}
}

Expand Down
17 changes: 8 additions & 9 deletions flixel/input/gamepad/mappings/WiiRemoteMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,11 @@ class WiiRemoteMapping extends FlxGamepadMapping
case WiiRemoteID.NUNCHUK_DPAD_DOWN: DPAD_DOWN;
case WiiRemoteID.NUNCHUK_DPAD_LEFT: DPAD_LEFT;
case WiiRemoteID.NUNCHUK_DPAD_RIGHT: DPAD_RIGHT;
default:
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawUp) LEFT_STICK_DIGITAL_UP;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawDown) LEFT_STICK_DIGITAL_DOWN;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawLeft) LEFT_STICK_DIGITAL_LEFT;
if (rawID == WiiRemoteID.LEFT_ANALOG_STICK.rawRight) LEFT_STICK_DIGITAL_RIGHT;
NONE;
case id if (id == WiiRemoteID.LEFT_ANALOG_STICK.rawUp): LEFT_STICK_DIGITAL_UP;
case id if (id == WiiRemoteID.LEFT_ANALOG_STICK.rawDown): LEFT_STICK_DIGITAL_DOWN;
case id if (id == WiiRemoteID.LEFT_ANALOG_STICK.rawLeft): LEFT_STICK_DIGITAL_LEFT;
case id if (id == WiiRemoteID.LEFT_ANALOG_STICK.rawRight): LEFT_STICK_DIGITAL_RIGHT;
default: super.getRawID(rawID);
}
}

Expand Down Expand Up @@ -147,7 +146,7 @@ class WiiRemoteMapping extends FlxGamepadMapping
case RIGHT_STICK_DIGITAL_DOWN: WiiRemoteID.RIGHT_ANALOG_STICK.rawDown;
case RIGHT_STICK_DIGITAL_LEFT: WiiRemoteID.RIGHT_ANALOG_STICK.rawLeft;
case RIGHT_STICK_DIGITAL_RIGHT: WiiRemoteID.RIGHT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand All @@ -174,7 +173,7 @@ class WiiRemoteMapping extends FlxGamepadMapping
case LEFT_STICK_DIGITAL_DOWN: WiiRemoteID.LEFT_ANALOG_STICK.rawDown;
case LEFT_STICK_DIGITAL_LEFT: WiiRemoteID.LEFT_ANALOG_STICK.rawLeft;
case LEFT_STICK_DIGITAL_RIGHT: WiiRemoteID.LEFT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand All @@ -195,7 +194,7 @@ class WiiRemoteMapping extends FlxGamepadMapping
case START: WiiRemoteID.REMOTE_PLUS;
case TILT_PITCH: WiiRemoteID.REMOTE_TILT_PITCH;
case TILT_ROLL: WiiRemoteID.REMOTE_TILT_ROLL;
default: -1;
default: super.getRawID(ID);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flixel/input/gamepad/mappings/XInputMapping.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class XInputMapping extends FlxGamepadMapping
case RIGHT_STICK_DIGITAL_DOWN: XInputID.RIGHT_ANALOG_STICK.rawDown;
case RIGHT_STICK_DIGITAL_LEFT: XInputID.RIGHT_ANALOG_STICK.rawLeft;
case RIGHT_STICK_DIGITAL_RIGHT: XInputID.RIGHT_ANALOG_STICK.rawRight;
default: -1;
default: super.getRawID(ID);
}
}

Expand Down

0 comments on commit 65bd4b8

Please sign in to comment.