From b7f501c0b3aee31c9fba328b536e235b90cb2fac Mon Sep 17 00:00:00 2001 From: "U-GAPOS\\andrew" Date: Thu, 19 Nov 2015 10:42:53 -0800 Subject: [PATCH 1/2] use glm::quat_cast instead of extractRotation() --- interface/src/avatar/MyAvatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 1c151bcd3f..989a81fc0c 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -428,7 +428,7 @@ void MyAvatar::updateHMDFollowVelocity() { } if (_followSpeed > 0.0f) { // to compute new velocity we must rotate offset into the world-frame - glm::quat sensorToWorldRotation = extractRotation(_sensorToWorldMatrix); + glm::quat sensorToWorldRotation = glm::normalize(glm::quat_cast(_sensorToWorldMatrix)); _followVelocity = _followSpeed * glm::normalize(sensorToWorldRotation * offset); } } From 28e349f421225fb3ec085f86a29291705b9b1f23 Mon Sep 17 00:00:00 2001 From: "U-GAPOS\\andrew" Date: Thu, 19 Nov 2015 10:43:40 -0800 Subject: [PATCH 2/2] remeasure sensor after recentering --- plugins/oculus/src/OculusBaseDisplayPlugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index 4c80b9a51d..7fd956a08f 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -29,6 +29,7 @@ glm::mat4 OculusBaseDisplayPlugin::getProjection(Eye eye, const glm::mat4& baseP void OculusBaseDisplayPlugin::resetSensors() { #if (OVR_MAJOR_VERSION >= 6) ovr_RecenterPose(_hmd); + preRender(); #endif }