From 2633cb1f272d4274929dae9cceae0b3731a2f70a Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 22 Jan 2016 11:54:24 -0800
Subject: [PATCH] rename NaN functions for vec3 and quat

---
 libraries/shared/src/AACube.cpp            |  8 +-------
 libraries/shared/src/GLMHelpers.cpp        |  4 ++--
 libraries/shared/src/GLMHelpers.h          |  4 ++--
 libraries/shared/src/SpatiallyNestable.cpp | 12 ++++++------
 libraries/shared/src/Transform.cpp         | 11 +----------
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/libraries/shared/src/AACube.cpp b/libraries/shared/src/AACube.cpp
index 8118d276d7..bc97a6ff69 100644
--- a/libraries/shared/src/AACube.cpp
+++ b/libraries/shared/src/AACube.cpp
@@ -480,11 +480,5 @@ AACube& AACube::operator += (const glm::vec3& point) {
 }
 
 bool AACube::containsNaN() const {
-    if (isVec3NaN(_corner)) {
-        return true;
-    }
-    if (isNaN(_scale)) {
-        return true;
-    }
-    return false;
+    return isNaN(_corner) || isNaN(_scale);
 }
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index 57bfff8b9d..d95314eca8 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -425,10 +425,10 @@ void generateBasisVectors(const glm::vec3& primaryAxis, const glm::vec3& seconda
     vAxisOut = glm::cross(wAxisOut, uAxisOut);
 }
 
-bool isVec3NaN(glm::vec3 value) {
+bool isNaN(glm::vec3 value) {
     return isNaN(value.x) || isNaN(value.y) || isNaN(value.z);
 }
 
-bool isQuatNaN(glm::quat value) {
+bool isNaN(glm::quat value) {
     return isNaN(value.w) || isNaN(value.x) || isNaN(value.y) || isNaN(value.z);
 }
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index b6a9af78c7..7dc615b114 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -225,7 +225,7 @@ void generateBasisVectors(const glm::vec3& primaryAxis, const glm::vec3& seconda
                           glm::vec3& uAxisOut, glm::vec3& vAxisOut, glm::vec3& wAxisOut);
 
 
-bool isVec3NaN(glm::vec3 value);
-bool isQuatNaN(glm::quat value);
+bool isNaN(glm::vec3 value);
+bool isNaN(glm::quat value);
 
 #endif // hifi_GLMHelpers_h
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 591bf1d0cf..e5719c17ff 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -315,7 +315,7 @@ glm::vec3 SpatiallyNestable::getPosition(int jointIndex, bool& success) const {
 
 void SpatiallyNestable::setPosition(const glm::vec3& position, bool& success) {
     // guard against introducing NaN into the transform
-    if (isVec3NaN(position)) {
+    if (isNaN(position)) {
         success = false;
         return;
     }
@@ -364,7 +364,7 @@ glm::quat SpatiallyNestable::getOrientation(int jointIndex, bool& success) const
 
 void SpatiallyNestable::setOrientation(const glm::quat& orientation, bool& success) {
     // guard against introducing NaN into the transform
-    if (isQuatNaN(orientation)) {
+    if (isNaN(orientation)) {
         success = false;
         return;
     }
@@ -448,7 +448,7 @@ glm::vec3 SpatiallyNestable::getScale(int jointIndex) const {
 
 void SpatiallyNestable::setScale(const glm::vec3& scale) {
     // guard against introducing NaN into the transform
-    if (isVec3NaN(scale)) {
+    if (isNaN(scale)) {
         qDebug() << "SpatiallyNestable::setLocalScale -- scale contains NaN";
         return;
     }
@@ -489,7 +489,7 @@ glm::vec3 SpatiallyNestable::getLocalPosition() const {
 
 void SpatiallyNestable::setLocalPosition(const glm::vec3& position) {
     // guard against introducing NaN into the transform
-    if (isVec3NaN(position)) {
+    if (isNaN(position)) {
         qDebug() << "SpatiallyNestable::setLocalPosition -- position contains NaN";
         return;
     }
@@ -509,7 +509,7 @@ glm::quat SpatiallyNestable::getLocalOrientation() const {
 
 void SpatiallyNestable::setLocalOrientation(const glm::quat& orientation) {
     // guard against introducing NaN into the transform
-    if (isQuatNaN(orientation)) {
+    if (isNaN(orientation)) {
         qDebug() << "SpatiallyNestable::setLocalOrientation -- orientation contains NaN";
         return;
     }
@@ -530,7 +530,7 @@ glm::vec3 SpatiallyNestable::getLocalScale() const {
 
 void SpatiallyNestable::setLocalScale(const glm::vec3& scale) {
     // guard against introducing NaN into the transform
-    if (isVec3NaN(scale)) {
+    if (isNaN(scale)) {
         qDebug() << "SpatiallyNestable::setLocalScale -- scale contains NaN";
         return;
     }
diff --git a/libraries/shared/src/Transform.cpp b/libraries/shared/src/Transform.cpp
index 3e75b58816..a3a3c05731 100644
--- a/libraries/shared/src/Transform.cpp
+++ b/libraries/shared/src/Transform.cpp
@@ -152,14 +152,5 @@ QJsonObject Transform::toJson(const Transform& transform) {
 }
 
 bool Transform::containsNaN() const {
-    if (isQuatNaN(_rotation)) {
-        return true;
-    }
-    if (isVec3NaN(_scale)) {
-        return true;
-    }
-    if (isVec3NaN(_translation)) {
-        return true;
-    }
-    return false;
+    return isNaN(_rotation) || isNaN(_scale) || isNaN(_translation);
 }