summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormarius david <marius@mariusdavid.fr>2023-04-30 14:07:40 +0200
committermarius david <marius@mariusdavid.fr>2023-05-05 19:30:40 +0200
commit0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0 (patch)
tree809145aee9476c0ef107cdbdbc7fa3b93bb62a45 /src
parentMerge pull request #10110 from Morph1984/intel-disable-compute (diff)
downloadyuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar.gz
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar.bz2
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar.lz
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar.xz
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.tar.zst
yuzu-0a6bd8b236219c0ca7d140c3552c6a72d5c3ccd0.zip
Diffstat (limited to 'src')
-rw-r--r--src/input_common/drivers/sdl_driver.cpp35
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;
}