diff options
| author | Jacob Palecki <[email protected]> | 2020-07-28 02:09:21 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-07-28 02:09:21 -0700 |
| commit | f7a1883e4d26ebb2904518236656d53d8b5645b7 (patch) | |
| tree | 8262c255dcfe83ada2cd707290566f94cba48740 | |
| parent | Further refactoring and comments (diff) | |
| download | rawaccel-f7a1883e4d26ebb2904518236656d53d8b5645b7.tar.xz rawaccel-f7a1883e4d26ebb2904518236656d53d8b5645b7.zip | |
Remove extra mode from variables
| -rw-r--r-- | common/rawaccel.hpp | 4 | ||||
| -rw-r--r-- | driver/driver.cpp | 2 | ||||
| -rw-r--r-- | wrapper/wrapper.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 3380e4c..28d9ee2 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -290,7 +290,7 @@ namespace rawaccel { return accel.visit([=](auto accel_t) { accel_t.verify(args); }); } - inline vec2d operator()(const vec2d& input, milliseconds time, mode accel_mode) const { + inline vec2d operator()(const vec2d& input, milliseconds time) const { double mag = sqrtsd(input.x * input.x + input.y * input.y); double time_clamped = clampsd(time, time_min, 100); double speed = maxsd(mag / time_clamped - speed_offset, 0); @@ -312,7 +312,6 @@ namespace rawaccel { struct variables { bool apply_rotate = false; bool apply_accel = false; - mode accel_mode = mode::noaccel; rotator rotate; accel_function accel_fn; vec2d sensitivity = { 1, 1 }; @@ -325,7 +324,6 @@ namespace rawaccel { else rotate = rotator(); apply_accel = accel_args.accel_mode != mode::noaccel; - accel_mode = accel_args.accel_mode; if (sens.x == 0) sens.x = 1; if (sens.y == 0) sens.y = 1; diff --git a/driver/driver.cpp b/driver/driver.cpp index e77ac5f..5523f28 100644 --- a/driver/driver.cpp +++ b/driver/driver.cpp @@ -83,7 +83,7 @@ Arguments: DebugPrint(("RA time < min with %d ticks\n", ticks)); } - input = global.vars.accel_fn(input, time, global.vars.accel_mode); + input = global.vars.accel_fn(input, time); } double result_x = input.x * global.vars.sensitivity.x + local_carry.x; diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index f3d069a..2c004e4 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -8,7 +8,7 @@ using namespace System; Tuple<double, double>^ ManagedAccel::Accelerate(int x, int y, double time, double mode) { vec2d input_vec2d = {x, y}; - vec2d output = (*accel_instance)(input_vec2d, (milliseconds)time, (rawaccel::mode)mode); + vec2d output = (*accel_instance)(input_vec2d, (milliseconds)time); return gcnew Tuple<double, double>(output.x, output.y); }
\ No newline at end of file |