diff options
| author | Jacob Palecki <[email protected]> | 2020-07-24 12:05:30 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-07-24 12:05:30 -0700 |
| commit | 78a05dcaea46261a1367a77da2f422dd53beb208 (patch) | |
| tree | 0d362cff3e3bea6bbf778404f9140474236a91d0 | |
| parent | Add a basic windows forms grapher (diff) | |
| parent | Apply k to speed, allow values over 0 (diff) | |
| download | rawaccel-78a05dcaea46261a1367a77da2f422dd53beb208.tar.xz rawaccel-78a05dcaea46261a1367a77da2f422dd53beb208.zip | |
Merge branch 'PowerFix' into WrapperAndGrapher
| -rw-r--r-- | common/rawaccel.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index a60fe1c..1b4263c 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -99,7 +99,7 @@ struct accel_function { break; case mode::sigmoid: accel_val = k / (exp(-b * (speed - m)) + 1); break; - case mode::power: accel_val = (speed_offset > 0 && speed < 1) ? 0 : pow(speed, b*k) - 1; + case mode::power: accel_val = (speed_offset > 0 && speed < 1) ? 0 : pow(speed*k, b) - 1; break; default: break; @@ -132,7 +132,7 @@ struct accel_function { if (args.time_min <= 0) error("min time must be positive"); if (args.lim_exp <= 1) { if (args.accel_mode == mode::classic) error("exponent must be greater than 1"); - else if (args.accel_mode == mode::power) error("scale factor must be greater than 1"); + else if (args.accel_mode == mode::power) { if (args.lim_exp <= 0) error("scale factor must be greater than 0"); } else error("limit must be greater than 1"); } |