diff options
Diffstat (limited to 'facetracknoir')
| -rw-r--r-- | facetracknoir/facetracknoir.cpp | 3 | ||||
| -rw-r--r-- | facetracknoir/facetracknoir.h | 3 | ||||
| -rw-r--r-- | facetracknoir/main.cpp | 3 | ||||
| -rw-r--r-- | facetracknoir/rotation.cpp | 15 | ||||
| -rw-r--r-- | facetracknoir/tracker.cpp | 2 | ||||
| -rw-r--r-- | facetracknoir/tracker_types.cpp | 2 |
6 files changed, 9 insertions, 19 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 623b16b2..aa072401 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -683,7 +683,8 @@ void FaceTrackNoIR::startTracker( ) { //
tracker->setInvertAxis(Yaw, ui.chkInvertYaw->isChecked() );
tracker->setInvertAxis(Pitch, ui.chkInvertPitch->isChecked() );
- tracker->setInvertAxis(Roll, ui.chkInvertRoll->isChecked() ); tracker->setInvertAxis(TX, ui.chkInvertX->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() );
diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index a6d99165..fd9c06a7 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -186,7 +186,8 @@ private: void setInvertAxis( Axis axis, int invert );
void setInvertYaw(int invert) {
- setInvertAxis(Yaw, invert); }
+ setInvertAxis(Yaw, invert);
+ }
void setInvertPitch(int invert) {
setInvertAxis(Pitch, invert);
}
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index 01b9d8ea..8ba437bf 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -40,6 +40,9 @@ #endif
int main(int argc, char** argv)
{
+#if defined(_WIN32)
+ (void) timeBeginPeriod(1);
+#endif
QApplication app(argc, argv);
QFont font;
font.setFamily(font.defaultFamily());
diff --git a/facetracknoir/rotation.cpp b/facetracknoir/rotation.cpp deleted file mode 100644 index 1a6e1e8e..00000000 --- a/facetracknoir/rotation.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright (c) 2012 Patrick Ruoff
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#include "rotation.h"
-
-
-
-// ----------------------------------------------------------------------------
-
-
-
diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp index 25e09126..e34bf25e 100644 --- a/facetracknoir/tracker.cpp +++ b/facetracknoir/tracker.cpp @@ -200,7 +200,7 @@ void Tracker::run() { }
//for lower cpu load
- usleep(1000);
+ msleep(1);
}
for (int i = 0; i < 6; i++)
diff --git a/facetracknoir/tracker_types.cpp b/facetracknoir/tracker_types.cpp index 89a06d7e..11adc985 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];
|