From 51f6b5af78222d8d2632da7f4fb00370a09353ea Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 5 Nov 2016 10:35:21 -0700 Subject: [PATCH] code review --- libraries/animation/src/Rig.cpp | 2 +- libraries/animation/src/Rig.h | 2 +- libraries/entities/src/ModelEntityItem.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 722fcc92aa..45790524d1 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -308,7 +308,7 @@ void Rig::clearIKJointLimitHistory() { } } -int Rig::getJointParentIndex(int childIndex) { +int Rig::getJointParentIndex(int childIndex) const { if (_animSkeleton && isIndexValid(childIndex)) { return _animSkeleton->getParentIndex(childIndex); } diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h index cc4992cb31..151a7ae8e9 100644 --- a/libraries/animation/src/Rig.h +++ b/libraries/animation/src/Rig.h @@ -105,7 +105,7 @@ public: void clearIKJointLimitHistory(); - int getJointParentIndex(int childIndex); + int getJointParentIndex(int childIndex) const; // geometry space void setJointState(int index, bool valid, const glm::quat& rotation, const glm::vec3& translation, float priority); diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index 797474f784..58766906bb 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -117,9 +117,6 @@ public: 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& rotations); virtual void setJointRotationsSet(const QVector& rotationsSet); virtual void setJointTranslations(const QVector& translations);