Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 44 insertions, 44 deletions

diff --git a/facetracknoir/tracker_types.cpp b/facetracknoir/tracker_types.cpp
index 11adc985..da246722 100644
--- a/facetracknoir/tracker_types.cpp
+++ b/facetracknoir/tracker_types.cpp
@@ -1,44 +1,44 @@
-#include "tracker_types.h"

-#include "rotation.h"

-

-#define PI 3.14159265358979323846264

-#define D2R PI/180.0

-#define R2D 180.0/PI

-

-T6DOF operator-(const T6DOF& A, const T6DOF& B)

-{

-    Rotation R_A(A.axes[Yaw]*D2R, A.axes[Pitch]*D2R, A.axes[Roll]*D2R);

-    Rotation R_B(B.axes[Yaw]*D2R, B.axes[Pitch]*D2R, B.axes[Roll]*D2R);

-	Rotation R_C = R_A * R_B.inv();

-

-	T6DOF C;

-    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];

-	//C.frame_number?

-	return C;

-}

-

-T6DOF operator+(const T6DOF& A, const T6DOF& B)

-{

-    Rotation R_A(A.axes[Yaw]*D2R, A.axes[Pitch]*D2R, A.axes[Roll]*D2R);

-    Rotation R_B(B.axes[Yaw]*D2R, B.axes[Pitch]*D2R, B.axes[Roll]*D2R);

-	Rotation R_C = R_A * R_B;

-

-	T6DOF C;

-    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];

-	//C.frame_number?

-	return C;

-}

+#include "tracker_types.h"
+#include "rotation.h"
+
+#define PI 3.14159265358979323846264
+#define D2R PI/180.0
+#define R2D 180.0/PI
+
+T6DOF operator-(const T6DOF& A, const T6DOF& B)
+{
+    Rotation R_A(A.axes[Yaw]*D2R, A.axes[Pitch]*D2R, A.axes[Roll]*D2R);
+    Rotation R_B(B.axes[Yaw]*D2R, B.axes[Pitch]*D2R, B.axes[Roll]*D2R);
+	Rotation R_C = R_A * R_B.inv();
+
+	T6DOF C;
+    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];
+	//C.frame_number?
+	return C;
+}
+
+T6DOF operator+(const T6DOF& A, const T6DOF& B)
+{
+    Rotation R_A(A.axes[Yaw]*D2R, A.axes[Pitch]*D2R, A.axes[Roll]*D2R);
+    Rotation R_B(B.axes[Yaw]*D2R, B.axes[Pitch]*D2R, B.axes[Roll]*D2R);
+	Rotation R_C = R_A * R_B;
+
+	T6DOF C;
+    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];
+	//C.frame_number?
+	return C;
+}