diff options
| author | mm0zct <the_cartographer@hotmail.com> | 2013-10-21 21:30:14 +0100 |
|---|---|---|
| committer | mm0zct <the_cartographer@hotmail.com> | 2013-10-21 21:30:14 +0100 |
| commit | 6f51a22726266cc88cb061cab2c2bfead49ed4ef (patch) | |
| tree | f594048c4d3596f6d5254c0fb454482a9500ca5d /ftnoir_tracker_rift/ftnoir_tracker_rift.h | |
| parent | bfcfdb8827507de1091d6b92081a78eb8e4df9da (diff) | |
| parent | 5048961fa205ecebb2cea4f8d68d51dfbe993189 (diff) | |
Merge branch 'feature/libovr-0.2.5' of https://github.com/opentrack/opentrack into feature/tracker_hotkeys
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; |