diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2023-05-10 06:59:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-10 06:59:32 +0200 |
commit | 3ec027400ec206f803a8ceb4698056bea77d0024 (patch) | |
tree | ef556b48fc03b1866fff73bb6d6224644b642c26 /src | |
parent | Merge pull request #10183 from liamwhite/mods (diff) | |
parent | Improve emulation of HD Rumble (diff) | |
download | yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar.gz yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar.bz2 yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar.lz yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar.xz yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.tar.zst yuzu-3ec027400ec206f803a8ceb4698056bea77d0024.zip |
Diffstat (limited to '')
-rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 7f9e8dbb9..9a0439bb5 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -109,14 +109,37 @@ public: } bool RumblePlay(const Common::Input::VibrationStatus vibration) { - constexpr u32 rumble_max_duration_ms = 1000; + constexpr u32 rumble_max_duration_ms = 2000; + constexpr f32 low_start_sensitivity_limit = 140.0; + constexpr f32 low_width_sensitivity_limit = 400.0; + constexpr f32 high_start_sensitivity_limit = 200.0; + constexpr f32 high_width_sensitivity_limit = 700.0; + // Try to provide some feeling of the frequency by reducing the amplitude depending on it. + f32 low_frequency_scale = 1.0; + if (vibration.low_frequency > low_start_sensitivity_limit) { + low_frequency_scale = + std::max(1.0f - (vibration.low_frequency - low_start_sensitivity_limit) / + low_width_sensitivity_limit, + 0.3f); + } + f32 low_amplitude = vibration.low_amplitude * low_frequency_scale; + + f32 high_frequency_scale = 1.0; + if (vibration.high_frequency > high_start_sensitivity_limit) { + high_frequency_scale = + std::max(1.0f - (vibration.high_frequency - high_start_sensitivity_limit) / + high_width_sensitivity_limit, + 0.3f); + } + f32 high_amplitude = vibration.high_amplitude * high_frequency_scale; + if (sdl_controller) { - return SDL_GameControllerRumble( - sdl_controller.get(), static_cast<u16>(vibration.low_amplitude), - static_cast<u16>(vibration.high_amplitude), rumble_max_duration_ms) != -1; + return SDL_GameControllerRumble(sdl_controller.get(), static_cast<u16>(low_amplitude), + static_cast<u16>(high_amplitude), + rumble_max_duration_ms) != -1; } else if (sdl_joystick) { - return SDL_JoystickRumble(sdl_joystick.get(), static_cast<u16>(vibration.low_amplitude), - static_cast<u16>(vibration.high_amplitude), + return SDL_JoystickRumble(sdl_joystick.get(), static_cast<u16>(low_amplitude), + static_cast<u16>(high_amplitude), rumble_max_duration_ms) != -1; } |