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, 5 insertions, 3 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index fafef908..623b16b2 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -682,9 +682,8 @@ void FaceTrackNoIR::startTracker( ) {
 	// This is necessary, because the events are only triggered 'on change'

 	//

     tracker->setInvertAxis(Yaw, ui.chkInvertYaw->isChecked() );

-    tracker->setInvertAxis(TY, ui.chkInvertPitch->isChecked() );

-    tracker->setInvertAxis(Roll, ui.chkInvertRoll->isChecked() );

-    tracker->setInvertAxis(TX, ui.chkInvertX->isChecked() );

+    tracker->setInvertAxis(Pitch, ui.chkInvertPitch->isChecked() );

+    tracker->setInvertAxis(Roll, ui.chkInvertRoll->isChecked() );    tracker->setInvertAxis(TX, ui.chkInvertX->isChecked() );

     tracker->setInvertAxis(TY, ui.chkInvertY->isChecked() );

     tracker->setInvertAxis(TZ, ui.chkInvertZ->isChecked() );

 

@@ -849,6 +848,7 @@ void FaceTrackNoIR::showHeadPose() {
     ui.lcdNumY->display(QString("%1").arg(newdata[TY], 0, 'f', 1));

     ui.lcdNumZ->display(QString("%1").arg(newdata[TZ], 0, 'f', 1));

 

+

     ui.lcdNumRotX->display(QString("%1").arg(newdata[Yaw], 0, 'f', 1));

     ui.lcdNumRotY->display(QString("%1").arg(newdata[Pitch], 0, 'f', 1));

     ui.lcdNumRotZ->display(QString("%1").arg(newdata[Roll], 0, 'f', 1));

@@ -859,12 +859,14 @@ void FaceTrackNoIR::showHeadPose() {
 	// Get the output-pose and also display it.

 	//

     tracker->getOutputHeadPose(newdata);

+

     ui.pose_display->rotateBy(newdata[Yaw], newdata[Roll], newdata[Pitch]);

 

     ui.lcdNumOutputPosX->display(QString("%1").arg(newdata[TX], 0, 'f', 1));

     ui.lcdNumOutputPosY->display(QString("%1").arg(newdata[TY], 0, 'f', 1));

     ui.lcdNumOutputPosZ->display(QString("%1").arg(newdata[TZ], 0, 'f', 1));

 

+

     ui.lcdNumOutputRotX->display(QString("%1").arg(newdata[Yaw], 0, 'f', 1));

     ui.lcdNumOutputRotY->display(QString("%1").arg(newdata[Pitch], 0, 'f', 1));

     ui.lcdNumOutputRotZ->display(QString("%1").arg(newdata[Roll], 0, 'f', 1));