From 2b10fea00620341c5bb39731e8720309b3072995 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <ajt@highfidelity.io>
Date: Tue, 9 Feb 2016 14:03:39 -0800
Subject: [PATCH] SpatiallyNestable: warn on failure.

---
 interface/src/avatar/MyAvatar.cpp          |  8 ++++++-
 libraries/shared/src/SpatiallyNestable.cpp | 25 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index bce08d6e19..4fdca3840e 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1080,7 +1080,13 @@ void MyAvatar::prepareForPhysicsSimulation() {
     relayDriveKeysToCharacterController();
 
     bool success;
-    _characterController.setParentVelocity(getParentVelocity(success));
+    glm::vec3 parentVelocity = getParentVelocity(success);
+    if (!success) {
+        qDebug() << "Warning: getParentVelocity failed" << getID();
+        parentVelocity = glm::vec3();
+    }
+    _characterController.setParentVelocity(parentVelocity);
+
     _characterController.setTargetVelocity(getTargetVelocity());
     _characterController.setPositionAndOrientation(getPosition(), getOrientation());
     if (qApp->isHMDMode()) {
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 48238977d1..d3048194b4 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -404,7 +404,11 @@ glm::vec3 SpatiallyNestable::getVelocity(bool& success) const {
 
 glm::vec3 SpatiallyNestable::getVelocity() const {
     bool success;
-    return getVelocity(success);
+    glm::vec3 result = getVelocity(success);
+    if (!success) {
+        qDebug() << "Warning -- setVelocity failed" << getID();
+    }
+    return result;
 }
 
 void SpatiallyNestable::setVelocity(const glm::vec3& velocity, bool& success) {
@@ -419,6 +423,9 @@ void SpatiallyNestable::setVelocity(const glm::vec3& velocity, bool& success) {
 void SpatiallyNestable::setVelocity(const glm::vec3& velocity) {
     bool success;
     setVelocity(velocity, success);
+    if (!success) {
+        qDebug() << "Warning -- setVelocity failed" << getID();
+    }
 }
 
 glm::vec3 SpatiallyNestable::getParentVelocity(bool& success) const {
@@ -442,7 +449,11 @@ glm::vec3 SpatiallyNestable::getAngularVelocity(bool& success) const {
 
 glm::vec3 SpatiallyNestable::getAngularVelocity() const {
     bool success;
-    return getAngularVelocity(success);
+    glm::vec3 result = getAngularVelocity(success);
+    if (!success) {
+        qDebug() << "Warning -- getAngularVelocity failed" << getID();
+    }
+    return result;
 }
 
 void SpatiallyNestable::setAngularVelocity(const glm::vec3& angularVelocity, bool& success) {
@@ -456,10 +467,18 @@ void SpatiallyNestable::setAngularVelocity(const glm::vec3& angularVelocity, boo
 void SpatiallyNestable::setAngularVelocity(const glm::vec3& angularVelocity) {
     bool success;
     setAngularVelocity(angularVelocity, success);
+    if (!success) {
+        qDebug() << "Warning -- setAngularVelocity failed" << getID();
+    }
 }
 
 glm::vec3 SpatiallyNestable::getParentAngularVelocity(bool& success) const {
-    return glm::vec3();
+    glm::vec3 result;
+    SpatiallyNestablePointer parent = getParentPointer(success);
+    if (success && parent) {
+        result = parent->getAngularVelocity(success);
+    }
+    return result;
 }
 
 const Transform SpatiallyNestable::getTransform(bool& success) const {