diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-21 23:57:30 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-22 00:02:55 +0200 |
commit | fedee5430656657e4c9fff3ab21927c4323007ce (patch) | |
tree | 15f2114dc7a082a7524435dde164c933302575c6 /ftnoir_tracker_rift/ftnoir_tracker_rift.h | |
parent | 49bc9a8550a8ab1fd037da31260bb38d80b6da15 (diff) | |
parent | 52cb9e157db8823dc8318ce2df79fac837413e7f (diff) |
Merge libovr 0.2.5 changes!opentrack-2.0a5
- mm0zct & sthalik
Diffstat (limited to 'ftnoir_tracker_rift/ftnoir_tracker_rift.h')
-rw-r--r-- | ftnoir_tracker_rift/ftnoir_tracker_rift.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h index 34742d6c..970a64a2 100644 --- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h +++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h @@ -22,11 +22,10 @@ protected: private: static bool isInitialised; - OVR::Ptr<OVR::DeviceManager> pManager; - OVR::Ptr<OVR::HMDDevice> pHMD; - OVR::Ptr<OVR::SensorDevice> pSensor; - std::unique_ptr<OVR::SensorFusion> SFusion; - // Magnetometer calibration and yaw correction + OVR::DeviceManager* pManager; + OVR::HMDDevice* pHMD; + OVR::SensorDevice* pSensor; + OVR::SensorFusion* pSFusion; bool bEnableRoll; bool bEnablePitch; bool bEnableYaw; @@ -35,7 +34,7 @@ private: bool bEnableY; bool bEnableZ; #endif - QMutex mutex; + }; // Widget that has controls for FTNoIR protocol client-settings. |