diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-25 11:25:40 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-25 11:25:51 +0200 |
| commit | c016dc0cd637a41e226384184f050ae41cd0eee6 (patch) | |
| tree | 2436408f41cfde287b39e6f0d0732d87b548c736 | |
| parent | 8e3c3358a09c3c6974645fb411e4f316c734e3db (diff) | |
logic, pose-widget: fix following simple-mat move
| -rw-r--r-- | opentrack-logic/simple-mat.cpp | 6 | ||||
| -rw-r--r-- | opentrack-logic/simple-mat.hpp | 4 | ||||
| -rw-r--r-- | opentrack-logic/tracker.h | 2 | ||||
| -rw-r--r-- | pose-widget/glwidget.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/opentrack-logic/simple-mat.cpp b/opentrack-logic/simple-mat.cpp index ad83a508..748e083b 100644 --- a/opentrack-logic/simple-mat.cpp +++ b/opentrack-logic/simple-mat.cpp @@ -4,7 +4,7 @@ namespace euler { -euler_t rmat_to_euler(const dmat<3, 3>& R) +euler_t OPENTRACK_LOGIC_EXPORT rmat_to_euler(const dmat<3, 3>& R) { using std::atan2; using std::sqrt; @@ -22,7 +22,7 @@ euler_t rmat_to_euler(const dmat<3, 3>& R) } // tait-bryan angles, not euler -rmat euler_to_rmat(const euler_t& input) +rmat OPENTRACK_LOGIC_EXPORT euler_to_rmat(const euler_t& input) { const double H = input(0); const double P = input(1); @@ -38,7 +38,7 @@ rmat euler_to_rmat(const euler_t& input) const auto c3 = cos(B); const auto s3 = sin(B); - return dmat<3, 3>( + return rmat( // z c1 * c2, c1 * s2 * s3 - c3 * s1, diff --git a/opentrack-logic/simple-mat.hpp b/opentrack-logic/simple-mat.hpp index f1ad0717..09de6004 100644 --- a/opentrack-logic/simple-mat.hpp +++ b/opentrack-logic/simple-mat.hpp @@ -267,9 +267,9 @@ template<int y, int x> using dmat = Mat<double, y, x>; using rmat = dmat<3, 3>; using euler_t = dmat<3, 1>; -OPENTRACK_API_EXPORT rmat euler_to_rmat(const euler_t& input); +rmat OPENTRACK_LOGIC_EXPORT euler_to_rmat(const euler_t& input); // http://stackoverflow.com/a/18436193 -euler_t OPENTRACK_API_EXPORT rmat_to_euler(const dmat<3, 3>& R); +euler_t OPENTRACK_LOGIC_EXPORT rmat_to_euler(const dmat<3, 3>& R); } // end ns euler diff --git a/opentrack-logic/tracker.h b/opentrack-logic/tracker.h index a6752d14..fae8bd9e 100644 --- a/opentrack-logic/tracker.h +++ b/opentrack-logic/tracker.h @@ -14,7 +14,7 @@ #include "opentrack-compat/timer.hpp" #include "opentrack/plugin-support.hpp" #include "mappings.hpp" -#include "opentrack/simple-mat.hpp" +#include "simple-mat.hpp" #include "selected-libraries.hpp" #include "spline-widget/functionconfig.h" diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index 96187856..6cccdfcd 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -11,7 +11,7 @@ #include <QWidget> #include <QPixmap> #include "opentrack/plugin-api.hpp" -#include "opentrack/simple-mat.hpp" +#include "opentrack-logic/simple-mat.hpp" #include "opentrack-compat/timer.hpp" #ifdef BUILD_pose_widget |