summaryrefslogtreecommitdiff
path: root/common/accel-naturalgain.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'common/accel-naturalgain.hpp')
-rw-r--r--common/accel-naturalgain.hpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/common/accel-naturalgain.hpp b/common/accel-naturalgain.hpp
index 646b2bb..cdfd1fa 100644
--- a/common/accel-naturalgain.hpp
+++ b/common/accel-naturalgain.hpp
@@ -13,10 +13,15 @@ namespace rawaccel {
inline double operator()(double speed) const {
// f(x) = k((e^(-mx)-1)/mx + 1)
+ double base_speed = speed + offset;
double scaled_speed = rate * speed;
- return limit * (((exp(-scaled_speed) - 1) / scaled_speed) + 1);
+ return limit * (((exp(-scaled_speed) - 1) / (base_speed * rate) ) + 1 - offset / base_speed);
}
+ inline double legacy_offset(double speed) const {
+ double scaled_speed = rate * speed;
+ return limit * (((exp(-scaled_speed) - 1) / scaled_speed) + 1);
+ }
};
using accel_naturalgain = additive_accel<naturalgain_impl>;