summaryrefslogtreecommitdiff
path: root/common/accel-natural.hpp
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2020-09-04 01:15:12 -0700
committerJacob Palecki <[email protected]>2020-09-04 01:15:12 -0700
commit87ee655d3c0ba3cdb0ca71a1b66aeb02c8c6aa70 (patch)
treea2ca5c42352737e3dab48ec854c1cd068a282e46 /common/accel-natural.hpp
parentThe menus mostly work (diff)
parentMerge pull request #19 from JacobPalecki/gainOffset (diff)
downloadrawaccel-87ee655d3c0ba3cdb0ca71a1b66aeb02c8c6aa70.tar.xz
rawaccel-87ee655d3c0ba3cdb0ca71a1b66aeb02c8c6aa70.zip
Merge with master
Diffstat (limited to 'common/accel-natural.hpp')
-rw-r--r--common/accel-natural.hpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/common/accel-natural.hpp b/common/accel-natural.hpp
index c7d0dcd..03700c1 100644
--- a/common/accel-natural.hpp
+++ b/common/accel-natural.hpp
@@ -10,15 +10,21 @@ namespace rawaccel {
struct natural_impl {
double rate;
double limit;
+ double offset;
natural_impl(const accel_args& args) :
- rate(args.accel), limit(args.limit - 1)
+ rate(args.accel), limit(args.limit - 1), offset(args.offset)
{
rate /= limit;
}
inline double operator()(double speed) const {
// f(x) = k(1-e^(-mx))
+ double base_speed = speed + offset;
+ return limit * (1 - ((exp(-rate * speed) * speed + offset) / base_speed));
+ }
+
+ inline double legacy_offset(double speed) const {
return limit - (limit * exp(-rate * speed));
}