From 3e8f2fc4f97072da6fb4112118b0c34e3b7b4dce Mon Sep 17 00:00:00 2001 From: Jesse Mapel Date: Fri, 30 Nov 2018 12:16:22 -0700 Subject: [PATCH] Fixed interpolation options --- include/eal.h | 20 +++++++++++++------- src/eal.cpp | 21 ++++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/include/eal.h b/include/eal.h index 016aa88..183bf52 100644 --- a/include/eal.h +++ b/include/eal.h @@ -8,17 +8,23 @@ using namespace std; namespace eal { - vector getPosition(vector> coords, vector times, string interp, double time); - vector getVelocity(vector> coords, vector times, string interp, double time, bool interpolation); + vector getPosition(vector> coords, vector times, + string interp, double time); + vector getVelocity(vector> coords, vector times, + string interp, double time, bool interpolation); vector getPosition(vector coeffs, string interp, double time); - vector getVelocity(vector coeffs, string interp, double time, bool interpolation); + vector getVelocity(vector coeffs, string interp, double time); - vector getRotation(string from, string to, vector> rotations, vector times, string interp, double time); - vector getAngularVelocity(string from, string to, vector> rotations, vector times, string interp, double time); + vector getRotation(string from, string to, vector> rotations, + vector times, string interp, double time); + vector getAngularVelocity(string from, string to, vector> rotations, + vector times, string interp, double time, bool interpolation); - vector getRotation(string from, string to, vector coefficients, string interp, double time); - vector getAngularVelocity(string from, string to, vector coefficients, string interp, double time); + vector getRotation(string from, string to, vector coefficients, + string interp, double time); + vector getAngularVelocity(string from, string to, vector coefficients, + string interp, double time); } diff --git a/src/eal.cpp b/src/eal.cpp index 629d3cb..0016054 100644 --- a/src/eal.cpp +++ b/src/eal.cpp @@ -5,12 +5,14 @@ using namespace eal; // Positional Functions // Position Data Functions -vector getPosition(vector> coords, vector times, string interp, double time) { +vector getPosition(vector> coords, vector times, + string interp, double time) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } -vector getVelocity(vector> coords, vector times, string interp, double time, bool interpolation) { +vector getVelocity(vector> coords, vector times, + string interp, double time, bool interpolation) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } @@ -21,7 +23,8 @@ vector getPosition(vector coeffs, string interp, double time) { return coordinate; } -vector getVelocity(vector coeffs, string interp, double time, bool interpolation) { +vector getVelocity(vector coeffs, string interp, double time, + bool interpolation) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } @@ -29,23 +32,27 @@ vector getVelocity(vector coeffs, string interp, double time, bo // Rotation Data Functions // Rotation Data Functions -vector getRotation(string from, string to, vector> rotations, vector times, string interp, double time) { +vector getRotation(string from, string to, vector> rotations, + vector times, string interp, double time) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } -vector getAngularVelocity(string from, string to, vector> rotations, vector times, string interp, double time) { +vector getAngularVelocity(string from, string to, vector> rotations, + vector times, string interp, double time, bool interpolation) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } // Rotation Function Functions -vector getRotation(string from, string to, vector coefficients, string interp, double time) { +vector getRotation(string from, string to, vector coefficients, + string interp, double time) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } -vector getAngularVelocity(string from, string to, vector coefficients, string interp, double time) { +vector getAngularVelocity(string from, string to, vector coefficients, + string interp, double time) { vector coordinate = {0.0, 0.0, 0.0}; return coordinate; } -- GitLab