Skip to content

Add enums for specific controller layouts #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Add enums for specific controller layouts #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25c7cd3
Add enums for specific controller layouts
DigiDuncan Oct 3, 2024
abe38db
actually export the new things lol
DigiDuncan Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion arcade/future/input/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
# ruff: noqa: F401
# type: ignore

from .inputs import ControllerAxes, ControllerButtons, Keys, MouseAxes, MouseButtons
from .inputs import (
ControllerAxes,
ControllerButtons,
XBoxControllerButtons,
PSControllerButtons,
Keys,
MouseAxes,
MouseButtons,
)
from .manager import ActionState, InputManager
from .input_mapping import Action, ActionMapping, Axis, AxisMapping

__all__ = [
"ControllerAxes",
"ControllerButtons",
"XBoxControllerButtons",
"PSControllerButtons",
"Keys",
"MouseAxes",
"MouseButtons",
Expand Down
36 changes: 36 additions & 0 deletions arcade/future/input/inputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,42 @@ class ControllerButtons(StrEnum):
DPAD_DOWN = "dpdown"


class XBoxControllerButtons(StrEnum):
Y = ControllerButtons.TOP_FACE
B = ControllerButtons.RIGHT_FACE
X = ControllerButtons.LEFT_FACE
A = ControllerButtons.BOTTOM_FACE
LEFT_BUMPER = ControllerButtons.LEFT_SHOULDER
RIGHT_BUMPER = ControllerButtons.RIGHT_SHOULDER
START = ControllerButtons.START
SELECT = ControllerButtons.BACK
GUIDE = ControllerButtons.GUIDE
LEFT_STICK = ControllerButtons.LEFT_STICK
RIGHT_STICK = ControllerButtons.RIGHT_STICK
DPAD_LEFT = ControllerButtons.DPAD_LEFT
DPAD_RIGHT = ControllerButtons.DPAD_RIGHT
DPAD_UP = ControllerButtons.DPAD_UP
DPAD_DOWN = ControllerButtons.DPAD_DOWN


class PSControllerButtons(StrEnum):
TRIANGLE = ControllerButtons.TOP_FACE
CIRCLE = ControllerButtons.RIGHT_FACE
SQUARE = ControllerButtons.LEFT_FACE
CROSS = ControllerButtons.BOTTOM_FACE
L1 = ControllerButtons.LEFT_SHOULDER
R1 = ControllerButtons.RIGHT_SHOULDER
START = ControllerButtons.START
SELECT = ControllerButtons.BACK
GUIDE = ControllerButtons.GUIDE
LEFT_STICK = ControllerButtons.LEFT_STICK
RIGHT_STICK = ControllerButtons.RIGHT_STICK
DPAD_LEFT = ControllerButtons.DPAD_LEFT
DPAD_RIGHT = ControllerButtons.DPAD_RIGHT
DPAD_UP = ControllerButtons.DPAD_UP
DPAD_DOWN = ControllerButtons.DPAD_DOWN


class Keys(InputEnum):
# Key modifiers
# Done in powers of two, so you can do a bit-wise 'and' to detect
Expand Down
Loading