mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 05:55:31 +00:00
Added SDL_JoystickGetAxisInitialState() to get a joystick axis' initial value.
This is useful for controller mapping programs to determine an axis' zero state
This commit is contained in:
parent
99e10ef506
commit
4938c5054e
|
@ -244,6 +244,18 @@ extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
|
||||||
extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
|
extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
|
||||||
int axis);
|
int axis);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the initial state of an axis control on a joystick.
|
||||||
|
*
|
||||||
|
* The state is a value ranging from -32768 to 32767.
|
||||||
|
*
|
||||||
|
* The axis indices start at index 0.
|
||||||
|
*
|
||||||
|
* \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not.
|
||||||
|
*/
|
||||||
|
extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick,
|
||||||
|
int axis, Sint16 *state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \name Hat positions
|
* \name Hat positions
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -624,3 +624,4 @@
|
||||||
#define SDL_HasNEON SDL_HasNEON_REAL
|
#define SDL_HasNEON SDL_HasNEON_REAL
|
||||||
#define SDL_GameControllerNumMappings SDL_GameControllerNumMappings_REAL
|
#define SDL_GameControllerNumMappings SDL_GameControllerNumMappings_REAL
|
||||||
#define SDL_GameControllerMappingForIndex SDL_GameControllerMappingForIndex_REAL
|
#define SDL_GameControllerMappingForIndex SDL_GameControllerMappingForIndex_REAL
|
||||||
|
#define SDL_JoystickGetAxisInitialState SDL_JoystickGetAxisInitialState_REAL
|
||||||
|
|
|
@ -656,3 +656,4 @@ SDL_DYNAPI_PROC(Uint16,SDL_GameControllerGetProductVersion,(SDL_GameController *
|
||||||
SDL_DYNAPI_PROC(SDL_bool,SDL_HasNEON,(void),(),return)
|
SDL_DYNAPI_PROC(SDL_bool,SDL_HasNEON,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(int,SDL_GameControllerNumMappings,(void),(),return)
|
SDL_DYNAPI_PROC(int,SDL_GameControllerNumMappings,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForIndex,(int a),(a),return)
|
SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForIndex,(int a),(a),return)
|
||||||
|
SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickGetAxisInitialState,(SDL_Joystick *a, int b, Sint16 *c),(a,b,c),return)
|
||||||
|
|
|
@ -334,6 +334,25 @@ SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis)
|
||||||
return (state);
|
return (state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the initial state of an axis control on a joystick
|
||||||
|
*/
|
||||||
|
SDL_bool
|
||||||
|
SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick, int axis, Sint16 *state)
|
||||||
|
{
|
||||||
|
if (!SDL_PrivateJoystickValid(joystick)) {
|
||||||
|
return SDL_FALSE;
|
||||||
|
}
|
||||||
|
if (axis >= joystick->naxes) {
|
||||||
|
SDL_SetError("Joystick only has %d axes", joystick->naxes);
|
||||||
|
return SDL_FALSE;
|
||||||
|
}
|
||||||
|
if (state) {
|
||||||
|
*state = joystick->axes[axis].initial_value;
|
||||||
|
}
|
||||||
|
return joystick->axes[axis].has_initial_value;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the current state of a hat on a joystick
|
* Get the current state of a hat on a joystick
|
||||||
*/
|
*/
|
||||||
|
@ -646,6 +665,7 @@ SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!joystick->axes[axis].has_initial_value) {
|
if (!joystick->axes[axis].has_initial_value) {
|
||||||
|
joystick->axes[axis].initial_value = value;
|
||||||
joystick->axes[axis].value = value;
|
joystick->axes[axis].value = value;
|
||||||
joystick->axes[axis].zero = value;
|
joystick->axes[axis].zero = value;
|
||||||
joystick->axes[axis].has_initial_value = SDL_TRUE;
|
joystick->axes[axis].has_initial_value = SDL_TRUE;
|
||||||
|
@ -654,10 +674,9 @@ SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!joystick->axes[axis].sent_initial_value) {
|
if (!joystick->axes[axis].sent_initial_value) {
|
||||||
int initial_value = joystick->axes[axis].value;
|
|
||||||
joystick->axes[axis].sent_initial_value = SDL_TRUE;
|
joystick->axes[axis].sent_initial_value = SDL_TRUE;
|
||||||
joystick->axes[axis].value = value; /* Just so we pass the check above */
|
joystick->axes[axis].value = value; /* Just so we pass the check above */
|
||||||
SDL_PrivateJoystickAxis(joystick, axis, initial_value);
|
SDL_PrivateJoystickAxis(joystick, axis, joystick->axes[axis].initial_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We ignore events if we don't have keyboard focus, except for centering
|
/* We ignore events if we don't have keyboard focus, except for centering
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
/* The SDL joystick structure */
|
/* The SDL joystick structure */
|
||||||
typedef struct _SDL_JoystickAxisInfo
|
typedef struct _SDL_JoystickAxisInfo
|
||||||
{
|
{
|
||||||
Sint16 value; /* Current axis states */
|
Sint16 initial_value; /* Initial axis state */
|
||||||
|
Sint16 value; /* Current axis state */
|
||||||
Sint16 zero; /* Zero point on the axis (-32768 for triggers) */
|
Sint16 zero; /* Zero point on the axis (-32768 for triggers) */
|
||||||
SDL_bool has_initial_value; /* Whether we've seen a value on the axis yet */
|
SDL_bool has_initial_value; /* Whether we've seen a value on the axis yet */
|
||||||
SDL_bool sent_initial_value; /* Whether we've sent the initial axis value */
|
SDL_bool sent_initial_value; /* Whether we've sent the initial axis value */
|
||||||
|
|
|
@ -337,6 +337,7 @@ WatchJoystick(SDL_Joystick * joystick)
|
||||||
Uint8 alpha=200, alpha_step = -1;
|
Uint8 alpha=200, alpha_step = -1;
|
||||||
Uint32 alpha_ticks = 0;
|
Uint32 alpha_ticks = 0;
|
||||||
SDL_JoystickID nJoystickID;
|
SDL_JoystickID nJoystickID;
|
||||||
|
int iIndex;
|
||||||
|
|
||||||
/* Create a window to display joystick axis position */
|
/* Create a window to display joystick axis position */
|
||||||
window = SDL_CreateWindow("Game Controller Map", SDL_WINDOWPOS_CENTERED,
|
window = SDL_CreateWindow("Game Controller Map", SDL_WINDOWPOS_CENTERED,
|
||||||
|
@ -383,6 +384,13 @@ WatchJoystick(SDL_Joystick * joystick)
|
||||||
|
|
||||||
s_nNumAxes = SDL_JoystickNumAxes(joystick);
|
s_nNumAxes = SDL_JoystickNumAxes(joystick);
|
||||||
s_arrAxisState = SDL_calloc(s_nNumAxes, sizeof(*s_arrAxisState));
|
s_arrAxisState = SDL_calloc(s_nNumAxes, sizeof(*s_arrAxisState));
|
||||||
|
for (iIndex = 0; iIndex < s_nNumAxes; ++iIndex) {
|
||||||
|
AxisState *pAxisState = &s_arrAxisState[iIndex];
|
||||||
|
Sint16 nInitialValue;
|
||||||
|
pAxisState->m_bMoving = SDL_JoystickGetAxisInitialState(joystick, iIndex, &nInitialValue);
|
||||||
|
pAxisState->m_nStartingValue = nInitialValue;
|
||||||
|
pAxisState->m_nFarthestValue = nInitialValue;
|
||||||
|
}
|
||||||
|
|
||||||
/* Loop, getting joystick events! */
|
/* Loop, getting joystick events! */
|
||||||
while (!done && !s_bBindingComplete) {
|
while (!done && !s_bBindingComplete) {
|
||||||
|
|
Loading…
Reference in a new issue