Merged in fixes to hydra and rift code, along with a bug in the pitch inversion of FTNoIR itself.

Also added an include directory the Rift needs which was absent before.

1 files changed, 1 insertions, 1 deletions

diff --git a/facetracknoir/tracker_types.cpp b/facetracknoir/tracker_types.cpp
index 11adc985..89a06d7e 100644
--- a/facetracknoir/tracker_types.cpp
+++ b/facetracknoir/tracker_types.cpp
@@ -13,10 +13,10 @@ T6DOF operator-(const T6DOF& A, const T6DOF& B)
 

 	T6DOF C;

     R_C.toEuler(C.axes[Yaw], C.axes[Pitch], C.axes[Roll]);

+    R_C.toEuler(C.axes[Yaw], C.axes[Pitch], C.axes[Roll]);

     C.axes[Yaw] *= R2D;

     C.axes[Pitch] *= R2D;

     C.axes[Roll] *= R2D;

-

     C.axes[TX] = A.axes[TX] - B.axes[TX];

     C.axes[TY] = A.axes[TY] - B.axes[TY];

     C.axes[TZ] = A.axes[TZ] - B.axes[TZ];