summaryrefslogtreecommitdiff
path: root/wrapper
diff options
context:
space:
mode:
authorJacob Palecki <[email protected]>2020-07-27 19:31:09 -0700
committerJacob Palecki <[email protected]>2020-07-27 19:31:09 -0700
commit3226272a2d49bcbaec72ec735c22b4e0cc2a5c57 (patch)
tree84610d7e2bb0d410c0ea9ec409db95314e283c64 /wrapper
parentMerge pull request #5 from JacobPalecki/WrapperAndGrapher (diff)
downloadrawaccel-3226272a2d49bcbaec72ec735c22b4e0cc2a5c57.tar.xz
rawaccel-3226272a2d49bcbaec72ec735c22b4e0cc2a5c57.zip
skeleton
Diffstat (limited to 'wrapper')
-rw-r--r--wrapper/wrapper.cpp2
-rw-r--r--wrapper/wrapper.hpp2
2 files changed, 2 insertions, 2 deletions
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<double, double>^ 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<double, double>(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;