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

xinput: use the full range of the haptic motors (thanks, Trent!). 

XInput goes from 0 to 64k; we were feeding it values in the range of 0 to 32k.

Fixes Bugzilla #3002.
This commit is contained in:
Ryan C. Gordon 2017-06-21 01:22:00 -04:00
parent 267dca13fa
commit d96419c93f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/haptic/windows/SDL_xinputhaptic.c
View File

@ -278,8 +278,9 @@ SDL_XINPUT_HapticUpdateEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
{ {
XINPUT_VIBRATION *vib = &effect->hweffect->vibration; XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
SDL_assert(data->type == SDL_HAPTIC_LEFTRIGHT); SDL_assert(data->type == SDL_HAPTIC_LEFTRIGHT);
vib->wLeftMotorSpeed = data->leftright.large_magnitude; /* SDL_HapticEffect has max magnitude of 32767, XInput expects 65535 max, so multiply */
vib->wRightMotorSpeed = data->leftright.small_magnitude; vib->wLeftMotorSpeed = data->leftright.large_magnitude * 2;
vib->wRightMotorSpeed = data->leftright.small_magnitude * 2;
SDL_LockMutex(haptic->hwdata->mutex); SDL_LockMutex(haptic->hwdata->mutex);
if (haptic->hwdata->stopTicks) { /* running right now? Update it. */ if (haptic->hwdata->stopTicks) { /* running right now? Update it. */
XINPUTSETSTATE(haptic->hwdata->userid, vib); XINPUTSETSTATE(haptic->hwdata->userid, vib);