summaryrefslogtreecommitdiff
path: root/src/input_common/gcadapter/gc_poller.cpp
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-11-20 00:40:09 -0500
committerGitHub <noreply@github.com>2020-11-20 00:40:09 -0500
commitbba7e8ea4b5c8e0dbac9f075d692afae0b05fd73 (patch)
tree444df1fe92e31659f5a661a2268b5f2b3c632ca7 /src/input_common/gcadapter/gc_poller.cpp
parente883101999c41e87299058846416750e13990007 (diff)
parent5b6545b1410e2fa907d12f13d37ef710be654c2a (diff)
Merge pull request #4950 from german77/RumbleStrenght
Modify rumble amplification
Diffstat (limited to 'src/input_common/gcadapter/gc_poller.cpp')
-rw-r--r--src/input_common/gcadapter/gc_poller.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp
index fe57c13a5..d95574bb5 100644
--- a/src/input_common/gcadapter/gc_poller.cpp
+++ b/src/input_common/gcadapter/gc_poller.cpp
@@ -302,8 +302,8 @@ public:
bool SetRumblePlay(f32 amp_low, f32 freq_low, f32 amp_high, f32 freq_high) const override {
const auto mean_amplitude = (amp_low + amp_high) * 0.5f;
- const auto processed_amplitude = static_cast<u8>(
- pow(mean_amplitude, 0.5f) * (3.0f - 2.0f * pow(mean_amplitude, 0.15f)) * 0x8);
+ const auto processed_amplitude =
+ static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8);
return gcadapter->RumblePlay(port, processed_amplitude);
}