Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 07:22:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix SDL joysticks

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-10-31 13:02:17 -07:00
parent 2c4bd7e441
commit b877f832a9
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/controllers/src/controllers/StandardControls.h
View file

@ -58,15 +58,15 @@ namespace controller {
// Left Analog stick
LX = 0,
LY,
LZ,
// Right Analog stick
RX,
RY,
RZ,
// Triggers
LT,
RT,
NUM_STANDARD_AXES
NUM_STANDARD_AXES,
LZ = LT,
RZ = RT
};
// No correlation to SDL

27
libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
View file

@ -18,6 +18,33 @@
#include "SDL2Manager.h"
#ifdef HAVE_SDL2
static_assert(
controller::A == SDL_CONTROLLER_BUTTON_A &&
controller::B == SDL_CONTROLLER_BUTTON_B &&
controller::X == SDL_CONTROLLER_BUTTON_X &&
controller::Y == SDL_CONTROLLER_BUTTON_Y &&
controller::BACK == SDL_CONTROLLER_BUTTON_BACK &&
controller::GUIDE == SDL_CONTROLLER_BUTTON_GUIDE &&
controller::START == SDL_CONTROLLER_BUTTON_START &&
controller::LS == SDL_CONTROLLER_BUTTON_LEFTSTICK &&
controller::RS == SDL_CONTROLLER_BUTTON_RIGHTSTICK &&
controller::LB == SDL_CONTROLLER_BUTTON_LEFTSHOULDER &&
controller::RB == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER &&
controller::DU == SDL_CONTROLLER_BUTTON_DPAD_UP &&
controller::DD == SDL_CONTROLLER_BUTTON_DPAD_DOWN &&
controller::DL == SDL_CONTROLLER_BUTTON_DPAD_LEFT &&
controller::DR == SDL_CONTROLLER_BUTTON_DPAD_RIGHT &&
controller::LX == SDL_CONTROLLER_AXIS_LEFTX &&
controller::LY == SDL_CONTROLLER_AXIS_LEFTY &&
controller::RX == SDL_CONTROLLER_AXIS_RIGHTX &&
controller::RY == SDL_CONTROLLER_AXIS_RIGHTY &&
controller::LT == SDL_CONTROLLER_AXIS_TRIGGERLEFT &&
controller::RT == SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
"SDL2 equvalence: Enums and values from StandardControls.h are assumed to match enums from SDL_gamecontroller.h");
#endif
const QString SDL2Manager::NAME = "SDL2";
#ifdef HAVE_SDL2