LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add amazon luna and google stadia enums to Joystick:getGamepadType.

Browse Source
This commit is contained in:
Alex Szpakowski
2022-01-01 18:15:27 -04:00
parent f88eecf482
commit 59f532fdfa
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/Joystick.cpp
+10 -8
View File
@@ -58,14 +58,16 @@ STRINGMAP_CLASS_END(Joystick, Joystick::Hat, Joystick::HAT_MAX_ENUM, hat)
STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType) STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType)
{ {
{ "unknown", Joystick::GAMEPAD_TYPE_UNKNOWN }, { "unknown", Joystick::GAMEPAD_TYPE_UNKNOWN },
{ "xbox360", Joystick::GAMEPAD_TYPE_XBOX360 }, { "xbox360", Joystick::GAMEPAD_TYPE_XBOX360 },
{ "xboxone", Joystick::GAMEPAD_TYPE_XBOXONE }, { "xboxone", Joystick::GAMEPAD_TYPE_XBOXONE },
{ "ps3", Joystick::GAMEPAD_TYPE_PS3 }, { "ps3", Joystick::GAMEPAD_TYPE_PS3 },
{ "ps4", Joystick::GAMEPAD_TYPE_PS4 }, { "ps4", Joystick::GAMEPAD_TYPE_PS4 },
{ "ps5", Joystick::GAMEPAD_TYPE_PS5 }, { "ps5", Joystick::GAMEPAD_TYPE_PS5 },
{ "switchpro", Joystick::GAMEPAD_TYPE_NINTENDO_SWITCH_PRO }, { "switchpro", Joystick::GAMEPAD_TYPE_NINTENDO_SWITCH_PRO },
{ "virtual", Joystick::GAMEPAD_TYPE_VIRTUAL }, { "amazonluna", Joystick::GAMEPAD_TYPE_AMAZON_LUNA },
{ "stadia", Joystick::GAMEPAD_TYPE_STADIA },
{ "virtual", Joystick::GAMEPAD_TYPE_VIRTUAL },
} }
STRINGMAP_CLASS_END(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType) STRINGMAP_CLASS_END(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType)
src/modules/joystick/Joystick.h
+2
View File
@@ -65,6 +65,8 @@ public:
GAMEPAD_TYPE_PS4, GAMEPAD_TYPE_PS4,
GAMEPAD_TYPE_PS5, GAMEPAD_TYPE_PS5,
GAMEPAD_TYPE_NINTENDO_SWITCH_PRO, GAMEPAD_TYPE_NINTENDO_SWITCH_PRO,
GAMEPAD_TYPE_AMAZON_LUNA,
GAMEPAD_TYPE_STADIA,
GAMEPAD_TYPE_VIRTUAL, GAMEPAD_TYPE_VIRTUAL,
GAMEPAD_TYPE_MAX_ENUM GAMEPAD_TYPE_MAX_ENUM
}; };
src/modules/joystick/sdl/Joystick.cpp
+4
View File
@@ -256,6 +256,10 @@ Joystick::GamepadType Joystick::getGamepadType() const
#if SDL_VERSION_ATLEAST(2, 0, 14) #if SDL_VERSION_ATLEAST(2, 0, 14)
case SDL_CONTROLLER_TYPE_VIRTUAL: return GAMEPAD_TYPE_VIRTUAL; case SDL_CONTROLLER_TYPE_VIRTUAL: return GAMEPAD_TYPE_VIRTUAL;
case SDL_CONTROLLER_TYPE_PS5: return GAMEPAD_TYPE_PS5; case SDL_CONTROLLER_TYPE_PS5: return GAMEPAD_TYPE_PS5;
#endif
#if SDL_VERSION_ATLEAST(2, 0, 16)
case SDL_CONTROLLER_TYPE_AMAZON_LUNA: return GAMEPAD_TYPE_AMAZON_LUNA;
case SDL_CONTROLLER_TYPE_GOOGLE_STADIA: return GAMEPAD_TYPE_STADIA;
#endif #endif
} }
#endif #endif