ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 02:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 3DS Analog Values (#8581)

Browse source 
(cherry picked from commit 059e550e981e7b2a654b54f548c64a73f5a5fe13)
This commit is contained in:
zoeyjodon 2023-11-22 13:34:01 -05:00 committed by Sam Lantinga
parent be0e303ec8
commit 3381828cc6
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/joystick/n3ds/SDL_sysjoystick.c
View file

@ -32,18 +32,28 @@
#define NB_BUTTONS 23 #define NB_BUTTONS 23
/* /*
N3DS sticks values are roughly within +/-160 N3DS sticks values are roughly within +/-170
which is too small to pass the jitter tolerance. which is too small to pass the jitter tolerance.
This correction is applied to axis values This correction is applied to axis values
so they fit better in SDL's value range. so they fit better in SDL's value range.
*/ */
#define CORRECT_AXIS_X(X) ((X * SDL_JOYSTICK_AXIS_MAX) / 160) static inline int Correct_Axis_X(int X) {
if (X > 160) {
return SDL_JOYSTICK_AXIS_MAX;
}
else if (X < -160) {
return -SDL_JOYSTICK_AXIS_MAX;
}
return (X * SDL_JOYSTICK_AXIS_MAX) / 160;
}
/* /*
The Y axis needs to be flipped because SDL's "up" The Y axis needs to be flipped because SDL's "up"
is reversed compared to libctru's "up" is reversed compared to libctru's "up"
*/ */
#define CORRECT_AXIS_Y(Y) CORRECT_AXIS_X(-Y) static inline int Correct_Axis_Y(int Y) {
return Correct_Axis_X(-Y);
}
SDL_FORCE_INLINE void UpdateN3DSPressedButtons(SDL_Joystick *joystick); SDL_FORCE_INLINE void UpdateN3DSPressedButtons(SDL_Joystick *joystick);
SDL_FORCE_INLINE void UpdateN3DSReleasedButtons(SDL_Joystick *joystick); SDL_FORCE_INLINE void UpdateN3DSReleasedButtons(SDL_Joystick *joystick);
@ -143,12 +153,12 @@ UpdateN3DSCircle(SDL_Joystick *joystick)
if (previous_state.dx != current_state.dx) { if (previous_state.dx != current_state.dx) {
SDL_PrivateJoystickAxis(joystick, SDL_PrivateJoystickAxis(joystick,
0, 0,
CORRECT_AXIS_X(current_state.dx)); Correct_Axis_X(current_state.dx));
} }
if (previous_state.dy != current_state.dy) { if (previous_state.dy != current_state.dy) {
SDL_PrivateJoystickAxis(joystick, SDL_PrivateJoystickAxis(joystick,
1, 1,
CORRECT_AXIS_Y(current_state.dy)); Correct_Axis_Y(current_state.dy));
} }
previous_state = current_state; previous_state = current_state;
} }
@ -162,12 +172,12 @@ UpdateN3DSCStick(SDL_Joystick *joystick)
if (previous_state.dx != current_state.dx) { if (previous_state.dx != current_state.dx) {
SDL_PrivateJoystickAxis(joystick, SDL_PrivateJoystickAxis(joystick,
2, 2,
CORRECT_AXIS_X(current_state.dx)); Correct_Axis_X(current_state.dx));
} }
if (previous_state.dy != current_state.dy) { if (previous_state.dy != current_state.dy) {
SDL_PrivateJoystickAxis(joystick, SDL_PrivateJoystickAxis(joystick,
3, 3,
CORRECT_AXIS_Y(current_state.dy)); Correct_Axis_Y(current_state.dy));
} }
previous_state = current_state; previous_state = current_state;
} }