From 78c3ba0e2cf6005f2a7a5a455c292f6e40774954 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 9 Jun 2015 10:25:21 -0700 Subject: [PATCH] Removing dead code --- interface/src/devices/OculusManager.cpp | 15 --------------- interface/src/devices/OculusManager.h | 4 ---- interface/src/ui/ApplicationOverlay.cpp | 1 - 3 files changed, 20 deletions(-) diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp index 6c3a3d84a0..ef3a906878 100644 --- a/interface/src/devices/OculusManager.cpp +++ b/interface/src/devices/OculusManager.cpp @@ -740,21 +740,6 @@ void OculusManager::reset() { } } -//Gets the current predicted angles from the oculus sensors -void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) { - ovrTrackingState ts = ovrHmd_GetTrackingState(_ovrHmd, ovr_GetTimeInSeconds()); - if (ts.StatusFlags & (ovrStatus_OrientationTracked | ovrStatus_PositionTracked)) { - glm::vec3 euler = glm::eulerAngles(toGlm(ts.HeadPose.ThePose.Orientation)); - yaw = euler.y; - pitch = euler.x; - roll = euler.z; - } else { - yaw = 0.0f; - pitch = 0.0f; - roll = 0.0f; - } -} - glm::vec3 OculusManager::getRelativePosition() { ovrTrackingState trackingState = ovrHmd_GetTrackingState(_ovrHmd, ovr_GetTimeInSeconds()); return toGlm(trackingState.HeadPose.ThePose.Position); diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h index f5265f3a74..b82379a7b3 100644 --- a/interface/src/devices/OculusManager.h +++ b/interface/src/devices/OculusManager.h @@ -52,10 +52,6 @@ public: static void display(QGLWidget * glCanvas, RenderArgs* renderArgs, const glm::quat &bodyOrientation, const glm::vec3 &position, Camera& whichCamera); static void reset(); - /// param \yaw[out] yaw in radians - /// param \pitch[out] pitch in radians - /// param \roll[out] roll in radians - static void getEulerAngles(float& yaw, float& pitch, float& roll); static glm::vec3 getRelativePosition(); static glm::quat getOrientation(); static QSize getRenderTargetSize(); diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 7768b32eed..59ae786008 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -573,7 +573,6 @@ void ApplicationOverlay::renderPointers() { _lastMouseMove = usecTimestampNow(); } else if (usecTimestampNow() - _lastMouseMove > MAX_IDLE_TIME * USECS_PER_SECOND) { //float pitch = 0.0f, yaw = 0.0f, roll = 0.0f; // radians - //OculusManager::getEulerAngles(yaw, pitch, roll); glm::quat orientation = qApp->getHeadOrientation(); // (glm::vec3(pitch, yaw, roll)); glm::vec3 result;