summaryrefslogtreecommitdiffhomepage
path: root/tracker-hydra/ftnoir_tracker_hydra.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-hydra/ftnoir_tracker_hydra.cpp')
-rw-r--r--tracker-hydra/ftnoir_tracker_hydra.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/tracker-hydra/ftnoir_tracker_hydra.cpp b/tracker-hydra/ftnoir_tracker_hydra.cpp
index 77e62243..5f548bd6 100644
--- a/tracker-hydra/ftnoir_tracker_hydra.cpp
+++ b/tracker-hydra/ftnoir_tracker_hydra.cpp
@@ -18,12 +18,13 @@
#include <cstdio>
#include <cmath>
#ifdef _WIN32
+# undef WIN32
+# define WIN32
# define SIXENSE_STATIC_LIB
-# define SIXENSE_UTILS_STATIC_LIB
#endif
#include <sixense.h>
-Hydra_Tracker::Hydra_Tracker() : should_quit(false) {}
+Hydra_Tracker::Hydra_Tracker() = default;
#include <sixense_math.hpp>
@@ -33,9 +34,11 @@ Hydra_Tracker::~Hydra_Tracker()
sixenseExit();
}
-void Hydra_Tracker::start_tracker(QFrame*)
+module_status Hydra_Tracker::start_tracker(QFrame*)
{
sixenseInit();
+
+ return status_ok();
}
void Hydra_Tracker::data(double *data)
@@ -52,7 +55,7 @@ void Hydra_Tracker::data(double *data)
data[TX] = double(acd.controllers[0].pos[0])/50;
data[TY] = double(acd.controllers[0].pos[1])/50;
data[TZ] = double(acd.controllers[0].pos[2])/50;
- static constexpr double r2d = 180/M_PI;
+ constexpr double r2d = 180/M_PI;
data[Yaw] = double(ypr[0]) * r2d;
data[Pitch] = double(ypr[1]) * r2d;
data[Roll] = double(ypr[2]) * r2d;