From edc312199ddaac0efea77f3912e94d0111b7bffc Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 6 Dec 2015 06:16:47 -0800 Subject: [PATCH] rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit# --- libraries/shared/src/SpatiallyNestable.cpp | 4 ++-- libraries/shared/src/SpatiallyNestable.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp index 0d7d2a7652..0a2310e43e 100644 --- a/libraries/shared/src/SpatiallyNestable.cpp +++ b/libraries/shared/src/SpatiallyNestable.cpp @@ -232,7 +232,7 @@ const Transform SpatiallyNestable::getTransform(int jointIndex) const { // this returns the world-space transform for this object. It finds its parent's transform (which may // cause this object's parent to query its parent, etc) and multiplies this object's local transform onto it. Transform worldTransform = getTransform(); - Transform jointInObjectFrame = getJointTransformInObjectFrame(jointIndex); + Transform jointInObjectFrame = getJointTransformInModelFrame(jointIndex); Transform jointInWorldFrame; Transform::mult(jointInWorldFrame, worldTransform, jointInObjectFrame); return jointInWorldFrame; @@ -339,7 +339,7 @@ QList SpatiallyNestable::getChildren() const { return children; } -const Transform SpatiallyNestable::getJointTransformInObjectFrame(int jointIndex) const { +const Transform SpatiallyNestable::getJointTransformInModelFrame(int jointIndex) const { Transform jointInObjectFrame; glm::vec3 position = getJointTranslation(jointIndex); glm::quat orientation = getJointRotation(jointIndex); diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h index f3056d9a4f..da7aff6b52 100644 --- a/libraries/shared/src/SpatiallyNestable.h +++ b/libraries/shared/src/SpatiallyNestable.h @@ -91,7 +91,7 @@ public: NestableTypes::NestableType getNestableType() const { return _nestableType; } // this object's frame - virtual const Transform getJointTransformInObjectFrame(int jointIndex) const; + virtual const Transform getJointTransformInModelFrame(int jointIndex) const; virtual glm::quat getJointRotation(int index) const { assert(false); return glm::quat(); } virtual glm::vec3 getJointTranslation(int index) const { assert(false); return glm::vec3(); }