Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some unused stuff

Browse source
This commit is contained in:
Seth Alves 2015-12-22 17:56:12 -08:00
parent 84bcfb7d71
commit 1a51c9ddbe
4 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/animation/src/Rig.cpp
View file

@ -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 { bool Rig::getJointTranslation(int jointIndex, glm::vec3& translation) const {
QReadLocker readLock(&_externalPoseSetLock); QReadLocker readLock(&_externalPoseSetLock);
if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._relativePoses.size()) { 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 { bool Rig::getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const {
// AJT: TODO: used by attachments // AJT: TODO: used by attachments
ASSERT(false); ASSERT(false);

2
libraries/animation/src/Rig.h
View file

@ -134,8 +134,6 @@ public:
// rig space (thread-safe) // rig space (thread-safe)
bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation) const; bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation) const;
bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) const; bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation) const;
bool setAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotation);
bool setAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translation);
// legacy // legacy
bool getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const; bool getJointCombinedRotation(int jointIndex, glm::quat& result, const glm::quat& rotation) const;

8
libraries/render-utils/src/Model.cpp
View file

@ -699,14 +699,6 @@ void Model::setJointTranslation(int index, bool valid, const glm::vec3& translat
_rig->setJointTranslation(index, valid, translation, priority); _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 { int Model::getParentJointIndex(int jointIndex) const {
return (isActive() && jointIndex != -1) ? _geometry->getFBXGeometry().joints.at(jointIndex).parentIndex : -1; return (isActive() && jointIndex != -1) ? _geometry->getFBXGeometry().joints.at(jointIndex).parentIndex : -1;
} }

3
libraries/render-utils/src/Model.h
View file

@ -170,9 +170,6 @@ public:
bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotationOut) const; bool getAbsoluteJointRotationInRigFrame(int jointIndex, glm::quat& rotationOut) const;
bool getAbsoluteJointTranslationInRigFrame(int jointIndex, glm::vec3& translationOut) 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 getRelativeDefaultJointRotation(int jointIndex, glm::quat& rotationOut) const;
bool getRelativeDefaultJointTranslation(int jointIndex, glm::vec3& translationOut) const; bool getRelativeDefaultJointTranslation(int jointIndex, glm::vec3& translationOut) const;