diff options
| author | mm0zct <the_cartographer@hotmail.com> | 2013-06-29 19:26:59 +0100 |
|---|---|---|
| committer | mm0zct <the_cartographer@hotmail.com> | 2013-06-29 19:26:59 +0100 |
| commit | 5368b98cd09f61a1e3344efed9ad90ac9989726e (patch) | |
| tree | 9dcf4c45582087a5bbac2d0c00cb61f0f90afde8 /ftnoir_tracker_rift/ftnoir_tracker_rift.h | |
| parent | 8ab86902935f402c4ab529741a0afa5baf972ca1 (diff) | |
Merged in fixes to hydra and rift code, along with a bug in the pitch inversion of FTNoIR itself.
Also added an include directory the Rift needs which was absent before.
Diffstat (limited to 'ftnoir_tracker_rift/ftnoir_tracker_rift.h')
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_tracker_rift.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index 0f3bc099..7bacb91c 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -6,6 +6,7 @@ #include <math.h> #include "facetracknoir/global-settings.h" #include "OVR.h" +#include "Util/Util_MagCalibration.h" class Rift_Tracker : public ITracker { public: @@ -26,6 +27,10 @@ private: OVR::Ptr<OVR::HMDDevice> pHMD; OVR::Ptr<OVR::SensorDevice> pSensor; OVR::SensorFusion SFusion; + // Magnetometer calibration and yaw correction + OVR::Util::MagCalibration MagCal; + bool isCalibrated; + double newHeadPose[6]; // Structure with new headpose bool bEnableRoll; bool bEnablePitch; |