moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-03 08:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfixes to haptics

Browse Source
This commit is contained in:
Cameron Gutman 2019-02-11 21:55:56 -08:00
parent 7b0596d9df
commit df567b405a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/streaming/input.cpp
View File

@ -817,23 +817,34 @@ void SdlInputHandler::handleJoystickArrivalEvent(SDL_JoyDeviceEvent* event)
void SdlInputHandler::rumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) void SdlInputHandler::rumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor)
{ {
// Check if the controller supports haptics (and if the controller exists at all)
SDL_Haptic* haptic = m_GamepadState[controllerNumber].haptic; SDL_Haptic* haptic = m_GamepadState[controllerNumber].haptic;
SDL_HapticEffect effect;
if (haptic == nullptr) { if (haptic == nullptr) {
return; return;
} }
SDL_memset(&effect, 0, sizeof(effect)); // Stop the last effect we played
effect.type = SDL_HAPTIC_LEFTRIGHT;
effect.leftright.large_magnitude = lowFreqMotor;
effect.leftright.small_magnitude = highFreqMotor;
effect.leftright.length = 10000; // Choose 10 second max duration - can be cancelled sooner.
if (m_GamepadState[controllerNumber].hapticEffectId >= 0) { if (m_GamepadState[controllerNumber].hapticEffectId >= 0) {
SDL_HapticDestroyEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId); SDL_HapticDestroyEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId);
} }
// If this callback is telling us to stop both motors, don't bother queuing a new effect
if (lowFreqMotor == 0 && highFreqMotor == 0) {
return;
}
SDL_HapticEffect effect;
SDL_memset(&effect, 0, sizeof(effect));
effect.type = SDL_HAPTIC_LEFTRIGHT;
// The effect should last until we are instructed to stop or change it
effect.leftright.length = SDL_HAPTIC_INFINITY;
// SDL haptics range from 0-32767 but XInput uses 0-65535, so divide by 2 to correct for SDL's scaling
effect.leftright.large_magnitude = lowFreqMotor / 2;
effect.leftright.small_magnitude = highFreqMotor / 2;
// Play the new effect
m_GamepadState[controllerNumber].hapticEffectId = SDL_HapticNewEffect(haptic, &effect); m_GamepadState[controllerNumber].hapticEffectId = SDL_HapticNewEffect(haptic, &effect);
if (m_GamepadState[controllerNumber].hapticEffectId >= 0) { if (m_GamepadState[controllerNumber].hapticEffectId >= 0) {
SDL_HapticRunEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId, 1); SDL_HapticRunEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId, 1);