diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-21 00:27:30 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-21 00:27:30 +0200 |
| commit | c58db6e1df2a47bd10bcbd82624604d05ccd28b3 (patch) | |
| tree | 033f0f61a69794494c647f07ae161d7639fd438f /ftnoir_tracker_rift/ftnoir_tracker_rift.h | |
| parent | e45ea26f4a43fc38d47dbc2edfbf31c8efa41edd (diff) | |
Update to libovr 0.2.5, fix crash when no device attached.
Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
In-absence-of: mm0zct
Diffstat (limited to 'ftnoir_tracker_rift/ftnoir_tracker_rift.h')
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_tracker_rift.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index 579d7d34..34742d6c 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -6,18 +6,17 @@ #include <math.h> #include "facetracknoir/global-settings.h" #include "OVR.h" -#include "Util/Util_MagCalibration.h" +#include <memory> class Rift_Tracker : public ITracker { public: Rift_Tracker(); - ~Rift_Tracker(); + virtual ~Rift_Tracker(); void StartTracker( QFrame *videoframe ); bool GiveHeadPoseData(double *data); void loadSettings(); volatile bool should_quit; - void WaitForExit() {} protected: void run(); // qthread override run method @@ -26,12 +25,8 @@ private: OVR::Ptr<OVR::DeviceManager> pManager; OVR::Ptr<OVR::HMDDevice> pHMD; OVR::Ptr<OVR::SensorDevice> pSensor; - OVR::SensorFusion SFusion; + std::unique_ptr<OVR::SensorFusion> SFusion; // Magnetometer calibration and yaw correction - OVR::Util::MagCalibration MagCal; - bool isCalibrated; - double old_yaw; - double newHeadPose[6]; // Structure with new headpose bool bEnableRoll; bool bEnablePitch; bool bEnableYaw; |