Merge branch 'unstable' into trackhat

* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name

1 files changed, 60 insertions, 0 deletions

diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h
new file mode 100644
index 00000000..08684dd2
--- /dev/null
+++ b/tracker-rift-080/ftnoir_tracker_rift_080.h
@@ -0,0 +1,60 @@
+#pragma once
+#include "ui_ftnoir_rift_clientcontrols_080.h"
+#include <QMessageBox>
+#include <QWaitCondition>
+#include <cmath>
+#include "opentrack/plugin-api.hpp"
+#include "OVR.h"
+#include <memory>
+#include "opentrack/options.hpp"
+using namespace options;
+
+struct settings : opts {
+    value<bool> useYawSpring;
+    value<double> constant_drift, persistence, deadzone;
+    settings() :
+        opts("Rift"),
+        useYawSpring(b, "yaw-spring", false),
+        constant_drift(b, "constant-drift", 0.000005),
+        persistence(b, "persistence", 0.99999),
+        deadzone(b, "deadzone", 0.02)
+    {}
+};
+
+class Rift_Tracker : public ITracker
+{
+public:
+    Rift_Tracker();
+    ~Rift_Tracker() override;
+    void start_tracker(QFrame *) override;
+    void data(double *data) override;
+private:
+    double old_yaw;
+    ovrSession hmd;
+    settings s;
+};
+
+class TrackerControls: public ITrackerDialog
+{
+    Q_OBJECT
+public:
+    TrackerControls();
+
+    void register_tracker(ITracker *) {}
+    void unregister_tracker() {}
+
+private:
+    Ui::UIRiftControls ui;
+    settings s;
+private slots:
+    void doOK();
+    void doCancel();
+};
+
+class FTNoIR_TrackerDll : public Metadata
+{
+public:
+    QString name() { return QString("Oculus Rift runtime 0.8.0 -- HMD"); }
+    QIcon icon() { return QIcon(":/images/rift_tiny.png"); }
+};
+