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

Rework xinput_joypad_rumble somewhat

This commit is contained in:
libretroadmin 2025-05-29 05:59:46 +02:00
parent b1ad554a14
commit c372dfad8b
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
input/drivers_joypad/xinput_hybrid_joypad.c
View File

@ -694,9 +694,8 @@ static bool xinput_joypad_rumble(unsigned pad,
enum retro_rumble_effect effect, uint16_t strength) enum retro_rumble_effect effect, uint16_t strength)
{ {
clock_t now; clock_t now;
bool rumble_state;
double time_since_last_rumble; double time_since_last_rumble;
bool rumble_state_unchanged;
bool rumble_interval_unelapsed;
XINPUT_VIBRATION new_state, *state; XINPUT_VIBRATION new_state, *state;
int xuser = PAD_INDEX_TO_XUSER_INDEX(pad); int xuser = PAD_INDEX_TO_XUSER_INDEX(pad);
@ -712,22 +711,26 @@ static bool xinput_joypad_rumble(unsigned pad,
else if (effect == RETRO_RUMBLE_WEAK) else if (effect == RETRO_RUMBLE_WEAK)
new_state.wRightMotorSpeed = strength; new_state.wRightMotorSpeed = strength;
rumble_state_unchanged = ((new_state.wLeftMotorSpeed == state->wLeftMotorSpeed) && rumble_state = ((new_state.wLeftMotorSpeed == state->wLeftMotorSpeed)
(new_state.wRightMotorSpeed == state->wRightMotorSpeed)); && (new_state.wRightMotorSpeed == state->wRightMotorSpeed));
/* Rumble state unchanged? */
if (rumble_state_unchanged)
return true;
now = clock(); now = clock();
time_since_last_rumble = (double)(now - last_rumble_time[xuser]) / CLOCKS_PER_SEC; time_since_last_rumble = (double)(now - last_rumble_time[xuser]) / CLOCKS_PER_SEC;
rumble_interval_unelapsed = (time_since_last_rumble < RUMBLE_INTERVAL); rumble_state = (time_since_last_rumble < RUMBLE_INTERVAL);
/* Rumble interval unelapsed? */
if (rumble_state_unchanged || rumble_interval_unelapsed) if (rumble_state)
return true; return true;
if (g_XInputSetState)
if (!g_XInputSetState) {
return false; *state = new_state;
last_rumble_time[xuser] = now;
*state = new_state; if (g_XInputSetState(xuser, state) == ERROR_SUCCESS)
last_rumble_time[xuser] = now; return true;
return (g_XInputSetState(xuser, state) == ERROR_SUCCESS); }
return false;
} }
static void xinput_joypad_destroy(void) static void xinput_joypad_destroy(void)