encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore axis jitter when mapping controllers

This commit is contained in:
Sam Lantinga 2019-12-05 13:18:56 -08:00
parent 6d00166813
commit 8ce894a316
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/controllermap.c
View File

@ -143,6 +143,7 @@ static SDL_GameControllerExtendedBind s_arrBindings[BINDING_COUNT];
typedef struct typedef struct
{ {
SDL_bool m_bMoving; SDL_bool m_bMoving;
int m_nLastValue;
int m_nStartingValue; int m_nStartingValue;
int m_nFarthestValue; int m_nFarthestValue;
} AxisState; } AxisState;
@ -461,14 +462,20 @@ WatchJoystick(SDL_Joystick * joystick)
break; break;
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:
if (event.jaxis.which == nJoystickID) { if (event.jaxis.which == nJoystickID) {
const int MAX_ALLOWED_JITTER = SDL_JOYSTICK_AXIS_MAX / 80; /* ShanWan PS3 controller needed 96 */
AxisState *pAxisState = &s_arrAxisState[event.jaxis.axis]; AxisState *pAxisState = &s_arrAxisState[event.jaxis.axis];
int nValue = event.jaxis.value; int nValue = event.jaxis.value;
int nCurrentDistance, nFarthestDistance; int nCurrentDistance, nFarthestDistance;
if (!pAxisState->m_bMoving) { if (!pAxisState->m_bMoving) {
Sint16 nInitialValue; Sint16 nInitialValue;
pAxisState->m_bMoving = SDL_JoystickGetAxisInitialState(joystick, event.jaxis.axis, &nInitialValue); pAxisState->m_bMoving = SDL_JoystickGetAxisInitialState(joystick, event.jaxis.axis, &nInitialValue);
pAxisState->m_nLastValue = nInitialValue;
pAxisState->m_nStartingValue = nInitialValue; pAxisState->m_nStartingValue = nInitialValue;
pAxisState->m_nFarthestValue = nInitialValue; pAxisState->m_nFarthestValue = nInitialValue;
} else if (SDL_abs(nValue - pAxisState->m_nLastValue) <= MAX_ALLOWED_JITTER) {
break;
} else {
pAxisState->m_nLastValue = nValue;
} }
nCurrentDistance = SDL_abs(nValue - pAxisState->m_nStartingValue); nCurrentDistance = SDL_abs(nValue - pAxisState->m_nStartingValue);
nFarthestDistance = SDL_abs(pAxisState->m_nFarthestValue - pAxisState->m_nStartingValue); nFarthestDistance = SDL_abs(pAxisState->m_nFarthestValue - pAxisState->m_nStartingValue);