diff options
| author |  LC | 2020-11-20 00:40:09 -0500 |
|---|---|---|
| committer |  GitHub | 2020-11-20 00:40:09 -0500 |
| commit | bba7e8ea4b5c8e0dbac9f075d692afae0b05fd73 (patch) | |
| tree | 444df1fe92e31659f5a661a2268b5f2b3c632ca7 /src/input_common/sdl/sdl_impl.cpp | |
| parent | Merge pull request #4952 from ReinUsesLisp/bit-cast (diff) | |
| parent | Modify rumble amplification (diff) | |
| download | yuzu-bba7e8ea4b5c8e0dbac9f075d692afae0b05fd73.tar.gz yuzu-bba7e8ea4b5c8e0dbac9f075d692afae0b05fd73.tar.xz yuzu-bba7e8ea4b5c8e0dbac9f075d692afae0b05fd73.zip | |
Merge pull request #4950 from german77/RumbleStrenght
Modify rumble amplification
Diffstat (limited to 'src/input_common/sdl/sdl_impl.cpp')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 8c48bb861..c395d96cf 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -402,8 +402,7 @@ public: | |||
| 402 | 402 | ||
| 403 | bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const override { | 403 | bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const override { |
| 404 | const auto process_amplitude = [](f32 amplitude) { | 404 | const auto process_amplitude = [](f32 amplitude) { |
| 405 | return static_cast<u16>(std::pow(amplitude, 0.5f) * | 405 | return static_cast<u16>((amplitude + std::pow(amplitude, 0.3f)) * 0.5f * 0xFFFF); |
| 406 | (3.0f - 2.0f * std::pow(amplitude, 0.15f)) * 0xFFFF); | ||
| 407 | }; | 406 | }; |
| 408 | 407 | ||
| 409 | const auto processed_amp_low = process_amplitude(amp_low); | 408 | const auto processed_amp_low = process_amplitude(amp_low); |