summaryrefslogtreecommitdiffhomepage
path: root/opentrack-logic
diff options
context:
space:
mode:
Diffstat (limited to 'opentrack-logic')
-rw-r--r--opentrack-logic/simple-mat.cpp6
-rw-r--r--opentrack-logic/simple-mat.hpp4
-rw-r--r--opentrack-logic/tracker.h2
3 files changed, 6 insertions, 6 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"