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

Add Joystick:getGamepadType.

Browse Source 
Return value is "unknown", "xbox360", "xboxone", "ps3", "ps4", "ps5", "switchpro", or "virtual".
This commit is contained in:
Alex Szpakowski
2021-02-14 14:40:45 -04:00
parent 994cec9ee8
commit 1e27b1d6ed
5 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/Joystick.cpp
+45 -76
View File
@@ -42,47 +42,7 @@ float Joystick::clampval(float x)
return x; return x;
} }
bool Joystick::getConstant(const char *in, Joystick::Hat &out) STRINGMAP_CLASS_BEGIN(Joystick, Joystick::Hat, Joystick::HAT_MAX_ENUM, hat)
{
return hats.find(in, out);
}
bool Joystick::getConstant(Joystick::Hat in, const char *&out)
{
return hats.find(in, out);
}
bool Joystick::getConstant(const char *in, Joystick::GamepadAxis &out)
{
return gpAxes.find(in, out);
}
bool Joystick::getConstant(Joystick::GamepadAxis in, const char *&out)
{
return gpAxes.find(in, out);
}
bool Joystick::getConstant(const char *in, Joystick::GamepadButton &out)
{
return gpButtons.find(in, out);
}
bool Joystick::getConstant(Joystick::GamepadButton in, const char *&out)
{
return gpButtons.find(in, out);
}
bool Joystick::getConstant(const char *in, Joystick::InputType &out)
{
return inputTypes.find(in, out);
}
bool Joystick::getConstant(Joystick::InputType in, const char *&out)
{
return inputTypes.find(in, out);
}
StringMap<Joystick::Hat, Joystick::HAT_MAX_ENUM>::Entry Joystick::hatEntries[] =
{ {
{ "c", Joystick::HAT_CENTERED }, { "c", Joystick::HAT_CENTERED },
{ "u", Joystick::HAT_UP }, { "u", Joystick::HAT_UP },
@@ -93,51 +53,60 @@ StringMap<Joystick::Hat, Joystick::HAT_MAX_ENUM>::Entry Joystick::hatEntries[] =
{ "rd", Joystick::HAT_RIGHTDOWN }, { "rd", Joystick::HAT_RIGHTDOWN },
{ "lu", Joystick::HAT_LEFTUP }, { "lu", Joystick::HAT_LEFTUP },
{ "ld", Joystick::HAT_LEFTDOWN }, { "ld", Joystick::HAT_LEFTDOWN },
}; }
STRINGMAP_CLASS_END(Joystick, Joystick::Hat, Joystick::HAT_MAX_ENUM, hat)
StringMap<Joystick::Hat, Joystick::HAT_MAX_ENUM> Joystick::hats(Joystick::hatEntries, sizeof(Joystick::hatEntries)); STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType)
StringMap<Joystick::GamepadAxis, Joystick::GAMEPAD_AXIS_MAX_ENUM>::Entry Joystick::gpAxisEntries[] =
{ {
{"leftx", GAMEPAD_AXIS_LEFTX}, { "unknown", Joystick::GAMEPAD_TYPE_UNKNOWN },
{"lefty", GAMEPAD_AXIS_LEFTY}, { "xbox360", Joystick::GAMEPAD_TYPE_XBOX360 },
{"rightx", GAMEPAD_AXIS_RIGHTX}, { "xboxone", Joystick::GAMEPAD_TYPE_XBOXONE },
{"righty", GAMEPAD_AXIS_RIGHTY}, { "ps3", Joystick::GAMEPAD_TYPE_PS3 },
{"triggerleft", GAMEPAD_AXIS_TRIGGERLEFT}, { "ps4", Joystick::GAMEPAD_TYPE_PS4 },
{"triggerright", GAMEPAD_AXIS_TRIGGERRIGHT}, { "ps5", Joystick::GAMEPAD_TYPE_PS5 },
}; { "switchpro", Joystick::GAMEPAD_TYPE_NINTENDO_SWITCH_PRO },
{ "virtual", Joystick::GAMEPAD_TYPE_VIRTUAL },
}
STRINGMAP_CLASS_END(Joystick, Joystick::GamepadType, Joystick::GAMEPAD_TYPE_MAX_ENUM, gamepadType)
StringMap<Joystick::GamepadAxis, Joystick::GAMEPAD_AXIS_MAX_ENUM> Joystick::gpAxes(Joystick::gpAxisEntries, sizeof(Joystick::gpAxisEntries)); STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadAxis, Joystick::GAMEPAD_AXIS_MAX_ENUM, gpAxis)
StringMap<Joystick::GamepadButton, Joystick::GAMEPAD_BUTTON_MAX_ENUM>::Entry Joystick::gpButtonEntries[] =
{ {
{"a", GAMEPAD_BUTTON_A}, { "leftx", Joystick::GAMEPAD_AXIS_LEFTX },
{"b", GAMEPAD_BUTTON_B}, { "lefty", Joystick::GAMEPAD_AXIS_LEFTY },
{"x", GAMEPAD_BUTTON_X}, { "rightx", Joystick::GAMEPAD_AXIS_RIGHTX },
{"y", GAMEPAD_BUTTON_Y}, { "righty", Joystick::GAMEPAD_AXIS_RIGHTY },
{"back", GAMEPAD_BUTTON_BACK}, { "triggerleft", Joystick::GAMEPAD_AXIS_TRIGGERLEFT },
{"guide", GAMEPAD_BUTTON_GUIDE}, { "triggerright", Joystick::GAMEPAD_AXIS_TRIGGERRIGHT },
{"start", GAMEPAD_BUTTON_START}, }
{"leftstick", GAMEPAD_BUTTON_LEFTSTICK}, STRINGMAP_CLASS_END(Joystick, Joystick::GamepadAxis, Joystick::GAMEPAD_AXIS_MAX_ENUM, gpAxis)
{"rightstick", GAMEPAD_BUTTON_RIGHTSTICK},
{"leftshoulder", GAMEPAD_BUTTON_LEFTSHOULDER},
{"rightshoulder", GAMEPAD_BUTTON_RIGHTSHOULDER},
{"dpup", GAMEPAD_BUTTON_DPAD_UP},
{"dpdown", GAMEPAD_BUTTON_DPAD_DOWN},
{"dpleft", GAMEPAD_BUTTON_DPAD_LEFT},
{"dpright", GAMEPAD_BUTTON_DPAD_RIGHT},
};
StringMap<Joystick::GamepadButton, Joystick::GAMEPAD_BUTTON_MAX_ENUM> Joystick::gpButtons(Joystick::gpButtonEntries, sizeof(Joystick::gpButtonEntries)); STRINGMAP_CLASS_BEGIN(Joystick, Joystick::GamepadButton, Joystick::GAMEPAD_BUTTON_MAX_ENUM, gpButton)
{
{ "a", Joystick::GAMEPAD_BUTTON_A },
{ "b", Joystick::GAMEPAD_BUTTON_B },
{ "x", Joystick::GAMEPAD_BUTTON_X },
{ "y", Joystick::GAMEPAD_BUTTON_Y },
{ "back", Joystick::GAMEPAD_BUTTON_BACK },
{ "guide", Joystick::GAMEPAD_BUTTON_GUIDE },
{ "start", Joystick::GAMEPAD_BUTTON_START },
{ "leftstick", Joystick::GAMEPAD_BUTTON_LEFTSTICK },
{ "rightstick", Joystick::GAMEPAD_BUTTON_RIGHTSTICK },
{ "leftshoulder", Joystick::GAMEPAD_BUTTON_LEFTSHOULDER },
{ "rightshoulder", Joystick::GAMEPAD_BUTTON_RIGHTSHOULDER },
{ "dpup", Joystick::GAMEPAD_BUTTON_DPAD_UP },
{ "dpdown", Joystick::GAMEPAD_BUTTON_DPAD_DOWN },
{ "dpleft", Joystick::GAMEPAD_BUTTON_DPAD_LEFT },
{ "dpright", Joystick::GAMEPAD_BUTTON_DPAD_RIGHT },
}
STRINGMAP_CLASS_END(Joystick, Joystick::GamepadButton, Joystick::GAMEPAD_BUTTON_MAX_ENUM, gpButton)
StringMap<Joystick::InputType, Joystick::INPUT_TYPE_MAX_ENUM>::Entry Joystick::inputTypeEntries[] = STRINGMAP_CLASS_BEGIN(Joystick, Joystick::InputType, Joystick::INPUT_TYPE_MAX_ENUM, inputType)
{ {
{ "axis", Joystick::INPUT_TYPE_AXIS }, { "axis", Joystick::INPUT_TYPE_AXIS },
{ "button", Joystick::INPUT_TYPE_BUTTON }, { "button", Joystick::INPUT_TYPE_BUTTON },
{ "hat", Joystick::INPUT_TYPE_HAT }, { "hat", Joystick::INPUT_TYPE_HAT },
}; }
STRINGMAP_CLASS_END(Joystick, Joystick::InputType, Joystick::INPUT_TYPE_MAX_ENUM, inputType)
StringMap<Joystick::InputType, Joystick::INPUT_TYPE_MAX_ENUM> Joystick::inputTypes(Joystick::inputTypeEntries, sizeof(Joystick::inputTypeEntries));
} // joystick } // joystick
} // love } // love
src/modules/joystick/Joystick.h
+20 -25
View File
@@ -56,6 +56,19 @@ public:
HAT_MAX_ENUM = 16 HAT_MAX_ENUM = 16
}; };
enum GamepadType
{
GAMEPAD_TYPE_UNKNOWN,
GAMEPAD_TYPE_XBOX360,
GAMEPAD_TYPE_XBOXONE,
GAMEPAD_TYPE_PS3,
GAMEPAD_TYPE_PS4,
GAMEPAD_TYPE_PS5,
GAMEPAD_TYPE_NINTENDO_SWITCH_PRO,
GAMEPAD_TYPE_VIRTUAL,
GAMEPAD_TYPE_MAX_ENUM
};
// Valid Gamepad axes. // Valid Gamepad axes.
enum GamepadAxis enum GamepadAxis
{ {
@@ -149,6 +162,8 @@ public:
virtual bool openGamepad(int deviceindex) = 0; virtual bool openGamepad(int deviceindex) = 0;
virtual bool isGamepad() const = 0; virtual bool isGamepad() const = 0;
virtual GamepadType getGamepadType() const = 0;
virtual float getGamepadAxis(GamepadAxis axis) const = 0; virtual float getGamepadAxis(GamepadAxis axis) const = 0;
virtual bool isGamepadDown(const std::vector<GamepadButton> &blist) const = 0; virtual bool isGamepadDown(const std::vector<GamepadButton> &blist) const = 0;
@@ -168,34 +183,14 @@ public:
virtual bool setVibration() = 0; virtual bool setVibration() = 0;
virtual void getVibration(float &left, float &right) = 0; virtual void getVibration(float &left, float &right) = 0;
static bool getConstant(const char *in, Hat &out); STRINGMAP_CLASS_DECLARE(Hat);
static bool getConstant(Hat in, const char *&out); STRINGMAP_CLASS_DECLARE(GamepadType);
STRINGMAP_CLASS_DECLARE(GamepadAxis);
static bool getConstant(const char *in, GamepadAxis &out); STRINGMAP_CLASS_DECLARE(GamepadButton);
static bool getConstant(GamepadAxis in, const char *&out); STRINGMAP_CLASS_DECLARE(InputType);
static bool getConstant(const char *in, GamepadButton &out);
static bool getConstant(GamepadButton in, const char *&out);
static bool getConstant(const char *in, InputType &out);
static bool getConstant(InputType in, const char *&out);
static float clampval(float x); static float clampval(float x);
private:
static StringMap<Hat, HAT_MAX_ENUM>::Entry hatEntries[];
static StringMap<Hat, HAT_MAX_ENUM> hats;
static StringMap<GamepadAxis, GAMEPAD_AXIS_MAX_ENUM>::Entry gpAxisEntries[];
static StringMap<GamepadAxis, GAMEPAD_AXIS_MAX_ENUM> gpAxes;
static StringMap<GamepadButton, GAMEPAD_BUTTON_MAX_ENUM>::Entry gpButtonEntries[];
static StringMap<GamepadButton, GAMEPAD_BUTTON_MAX_ENUM> gpButtons;
static StringMap<InputType, INPUT_TYPE_MAX_ENUM>::Entry inputTypeEntries[];
static StringMap<InputType, INPUT_TYPE_MAX_ENUM> inputTypes;
}; // Joystick }; // Joystick
} // joystick } // joystick
src/modules/joystick/sdl/Joystick.cpp
+24
View File
@@ -215,6 +215,30 @@ bool Joystick::isGamepad() const
return controller != nullptr; return controller != nullptr;
} }
Joystick::GamepadType Joystick::getGamepadType() const
{
if (controller == nullptr)
return GAMEPAD_TYPE_UNKNOWN;
#if SDL_VERSION_ATLEAST(2, 0, 12)
switch (SDL_GameControllerGetType(controller))
{
case SDL_CONTROLLER_TYPE_UNKNOWN: return GAMEPAD_TYPE_UNKNOWN;
case SDL_CONTROLLER_TYPE_XBOX360: return GAMEPAD_TYPE_XBOX360;
case SDL_CONTROLLER_TYPE_XBOXONE: return GAMEPAD_TYPE_XBOXONE;
case SDL_CONTROLLER_TYPE_PS3: return GAMEPAD_TYPE_PS3;
case SDL_CONTROLLER_TYPE_PS4: return GAMEPAD_TYPE_PS4;
case SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO: return GAMEPAD_TYPE_NINTENDO_SWITCH_PRO;
#if SDL_VERSION_ATLEAST(2, 0, 14)
case SDL_CONTROLLER_TYPE_VIRTUAL: return GAMEPAD_TYPE_VIRTUAL;
case SDL_CONTROLLER_TYPE_PS5: return GAMEPAD_TYPE_PS5;
#endif
}
#endif
return GAMEPAD_TYPE_UNKNOWN;
}
float Joystick::getGamepadAxis(love::joystick::Joystick::GamepadAxis axis) const float Joystick::getGamepadAxis(love::joystick::Joystick::GamepadAxis axis) const
{ {
if (!isConnected() || !isGamepad()) if (!isConnected() || !isGamepad())
src/modules/joystick/sdl/Joystick.h
+2
View File
@@ -64,6 +64,8 @@ public:
bool openGamepad(int deviceindex) override; bool openGamepad(int deviceindex) override;
bool isGamepad() const override; bool isGamepad() const override;
GamepadType getGamepadType() const override;
float getGamepadAxis(GamepadAxis axis) const override; float getGamepadAxis(GamepadAxis axis) const override;
bool isGamepadDown(const std::vector<GamepadButton> &blist) const override; bool isGamepadDown(const std::vector<GamepadButton> &blist) const override;
src/modules/joystick/wrap_Joystick.cpp
+10
View File
@@ -178,6 +178,15 @@ int w_Joystick_isGamepad(lua_State *L)
return 1; return 1;
} }
int w_Joystick_getGamepadType(lua_State *L)
{
Joystick *j = luax_checkjoystick(L, 1);
const char *str = "unknown";
Joystick::getConstant(j->getGamepadType(), str);
lua_pushstring(L, str);
return 1;
}
int w_Joystick_getGamepadAxis(lua_State *L) int w_Joystick_getGamepadAxis(lua_State *L)
{ {
Joystick *j = luax_checkjoystick(L, 1); Joystick *j = luax_checkjoystick(L, 1);
@@ -359,6 +368,7 @@ static const luaL_Reg w_Joystick_functions[] =
{ "isDown", w_Joystick_isDown }, { "isDown", w_Joystick_isDown },
{ "isGamepad", w_Joystick_isGamepad }, { "isGamepad", w_Joystick_isGamepad },
{ "getGamepadType", w_Joystick_getGamepadType },
{ "getGamepadAxis", w_Joystick_getGamepadAxis }, { "getGamepadAxis", w_Joystick_getGamepadAxis },
{ "isGamepadDown", w_Joystick_isGamepadDown }, { "isGamepadDown", w_Joystick_isGamepadDown },
{ "getGamepadMapping", w_Joystick_getGamepadMapping }, { "getGamepadMapping", w_Joystick_getGamepadMapping },