From e6fb571266c22f120c0111731da1f2e6bf4d812d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 9 May 2016 16:20:07 +0200 Subject: tracker/rift-042: reformat, remove outdated todo --- tracker-rift-042/ftnoir_tracker_rift_042.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 tracker-rift-042/ftnoir_tracker_rift_042.cpp diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_042.cpp old mode 100644 new mode 100755 index deea4a08..bee19ee6 --- a/tracker-rift-042/ftnoir_tracker_rift_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_042.cpp @@ -4,6 +4,7 @@ #include "OVR_CAPI.h" #include "Kernel/OVR_Math.h" #include +#include using namespace OVR; @@ -38,16 +39,18 @@ void Rift_Tracker::data(double *data) { if (hmd) { - ovrHSWDisplayState hsw; - if (ovrHmd_GetHSWDisplayState(hmd, &hsw), hsw.Displayed) + ovrHSWDisplayState hsw; + std::memset(&hsw, 0, sizeof(hsw)); + ovrHmd_GetHSWDisplayState(hmd, &hsw); + if (hsw.Displayed) ovrHmd_DismissHSWDisplay(hmd); ovrTrackingState ss = ovrHmd_GetTrackingState(hmd, 0); - if(ss.StatusFlags & ovrStatus_OrientationTracked) { + if (ss.StatusFlags & ovrStatus_OrientationTracked) + { auto pose = ss.HeadPose.ThePose; Quatf quat = pose.Orientation; float yaw, pitch, roll; quat.GetEulerAngles(&yaw, &pitch, &roll); - // XXX TODO move to core if (s.useYawSpring) { yaw = old_yaw*s.persistence + (yaw-old_yaw); -- cgit v1.2.3