From 3226272a2d49bcbaec72ec735c22b4e0cc2a5c57 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Mon, 27 Jul 2020 19:31:09 -0700 Subject: skeleton --- wrapper/wrapper.cpp | 2 +- wrapper/wrapper.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index df3f796..f3d069a 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -8,7 +8,7 @@ using namespace System; Tuple^ ManagedAccel::Accelerate(int x, int y, double time, double mode) { vec2d input_vec2d = {x, y}; - vec2d output = (*accel_instance)(input_vec2d, (accel_function::milliseconds)time, (rawaccel::mode)mode); + vec2d output = (*accel_instance)(input_vec2d, (milliseconds)time, (rawaccel::mode)mode); return gcnew Tuple(output.x, output.y); } \ No newline at end of file diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 24bcadb..a5699ac 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -18,7 +18,7 @@ public: ManagedAccel(double mode, double offset, double accel, double lim_exp, double midpoint) { - accel_function::args_t args{}; + args_t args{}; args.accel = accel; args.lim_exp = lim_exp; args.midpoint = midpoint; -- cgit v1.2.3 From 894a13926f79e209e3b619012cd2bb6961d959e2 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 01:53:32 -0700 Subject: Further refactoring and comments --- wrapper/wrapper.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index a5699ac..e9bbf2e 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -1,7 +1,7 @@ #pragma once #include "..\common\rawaccel.hpp"; -#include "..\common\rawaccel-userspace.hpp"; +#include "..\common\error.hpp"; #include using namespace rawaccel; using namespace System; -- cgit v1.2.3 From f7a1883e4d26ebb2904518236656d53d8b5645b7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 02:09:21 -0700 Subject: Remove extra mode from variables --- wrapper/wrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wrapper') 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^ 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(output.x, output.y); } \ No newline at end of file -- cgit v1.2.3 From 9e55978ad8b8da90bb30407047b399e9c430c070 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 14:54:31 -0700 Subject: More comments and light refactoring --- wrapper/wrapper.cpp | 2 +- wrapper/wrapper.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 2c004e4..1adafba 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -5,7 +5,7 @@ using namespace rawaccel; using namespace System; -Tuple^ ManagedAccel::Accelerate(int x, int y, double time, double mode) +Tuple^ ManagedAccel::Accelerate(int x, int y, double time) { vec2d input_vec2d = {x, y}; vec2d output = (*accel_instance)(input_vec2d, (milliseconds)time); diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index e9bbf2e..0307b4c 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -48,5 +48,5 @@ public: return accel_instance; } - Tuple^ Accelerate(int x, int y, double time, double mode); + Tuple^ Accelerate(int x, int y, double time); }; \ No newline at end of file -- cgit v1.2.3 From 06d6d8d3e3cb5186daab029f2d7c7fa3ea0438d2 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 15:25:41 -0700 Subject: Rename acceleration constants, arguments --- wrapper/wrapper.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 0307b4c..271b61b 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -18,7 +18,7 @@ public: ManagedAccel(double mode, double offset, double accel, double lim_exp, double midpoint) { - args_t args{}; + accel_args args{}; args.accel = accel; args.lim_exp = lim_exp; args.midpoint = midpoint; -- cgit v1.2.3 From cdd82efdfdd7c2e9b4c2ed9777792f9921eedb9e Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 17:21:39 -0700 Subject: Get rid of enum and use types\tags directly --- wrapper/wrapper.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 271b61b..727bfcc 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -16,13 +16,13 @@ public: { } - ManagedAccel(double mode, double offset, double accel, double lim_exp, double midpoint) + ManagedAccel(int mode, double offset, double accel, double lim_exp, double midpoint) { accel_args args{}; args.accel = accel; args.lim_exp = lim_exp; args.midpoint = midpoint; - args.accel_mode = (rawaccel::mode)mode; + args.accel_mode = mode; args.offset = offset; accel_instance = new accel_function(args); -- cgit v1.2.3 From 344f759dad28c8b3866d7942bd8927ef1caaf6ab Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 28 Jul 2020 18:16:12 -0700 Subject: add per-class args structs --- wrapper/wrapper.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 727bfcc..2cbc01c 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -18,12 +18,12 @@ public: ManagedAccel(int mode, double offset, double accel, double lim_exp, double midpoint) { - accel_args args{}; - args.accel = accel; - args.lim_exp = lim_exp; - args.midpoint = midpoint; + accel_fn_args args{}; + args.acc_args.accel = accel; + args.acc_args.lim_exp = lim_exp; + args.acc_args.midpoint = midpoint; args.accel_mode = mode; - args.offset = offset; + args.acc_args.offset = offset; accel_instance = new accel_function(args); } -- cgit v1.2.3 From 6bb5b03e2afb0dd52204dfb1924dfd096387de3a Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 11:52:36 -0700 Subject: Use modifier object in wrapper --- wrapper/wrapper.cpp | 2 +- wrapper/wrapper.hpp | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'wrapper') diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 1adafba..c1cc570 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -8,7 +8,7 @@ using namespace System; Tuple^ ManagedAccel::Accelerate(int x, int y, double time) { vec2d input_vec2d = {x, y}; - vec2d output = (*accel_instance)(input_vec2d, (milliseconds)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 diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp index 2cbc01c..19b0987 100644 --- a/wrapper/wrapper.hpp +++ b/wrapper/wrapper.hpp @@ -9,43 +9,43 @@ using namespace System; public ref class ManagedAccel { protected: - accel_function* accel_instance; + mouse_modifier* modifier_instance; public: - ManagedAccel(accel_function* accel) - : accel_instance(accel) + ManagedAccel(mouse_modifier* accel) + : modifier_instance(accel) { } ManagedAccel(int mode, double offset, double accel, double lim_exp, double midpoint) { - accel_fn_args args{}; - args.acc_args.accel = accel; - args.acc_args.lim_exp = lim_exp; - args.acc_args.midpoint = midpoint; - args.accel_mode = mode; - args.acc_args.offset = offset; + 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; - accel_instance = new accel_function(args); + modifier_instance = new mouse_modifier(args); } virtual ~ManagedAccel() { - if (accel_instance != nullptr) + if (modifier_instance!= nullptr) { - delete accel_instance; + delete modifier_instance; } } !ManagedAccel() { - if (accel_instance != nullptr) + if (modifier_instance!= nullptr) { - delete accel_instance; + delete modifier_instance; } } - accel_function* GetInstance() + mouse_modifier* GetInstance() { - return accel_instance; + return modifier_instance; } Tuple^ Accelerate(int x, int y, double time); -- cgit v1.2.3