From 0a8effcccac92ffd591f94c276fb797dd31f51ab Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 15:39:39 -0700 Subject: Compiles but may file --- wrapper/wrapper.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'wrapper/wrapper.cpp') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index c1cc570..ebf44cf 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -1,7 +1,6 @@ #pragma once -#include "..\common\rawaccel.hpp"; -#include "wrapper.hpp"; +#include "wrapper.hpp" using namespace rawaccel; using namespace System; @@ -11,4 +10,23 @@ Tuple^ ManagedAccel::Accelerate(int x, int y, double time) vec2d output = (*modifier_instance).modify_with_accel(input_vec2d, (milliseconds)time); return gcnew Tuple(output.x, output.y); -} \ No newline at end of file +} + +void ManagedAccel::UpdateAccel(int mode, double offset, double accel, double lim_exp, double midpoint) +{ + delete modifier_instance; + + modifier_args args{}; + args.acc_fn_args.acc_args.accel = accel; + args.acc_fn_args.acc_args.lim_exp = lim_exp; + args.acc_fn_args.acc_args.midpoint = midpoint; + args.acc_fn_args.accel_mode = mode; + args.acc_fn_args.acc_args.offset = offset; + + modifier_instance = new mouse_modifier(args); +} + +void ManagedAccel::WriteToDriver() +{ + driverWriter->writeToDriver(modifier_instance); +} -- cgit v1.2.3 From 953fd6e30faae4f8eecfe2fde2b47cf42da51ca8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 18:50:43 -0700 Subject: Take all variables through GUI --- wrapper/wrapper.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'wrapper/wrapper.cpp') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index ebf44cf..e1aa35e 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -12,16 +12,33 @@ Tuple^ ManagedAccel::Accelerate(int x, int y, double time) return gcnew Tuple(output.x, output.y); } -void ManagedAccel::UpdateAccel(int mode, double offset, double accel, double lim_exp, double midpoint) +void ManagedAccel::UpdateAccel( + int mode, + double sensitivityX, + double sensitivityY, + double weightX, + double weightY, + double capX, + double capY, + double offset, + double accel, + double lim_exp, + double midpoint) { delete modifier_instance; modifier_args args{}; + args.acc_fn_args.accel_mode = mode; + 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.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.midpoint = midpoint; - args.acc_fn_args.accel_mode = mode; - args.acc_fn_args.acc_args.offset = offset; modifier_instance = new mouse_modifier(args); } -- cgit v1.2.3 From 20ea6f85cb0af56c13dabbfc3f65383af8793c7c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 30 Jul 2020 00:32:48 -0700 Subject: Fix small bugs, add AccelOptions class --- wrapper/wrapper.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'wrapper/wrapper.cpp') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index e1aa35e..de2916c 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -14,6 +14,7 @@ Tuple^ ManagedAccel::Accelerate(int x, int y, double time) void ManagedAccel::UpdateAccel( int mode, + double rotation, double sensitivityX, double sensitivityY, double weightX, @@ -29,6 +30,7 @@ void ManagedAccel::UpdateAccel( modifier_args args{}; args.acc_fn_args.accel_mode = mode; + args.degrees = rotation; args.sens.x = sensitivityX; args.sens.y = sensitivityY; args.acc_fn_args.weight.x = weightX; -- cgit v1.2.3