1 files changed, 22 insertions, 28 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
index 3920c6ad..7162b7ca 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
@@ -2,12 +2,30 @@
 #include "ftnoir_tracker_base/ftnoir_tracker_base.h"
 #include "ui_ftnoir_rift_clientcontrols.h"
 #include <QMessageBox>
-#include <QSettings>
 #include <QWaitCondition>
 #include <cmath>
 #include "facetracknoir/global-settings.h"
 #include "OVR.h"
 #include <memory>
+#include "facetracknoir/options.h"
+using namespace options;
+
+struct settings {
+    pbundle b;
+    value<bool> bEnableYaw, bEnablePitch, bEnableRoll, useYawSpring;
+    value<double> constant_drift, persistence, deadzone;
+    settings() :
+        b(bundle("Rift")),
+        bEnableYaw(b, "EnableYaw", true),
+        bEnablePitch(b, "EnablePitch", true),
+        bEnableRoll(b, "EnableRoll", true),
+        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:
@@ -16,7 +34,6 @@ public:
 
     void StartTracker(QFrame *) virt_override;
     void GetHeadPoseData(double *data) virt_override;
-    void loadSettings();
     virtual int preferredHz() virt_override { return 250; }
     volatile bool should_quit;
 protected:
@@ -27,50 +44,27 @@ private:
 	OVR::DeviceManager* pManager;
 	OVR::SensorDevice* pSensor;
 	OVR::SensorFusion* pSFusion;
-	bool bEnableRoll;
-	bool bEnablePitch;
-	bool bEnableYaw;
-#if 0
-	bool bEnableX;
-	bool bEnableY;
-	bool bEnableZ;
-#endif
-    bool useYawSpring;
-    double old_yaw, constant_drift, persistence, deadzone;
+    settings s;
+    double old_yaw;
 };
 
-// Widget that has controls for FTNoIR protocol client-settings.
 class TrackerControls: public QWidget, public ITrackerDialog
 {
     Q_OBJECT
 public:
-
 	explicit TrackerControls();
-    ~TrackerControls();
-    void showEvent (QShowEvent *);
 
-    void Initialize(QWidget *parent);
     void registerTracker(ITracker *) {}
 	void unRegisterTracker() {}
 
 private:
 	Ui::UIRiftControls ui;
-	void loadSettings();
-	void save();
-
-	/** helper **/
-	bool settingsDirty;
-
+    settings s;
 private slots:
 	void doOK();
 	void doCancel();
-	void settingChanged() { settingsDirty = true; }
-	void settingChanged(int) { settingsDirty = true; }
 };
 
-//*******************************************************************************************************
-// FaceTrackNoIR Tracker DLL. Functions used to get general info on the Tracker
-//*******************************************************************************************************
 class FTNoIR_TrackerDll : public Metadata
 {
 public: