From eca05d9c4281cc12187c77abb698f1332f7bf434 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 1 Jun 2017 10:57:53 -0700
Subject: [PATCH] more use of head input

---
 interface/src/avatar/MySkeletonModel.cpp          | 3 +--
 interface/src/scripting/HMDScriptingInterface.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 20b9ee2850..84e4a9ff83 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -59,8 +59,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     } else {
         if (qApp->isHMDMode()) {
             // get HMD position from sensor space into world space, and back into rig space
-            // glm::mat4 worldHMDMat = myAvatar->getHeadControllerPoseInWorldFrame();
-            glm::mat4 worldHMDMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+            glm::mat4 worldHMDMat = myAvatar->getHeadControllerPoseInWorldFrame();
             glm::mat4 rigToWorld = createMatFromQuatAndPos(getRotation(), getTranslation());
             glm::mat4 worldToRig = glm::inverse(rigToWorld);
             glm::mat4 rigHMDMat = worldToRig * worldHMDMat;
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index ecc207a519..1227f46eb6 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -122,8 +122,8 @@ bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {
 
 glm::mat4 HMDScriptingInterface::getWorldHMDMatrix() const {
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    // return myAvatar->getSensorToWorldMatrix() * (glm::mat4)myAvatar->getHeadControllerPoseInSensorFrame();
-    return myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+    // return myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+    return myAvatar->getSensorToWorldMatrix() * myAvatar->getHeadControllerPoseInSensorFrame().getMatrix() * Matrices::Y_180;
 }
 
 glm::vec3 HMDScriptingInterface::getPosition() const {