From 05b6069b505560a72d50f13c0b80a9e606df294f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 21 Oct 2014 10:25:10 +0200 Subject: fix toggle output zeros regression --- opentrack/tracker.cpp | 10 +++++----- opentrack/tracker.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opentrack/tracker.cpp b/opentrack/tracker.cpp index 41db7c19..8f1854e9 100644 --- a/opentrack/tracker.cpp +++ b/opentrack/tracker.cpp @@ -92,7 +92,7 @@ void Tracker::logic() { libs.pTracker->data(newpose); - Pose final_raw; + Pose final_raw_; if (enabledp) { @@ -102,13 +102,13 @@ void Tracker::logic() int k = axis.opts.src; if (k < 0 || k >= 6) { - final_raw(i) = 0; + final_raw_(i) = 0; continue; } // not really raw, after axis remap -sh - final_raw(i) = newpose[k]; + final_raw_(i) = newpose[k]; } - unstopped_raw = final_raw; + final_raw = final_raw_; } Pose filtered_pose; @@ -142,7 +142,7 @@ void Tracker::logic() { QMutexLocker foo(&mtx); output_pose = mapped_pose; - raw_6dof = unstopped_raw; + raw_6dof = final_raw; } } diff --git a/opentrack/tracker.h b/opentrack/tracker.h index 5ec44968..462f4e50 100644 --- a/opentrack/tracker.h +++ b/opentrack/tracker.h @@ -23,7 +23,7 @@ private: Mappings& m; Timer t; - Pose output_pose, raw_6dof, raw_center, unstopped_raw; + Pose output_pose, raw_6dof, raw_center, final_raw; double newpose[6]; std::atomic centerp; std::atomic enabledp; -- cgit v1.2.3