From ad5a6fac626b1c6d5a119842c7c8c622687ce340 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 7 Oct 2015 15:10:40 +0200
Subject: [PATCH] - applying of new qApp accessing method. - Some magic
 constant replacements with Helper "glm::vec3(matrix[3])" ->
 "extractTranslation(matrix)"

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

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 7592aad061..7baa6cf66f 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1345,11 +1345,11 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl
         glm::mat4 headPose = qApp->getActiveDisplayPlugin()->getHeadPose();
         glm::mat4 leftEyePose = qApp->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Left);
         leftEyePose = leftEyePose * headPose;
-        glm::vec3 leftEyePosition = glm::vec3(leftEyePose[3]);
+        glm::vec3 leftEyePosition = extractTranslation(leftEyePose);
         glm::mat4 rightEyePose = qApp->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Right);
         rightEyePose = rightEyePose * headPose;
-        glm::vec3 rightEyePosition = glm::vec3(rightEyePose[3]);
-        glm::vec3 headPosition = glm::vec3(headPose[3]);
+        glm::vec3 rightEyePosition = extractTranslation(rightEyePose);
+        glm::vec3 headPosition = extractTranslation(headPose);
 
         getHead()->renderLookAts(renderArgs,
             cameraPosition + getOrientation() * (leftEyePosition - headPosition),
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index f8a0ba7ed6..28d358fa39 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -70,14 +70,14 @@ glm::mat4 HMDScriptingInterface::getWorldHMDMatrix() const {
 }
 
 glm::vec3 HMDScriptingInterface::getPosition() const {
-    if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) {
+    if (qApp->getActiveDisplayPlugin()->isHmd()) {
         return extractTranslation(getWorldHMDMatrix());
     }
     return glm::vec3();
 }
 
 glm::quat HMDScriptingInterface::getOrientation() const {
-    if (Application::getInstance()->getActiveDisplayPlugin()->isHmd()) {
+    if (qApp->getActiveDisplayPlugin()->isHmd()) {
         return glm::normalize(glm::quat_cast(getWorldHMDMatrix()));
     }
     return glm::quat();