diff options
| author | Jacob Palecki <[email protected]> | 2020-07-29 15:51:53 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-07-29 15:51:53 -0700 |
| commit | 0a91af55f79d9a9d5bda600e8eee7e17c65bd0b6 (patch) | |
| tree | 642659b6ed96b00bc4e9bf6d3152978889ea0079 /wrapper/wrapper.cpp | |
| parent | add sum types (diff) | |
| parent | Use modifier object in wrapper (diff) | |
| download | rawaccel-0a91af55f79d9a9d5bda600e8eee7e17c65bd0b6.tar.xz rawaccel-0a91af55f79d9a9d5bda600e8eee7e17c65bd0b6.zip | |
Merge remote-tracking branch 'downstream/Inheritance' into st-refactor
Diffstat (limited to 'wrapper/wrapper.cpp')
| -rw-r--r-- | wrapper/wrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index df3f796..c1cc570 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -5,10 +5,10 @@ using namespace rawaccel; using namespace System; -Tuple<double, double>^ ManagedAccel::Accelerate(int x, int y, double time, double mode) +Tuple<double, double>^ ManagedAccel::Accelerate(int x, int y, double time) { vec2d input_vec2d = {x, y}; - vec2d output = (*accel_instance)(input_vec2d, (accel_function::milliseconds)time, (rawaccel::mode)mode); + vec2d output = (*modifier_instance).modify_with_accel(input_vec2d, (milliseconds)time); return gcnew Tuple<double, double>(output.x, output.y); }
\ No newline at end of file |