Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:10:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review

Browse source
This commit is contained in:
Seth Alves 2016-11-05 10:35:21 -07:00
parent 689fdfb35f
commit 51f6b5af78
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,7 @@ void Rig::clearIKJointLimitHistory() {
} }
} }
int Rig::getJointParentIndex(int childIndex) { int Rig::getJointParentIndex(int childIndex) const {
if (_animSkeleton && isIndexValid(childIndex)) { if (_animSkeleton && isIndexValid(childIndex)) {
return _animSkeleton->getParentIndex(childIndex); return _animSkeleton->getParentIndex(childIndex);
} }

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

@ -105,7 +105,7 @@ public:
void clearIKJointLimitHistory(); void clearIKJointLimitHistory();
int getJointParentIndex(int childIndex); int getJointParentIndex(int childIndex) const;
// geometry space // geometry space
void setJointState(int index, bool valid, const glm::quat& rotation, const glm::vec3& translation, float priority); void setJointState(int index, bool valid, const glm::quat& rotation, const glm::vec3& translation, float priority);

3
libraries/entities/src/ModelEntityItem.h
View file

@ -117,9 +117,6 @@ public:
virtual bool shouldBePhysical() const override; virtual bool shouldBePhysical() const override;
// virtual glm::vec3 getJointPosition(int jointIndex) const { return glm::vec3(); }
// virtual glm::quat getJointRotation(int jointIndex) const { return glm::quat(); }
virtual void setJointRotations(const QVector<glm::quat>& rotations); virtual void setJointRotations(const QVector<glm::quat>& rotations);
virtual void setJointRotationsSet(const QVector<bool>& rotationsSet); virtual void setJointRotationsSet(const QVector<bool>& rotationsSet);
virtual void setJointTranslations(const QVector<glm::vec3>& translations); virtual void setJointTranslations(const QVector<glm::vec3>& translations);