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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 42 insertions, 0 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
new file mode 100644
index 000000000..fb756a867
--- /dev/null
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.cpp
@@ -0,0 +1,42 @@
+/* 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 "ftnoir_tracker_pt_dll.h"
+#include <QIcon>
+
+//-----------------------------------------------------------------------------
+void TrackerDll::getFullName(QString *strToBeFilled)
+{
+	*strToBeFilled = "PointTracker 1.1";
+}
+
+void TrackerDll::getShortName(QString *strToBeFilled)
+{
+	*strToBeFilled = "PointTracker";
+}
+
+void TrackerDll::getDescription(QString *strToBeFilled)
+{
+	*strToBeFilled = "Tracks a 3-point model with know geometry like Freetrack / TrackIR";
+}
+
+void TrackerDll::getIcon(QIcon *icon)
+{
+    *icon = QIcon(":/Resources/Logo_IR.png");
+}
+
+
+#ifdef OPENTRACK_API
+#   include "facetracknoir/plugin-support.h"
+extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
+#else
+#   pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
+OPENTRACK_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()
+#endif
+{
+	return new TrackerDll;
+}