diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 4b2d4facc8..68f382d2d9 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -386,10 +386,6 @@ bool Rig::getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation } } -bool Rig::setAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation) { - return false; -} - bool Rig::getJointTranslation(int jointIndex, glm::vec3& translation) const { QReadLocker readLock(&_externalPoseSetLock); if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._relativePoses.size()) { @@ -410,10 +406,6 @@ bool Rig::getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& trans } } -bool Rig::setAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) { - return false; -} - bool Rig::getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const { // AJT: TODO: used by attachments ASSERT(false); diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h index 3881b35dfb..9faf93e40b 100644 --- a/libraries/animation/src/Rig.h +++ b/libraries/animation/src/Rig.h @@ -134,8 +134,6 @@ public: // rig space (thread-safe) bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation) const; bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) const; - bool setAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation); - bool setAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation); // legacy bool getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const; diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 91ca8e60cb..dbd3a6289f 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -699,14 +699,6 @@ void Model::setJointTranslation(int index, bool valid, const glm::vec3& translat _rig->setJointTranslation(index, valid, translation, priority); } -bool Model::setAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation) { - return _rig->setAbsoluteJointRotationInRigFrame(jointIndex, rotation); -} - -bool Model::setAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) { - return _rig->setAbsoluteJointTranslationInRigFrame(jointIndex, translation); -} - int Model::getParentJointIndex(int jointIndex) const { return (isActive() && jointIndex != -1) ? _geometry->getFBXGeometry().joints.at(jointIndex).parentIndex : -1; } diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 327583c212..a93338e41a 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -170,9 +170,6 @@ public: bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotationOut) const; bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translationOut) const; - bool setAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation); - bool setAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation); - bool getRelativeDefaultJointRotation(int jointIndex, glm::quat& rotationOut) const; bool getRelativeDefaultJointTranslation(int jointIndex, glm::vec3& translationOut) const;