Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 0 insertions, 19 deletions

diff --git a/facetracknoir/tracker_types.h b/facetracknoir/tracker_types.h
deleted file mode 100644
index a367371e..00000000
--- a/facetracknoir/tracker_types.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __TRACKER_TYPES_H__
-#define __TRACKER_TYPES_H__
-
-#include "ftnoir_tracker_base/ftnoir_tracker_types.h"
-
-struct T6DOF {
-public:
-    double axes[6];
-
-    T6DOF() {
-        for (int i = 0; i < 6; i++)
-            axes[i] = 0;
-    }
-};
-
-T6DOF operator-(const T6DOF& A, const T6DOF& B); // get new pose with respect to reference pose B
-T6DOF operator+(const T6DOF& A, const T6DOF& B); // get new pose with respect to reference pose B^-1
-
-#endif //__TRACKER_TYPES_H__