From 949d847ed9df6d2d2a7931f3f69014aa56a5ab7c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 17 Mar 2017 10:46:41 +0100 Subject: logic/tracker: avoid using zero position in reltrans/mapping --- logic/tracker.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/logic/tracker.cpp b/logic/tracker.cpp index 007189ec..9b085108 100644 --- a/logic/tracker.cpp +++ b/logic/tracker.cpp @@ -288,9 +288,6 @@ void Tracker::logic() for (int i = 3; i < 6; i++) value(i) = map(value(i), m(i)); - for (int i = 0; i < 6; i++) - value(i) += m(i).opts.zero; - if (get(f_zero)) for (int i = 0; i < 6; i++) value(i) = 0; @@ -348,6 +345,10 @@ void Tracker::logic() (void) map(raw_6dof(i), m(i)); } + // custom zero position + for (int i = 0; i < 6; i++) + value(i) += m(i).opts.zero * (m(i).opts.invert ? -1 : 1); + if (!nanp) libs.pProtocol->pose(value); -- cgit v1.2.3