ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Use SDL_GameControllerRumble instead of SDL_JoystickRumble if available

This commit is contained in:
Vicki Pfau 2024-03-12 17:46:25 -07:00
parent d8ab5529a7
commit c8c9fcb665
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/platform/sdl/sdl-events.c
View File

@ -665,13 +665,22 @@ void mSDLHandleEvent(struct mCoreThread* context, struct mSDLPlayer* sdlContext,
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
static void _mSDLSetRumble(struct mRumble* rumble, int enable) { static void _mSDLSetRumble(struct mRumble* rumble, int enable) {
struct mSDLRumble* sdlRumble = (struct mSDLRumble*) rumble; struct mSDLRumble* sdlRumble = (struct mSDLRumble*) rumble;
if (!sdlRumble->p->joystick if (!sdlRumble->p->joystick) {
#if !SDL_VERSION_ATLEAST(2, 0, 9)
|| !sdlRumble->p->joystick->haptic || !SDL_HapticRumbleSupported(sdlRumble->p->joystick->haptic)
#endif
) {
return; return;
} }
#if !SDL_VERSION_ATLEAST(2, 0, 9)
if (!sdlRumble->p->joystick->haptic || !SDL_HapticRumbleSupported(sdlRumble->p->joystick->haptic)) {
return;
}
#endif
#if SDL_VERSION_ATLEAST(2, 0, 18)
if (!sdlRumble->p->joystick->controller || !SDL_GameControllerHasRumble(sdlRumble->p->joystick->controller)) {
return;
}
#endif
int8_t originalLevel = sdlRumble->level; int8_t originalLevel = sdlRumble->level;
sdlRumble->level += enable; sdlRumble->level += enable;
if (CircleBufferSize(&sdlRumble->history) == RUMBLE_PWM) { if (CircleBufferSize(&sdlRumble->history) == RUMBLE_PWM) {
@ -689,7 +698,11 @@ static void _mSDLSetRumble(struct mRumble* rumble, int enable) {
} }
sdlRumble->activeLevel = activeLevel; sdlRumble->activeLevel = activeLevel;
#if SDL_VERSION_ATLEAST(2, 0, 9) #if SDL_VERSION_ATLEAST(2, 0, 9)
SDL_JoystickRumble(sdlRumble->p->joystick->joystick, activeLevel * 0xFFFF, activeLevel * 0xFFFF, 500); if (sdlRumble->p->joystick->controller) {
SDL_GameControllerRumble(sdlRumble->p->joystick->controller, activeLevel * 0xFFFF, activeLevel * 0xFFFF, 500);
} else {
SDL_JoystickRumble(sdlRumble->p->joystick->joystick, activeLevel * 0xFFFF, activeLevel * 0xFFFF, 500);
}
#else #else
if (sdlRumble->activeLevel > 0.5 / RUMBLE_STEPS) { if (sdlRumble->activeLevel > 0.5 / RUMBLE_STEPS) {
SDL_HapticRumbleStop(sdlRumble->p->joystick->haptic); SDL_HapticRumbleStop(sdlRumble->p->joystick->haptic);