From 2962c8979ccde39c2666251b463dd993c4e910d7 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 25 Jan 2018 15:15:59 -0800
Subject: [PATCH 1/2] print warnings if head position contains not-a-number

---
 interface/src/avatar/MyAvatar.cpp | 37 ++++++++++++++++++++++++-------
 libraries/animation/src/Rig.cpp   | 25 ++++++++++++++-------
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e93b897013..57d7c7533e 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -561,6 +561,12 @@ void MyAvatar::simulate(float deltaTime) {
         if (!_skeletonModel->getHeadPosition(headPosition)) {
             headPosition = getWorldPosition();
         }
+
+        if (isNaN(headPosition)) {
+            qCDebug(interfaceapp) << "MyAvatar::simulate headPosition is NaN";
+            headPosition = glm::vec3(0.0f);
+        }
+
         head->setPosition(headPosition);
         head->setScale(getModelScale());
         head->simulate(deltaTime);
@@ -2700,27 +2706,42 @@ void MyAvatar::setWalkSpeed(float value) {
 }
 
 glm::vec3 MyAvatar::getPositionForAudio() {
+    glm::vec3 result;
     switch (_audioListenerMode) {
         case AudioListenerMode::FROM_HEAD:
-            return getHead()->getPosition();
+            result = getHead()->getPosition();
         case AudioListenerMode::FROM_CAMERA:
-            return qApp->getCamera().getPosition();
+            result = qApp->getCamera().getPosition();
         case AudioListenerMode::CUSTOM:
-            return _customListenPosition;
+            result = _customListenPosition;
     }
-    return vec3();
+
+    if (isNaN(result)) {
+        qCDebug(interfaceapp) << "MyAvatar::getPositionForAudio produced NaN" << _audioListenerMode;
+        result = glm::vec3(0.0f);
+    }
+
+    return result;
 }
 
 glm::quat MyAvatar::getOrientationForAudio() {
+    glm::quat result;
+
     switch (_audioListenerMode) {
         case AudioListenerMode::FROM_HEAD:
-            return getHead()->getFinalOrientationInWorldFrame();
+            result = getHead()->getFinalOrientationInWorldFrame();
         case AudioListenerMode::FROM_CAMERA:
-            return qApp->getCamera().getOrientation();
+            result = qApp->getCamera().getOrientation();
         case AudioListenerMode::CUSTOM:
-            return _customListenOrientation;
+            result = _customListenOrientation;
     }
-    return quat();
+
+    if (isNaN(result)) {
+        qCDebug(interfaceapp) << "MyAvatar::getOrientationForAudio produced NaN" << _audioListenerMode;
+        result = glm::quat();
+    }
+
+    return result;
 }
 
 void MyAvatar::setAudioListenerMode(AudioListenerMode audioListenerMode) {
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index b1b41775a8..309bb59cff 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -445,22 +445,31 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
 }
 
 bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
+    bool success { false };
     if (QThread::currentThread() == thread()) {
         if (isIndexValid(jointIndex)) {
             position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
-            return true;
+            success = true;
         } else {
-            return false;
+            success = false;
+        }
+    } else {
+        QReadLocker readLock(&_externalPoseSetLock);
+        if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
+            position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+            success = true;
+        } else {
+            success = false;
         }
     }
 
-    QReadLocker readLock(&_externalPoseSetLock);
-    if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
-        position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
-        return true;
-    } else {
-        return false;
+    if (isNaN(position)) {
+        qCWarning(animation) << "Rig::getJointPositionInWorldFrame produces NaN";
+        success = false;
+        position = glm::vec3(0.0f);
     }
+
+    return success;
 }
 
 bool Rig::getJointPosition(int jointIndex, glm::vec3& position) const {

From b8f3d8140deb46437fd667b4762ea6a29ff43799 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 26 Jan 2018 10:34:43 -0800
Subject: [PATCH 2/2] add breaks in case statements that used to have returns

---
 interface/src/avatar/MyAvatar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 57d7c7533e..b870c61f8f 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -2710,10 +2710,13 @@ glm::vec3 MyAvatar::getPositionForAudio() {
     switch (_audioListenerMode) {
         case AudioListenerMode::FROM_HEAD:
             result = getHead()->getPosition();
+            break;
         case AudioListenerMode::FROM_CAMERA:
             result = qApp->getCamera().getPosition();
+            break;
         case AudioListenerMode::CUSTOM:
             result = _customListenPosition;
+            break;
     }
 
     if (isNaN(result)) {
@@ -2730,10 +2733,13 @@ glm::quat MyAvatar::getOrientationForAudio() {
     switch (_audioListenerMode) {
         case AudioListenerMode::FROM_HEAD:
             result = getHead()->getFinalOrientationInWorldFrame();
+            break;
         case AudioListenerMode::FROM_CAMERA:
             result = qApp->getCamera().getOrientation();
+            break;
         case AudioListenerMode::CUSTOM:
             result = _customListenOrientation;
+            break;
     }
 
     if (isNaN(result)) {