diff options
Diffstat (limited to 'ftnoir_tracker_rift')
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_tracker_rift.cpp | 5 | ||||
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_tracker_rift.h | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp index 3ef68260..367ab389 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp @@ -66,8 +66,7 @@ void Rift_Tracker::StartTracker(QFrame* videoFrame) }else{ QMessageBox::warning(0,"FaceTrackNoIR Error", "Unable to find Rift tracker",QMessageBox::Ok,QMessageBox::NoButton); } - isCalibrated = false; - MagCal.BeginAutoCalibration(SFusion); + //MagCal.BeginAutoCalibration(SFusion); SFusion.SetMagReference(SFusion.GetOrientation()); } } @@ -89,7 +88,7 @@ bool Rift_Tracker::GiveHeadPoseData(double *data) #endif // Magnetometer calibration procedure - MagCal.UpdateAutoCalibration(SFusion); + //MagCal.UpdateAutoCalibration(SFusion); Quatf hmdOrient = SFusion.GetOrientation(); float yaw = 0.0f; float pitch = 0.0f; diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index 631cc213..0f3bc099 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -16,9 +16,7 @@ public: bool GiveHeadPoseData(double *data); void loadSettings(); volatile bool should_quit; - void WaitForExit() { - return; - } + void WaitForExit() {} protected: void run(); // qthread override run method @@ -51,8 +49,8 @@ public: void showEvent ( QShowEvent * event ); void Initialize(QWidget *parent); - void registerTracker(ITracker *tracker) {}; - void unRegisterTracker() {}; + void registerTracker(ITracker *tracker) {} + void unRegisterTracker() {} private: Ui::UIRiftControls ui; @@ -65,8 +63,8 @@ private: private slots: void doOK(); void doCancel(); - void settingChanged() { settingsDirty = true; }; - void settingChanged(int) { settingsDirty = true; }; + void settingChanged() { settingsDirty = true; } + void settingChanged(int) { settingsDirty = true; } }; //******************************************************************************************************* |