summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-17 05:21:55 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-17 05:32:05 +0200
commitf8b65030eefbb8bf7ce09d5c0adbfd3192f1cf24 (patch)
tree55b9335a1d1f557d9e37b108265c2f1e6fab2de3
parentd0d3be7f3895df5997647394853986096f889a1a (diff)
keep using raw headpose in ui
Issue: #52
-rw-r--r--facetracknoir/tracker.cpp3
-rw-r--r--facetracknoir/tracker.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp
index 29855b31..db2a7af3 100644
--- a/facetracknoir/tracker.cpp
+++ b/facetracknoir/tracker.cpp
@@ -121,6 +121,7 @@ void Tracker::run() {
for (int i = 0; i < 6; i++)
{
auto& axis = mainApp->axis(i);
+ raw_6dof.axes[i] = newpose[i];
int k = axis.opts.src;
if (k < 0 || k >= 6)
continue;
@@ -184,7 +185,7 @@ void Tracker::getHeadPose( double *data ) {
QMutexLocker foo(&mtx);
for (int i = 0; i < 6; i++)
{
- data[i] = mainApp->axis(i).headPos;
+ data[i] = raw_6dof.axes[i];
}
}
diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index 49e7f302..152551d4 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -73,7 +73,7 @@ public:
volatile bool do_center;
volatile bool enabled;
- T6DOF output_camera;
+ T6DOF output_camera, raw_6dof;
void start() { QThread::start(); }
};