diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-03 11:29:59 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-03 23:40:44 +0100 |
| commit | e7f9a0ad3812f51fdb904b40303f6c0fec02f1a8 (patch) | |
| tree | 405daf0c127714d63b06bed855d9f7aefc60c08c | |
| parent | e26830bf71ca5968fc9d9d473966ea4b75120b56 (diff) | |
move simple-mat from logic to compat to simplify dependencies
| -rw-r--r-- | compat/simple-mat.cpp (renamed from logic/simple-mat.cpp) | 6 | ||||
| -rw-r--r-- | compat/simple-mat.hpp (renamed from logic/simple-mat.hpp) | 6 | ||||
| -rw-r--r-- | logic/tracker.h | 2 | ||||
| -rw-r--r-- | pose-widget/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pose-widget/glwidget.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/logic/simple-mat.cpp b/compat/simple-mat.cpp index 57571f9e..c9af9634 100644 --- a/logic/simple-mat.cpp +++ b/compat/simple-mat.cpp @@ -3,7 +3,7 @@ namespace euler { -euler_t OPENTRACK_LOGIC_EXPORT rmat_to_euler(const rmat& R) +euler_t OPENTRACK_COMPAT_EXPORT rmat_to_euler(const rmat& R) { using std::atan2; using std::sqrt; @@ -21,7 +21,7 @@ euler_t OPENTRACK_LOGIC_EXPORT rmat_to_euler(const rmat& R) } // tait-bryan angles, not euler -rmat OPENTRACK_LOGIC_EXPORT euler_to_rmat(const euler_t& input) +rmat OPENTRACK_COMPAT_EXPORT euler_to_rmat(const euler_t& input) { const double H = -input(0); const double P = -input(1); @@ -54,7 +54,7 @@ rmat OPENTRACK_LOGIC_EXPORT euler_to_rmat(const euler_t& input) } // https://en.wikipedia.org/wiki/Davenport_chained_rotations#Tait.E2.80.93Bryan_chained_rotations -void OPENTRACK_LOGIC_EXPORT tait_bryan_to_matrices(const euler_t& input, +void OPENTRACK_COMPAT_EXPORT tait_bryan_to_matrices(const euler_t& input, rmat& r_roll, rmat& r_pitch, rmat& r_yaw) diff --git a/logic/simple-mat.hpp b/compat/simple-mat.hpp index 089e8dfe..9739be7f 100644 --- a/logic/simple-mat.hpp +++ b/compat/simple-mat.hpp @@ -281,11 +281,11 @@ namespace euler { using rmat = dmat<3, 3>; using euler_t = dmat<3, 1>; -rmat OPENTRACK_LOGIC_EXPORT euler_to_rmat(const euler_t& input); +rmat OPENTRACK_COMPAT_EXPORT euler_to_rmat(const euler_t& input); -euler_t OPENTRACK_LOGIC_EXPORT rmat_to_euler(const rmat& R); +euler_t OPENTRACK_COMPAT_EXPORT rmat_to_euler(const rmat& R); -void OPENTRACK_LOGIC_EXPORT tait_bryan_to_matrices(const euler_t& input, +void OPENTRACK_COMPAT_EXPORT tait_bryan_to_matrices(const euler_t& input, rmat& r_roll, rmat& r_pitch, rmat& r_yaw); diff --git a/logic/tracker.h b/logic/tracker.h index ce2279ab..7588d76f 100644 --- a/logic/tracker.h +++ b/logic/tracker.h @@ -13,7 +13,7 @@ #include "compat/timer.hpp" #include "api/plugin-support.hpp" #include "mappings.hpp" -#include "simple-mat.hpp" +#include "compat/simple-mat.hpp" #include "selected-libraries.hpp" #include "spline-widget/spline.hpp" diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt index d298eee0..d73ee037 100644 --- a/pose-widget/CMakeLists.txt +++ b/pose-widget/CMakeLists.txt @@ -1,2 +1,2 @@ opentrack_boilerplate(opentrack-pose-widget BIN) -target_link_libraries(opentrack-pose-widget opentrack-logic) +target_link_libraries(opentrack-pose-widget) diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index 072ea644..013cc0d5 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -11,7 +11,7 @@ #include <QWidget> #include <QPixmap> #include "api/plugin-api.hpp" -#include "logic/simple-mat.hpp" +#include "compat/simple-mat.hpp" #ifdef BUILD_pose_widget # define POSE_WIDGET_EXPORT Q_DECL_EXPORT |