Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit#

Browse source
This commit is contained in:
Seth Alves 2015-12-06 06:16:47 -08:00
parent 50f5de3d83
commit edc312199d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/shared/src/SpatiallyNestable.cpp
View file

@ -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 // 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. // cause this object's parent to query its parent, etc) and multiplies this object's local transform onto it.
Transform worldTransform = getTransform(); Transform worldTransform = getTransform();
Transform jointInObjectFrame = getJointTransformInObjectFrame(jointIndex); Transform jointInObjectFrame = getJointTransformInModelFrame(jointIndex);
Transform jointInWorldFrame; Transform jointInWorldFrame;
Transform::mult(jointInWorldFrame, worldTransform, jointInObjectFrame); Transform::mult(jointInWorldFrame, worldTransform, jointInObjectFrame);
return jointInWorldFrame; return jointInWorldFrame;
@ -339,7 +339,7 @@ QList<SpatiallyNestablePointer> SpatiallyNestable::getChildren() const {
return children; return children;
} }
const Transform SpatiallyNestable::getJointTransformInObjectFrame(int jointIndex) const { const Transform SpatiallyNestable::getJointTransformInModelFrame(int jointIndex) const {
Transform jointInObjectFrame; Transform jointInObjectFrame;
glm::vec3 position = getJointTranslation(jointIndex); glm::vec3 position = getJointTranslation(jointIndex);
glm::quat orientation = getJointRotation(jointIndex); glm::quat orientation = getJointRotation(jointIndex);

2
libraries/shared/src/SpatiallyNestable.h
View file

@ -91,7 +91,7 @@ public:
NestableTypes::NestableType getNestableType() const { return _nestableType; } NestableTypes::NestableType getNestableType() const { return _nestableType; }
// this object's frame // 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::quat getJointRotation(int index) const { assert(false); return glm::quat(); }
virtual glm::vec3 getJointTranslation(int index) const { assert(false); return glm::vec3(); } virtual glm::vec3 getJointTranslation(int index) const { assert(false); return glm::vec3(); }