update grapher/wrapper for st-refactor

2 files changed, 12 insertions, 11 deletions

diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index c1cc570..26d05ec 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -7,7 +7,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);
diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp
index 19b0987..42f5865 100644
--- a/wrapper/wrapper.hpp
+++ b/wrapper/wrapper.hpp
@@ -1,11 +1,16 @@
 #pragma once
 
 #include "..\common\rawaccel.hpp";
-#include "..\common\error.hpp";
+#include "..\common\accel-error.hpp";
 #include <iostream>
 using namespace rawaccel;
 using namespace System;
 
+
+public value struct ArgsWrapper {
+    int a;
+};
+
 public ref class ManagedAccel
 {
 protected:
@@ -16,16 +21,9 @@ public:
 	{
 	}
 
-    ManagedAccel(int mode, double offset, double accel, double lim_exp, double midpoint)
+    ManagedAccel(System::IntPtr args)
     {
-        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);
+        modifier_instance = new mouse_modifier(*reinterpret_cast<modifier_args*>(args.ToPointer()));
 	}
 
     virtual ~ManagedAccel()