Merge commit 'f78b96a' into unstable

* commit 'f78b96a':
  gcc too much a piece of work often
  submit mapped data to filter, not raw
  nonsense
  drop decimal places for rot/trans in UI
  rotation below -99 didn't display, just froze
  add-comment

1 files changed, 4 insertions, 2 deletions

diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index d65e1cf1..afb86802 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -23,12 +23,14 @@ private:
     // XXX can be const-cast when functionconfig const-correct -sh 20141004
     Mappings& m;
     Timer t;
-    Pose output_pose, raw_6dof;
+    Pose output_pose, raw_6dof, raw_center, unstopped_raw;
+    double newpose[6];
     std::atomic<bool> centerp;
     std::atomic<bool> enabledp;
     std::atomic<bool> should_quit;
 
-    static void get_curve(double pos, double& out, Mapping& axis);
+    double map(double pos, Mapping& axis);
+    void logic();
     static void t_compensate(const double* input, double* output, bool rz);
 protected:
     void run() override;