summaryrefslogtreecommitdiff
path: root/wrapper/wrapper.cpp
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2020-07-31 12:20:11 -0700
committerJacob Palecki <[email protected]>2020-07-31 12:20:11 -0700
commit6537db04f7e717eda2f21e007cdba7e13b7f559e (patch)
treeefb65bf3f305f376ea75f4f687b08bf8998c020f /wrapper/wrapper.cpp
parentAdd class for storing settings from file (diff)
parentMerge pull request #6 from a1xd/st-refactor (diff)
downloadrawaccel-6537db04f7e717eda2f21e007cdba7e13b7f559e.tar.xz
rawaccel-6537db04f7e717eda2f21e007cdba7e13b7f559e.zip
Show no settings for off, remove unused class for PR
Diffstat (limited to 'wrapper/wrapper.cpp')
-rw-r--r--wrapper/wrapper.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index de2916c..ceee1a1 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -6,7 +6,10 @@ using namespace System;
Tuple<double, double>^ ManagedAccel::Accelerate(int x, int y, double time)
{
- vec2d input_vec2d = {x, y};
+ vec2d input_vec2d = {
+ (double)x,
+ (double)y
+ };
vec2d output = (*modifier_instance).modify_with_accel(input_vec2d, (milliseconds)time);
return gcnew Tuple<double, double>(output.x, output.y);
@@ -33,13 +36,14 @@ void ManagedAccel::UpdateAccel(
args.degrees = rotation;
args.sens.x = sensitivityX;
args.sens.y = sensitivityY;
- args.acc_fn_args.weight.x = weightX;
- args.acc_fn_args.weight.y = weightY;
+ args.acc_fn_args.acc_args.weight.x = weightX;
+ args.acc_fn_args.acc_args.weight.y = weightY;
args.acc_fn_args.cap.x = capX;
args.acc_fn_args.cap.y = capY;
args.acc_fn_args.acc_args.offset = offset;
args.acc_fn_args.acc_args.accel = accel;
- args.acc_fn_args.acc_args.lim_exp = lim_exp;
+ args.acc_fn_args.acc_args.limit = lim_exp;
+ args.acc_fn_args.acc_args.exponent = lim_exp;
args.acc_fn_args.acc_args.midpoint = midpoint;
modifier_instance = new mouse_modifier(args);