From 712fcbe27a9dce1fa59dc4a37a766575dfa7179f Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 4 May 2017 18:41:42 -0700 Subject: [PATCH] Removed cruft/debug code & comments --- interface/src/avatar/MyAvatar.cpp | 24 ------------------- .../animation/src/AnimInverseKinematics.h | 3 --- 2 files changed, 27 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 368b403910..7870bd4968 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1707,30 +1707,6 @@ void MyAvatar::postUpdate(float deltaTime) { initAnimGraph(); } - // AJT: REMOVE. - /* - { - auto ikNode = _rig->getAnimInverseKinematicsNode(); - if (ikNode) { - // the rig is in the skeletonModel frame - AnimPose xform(glm::vec3(1), _skeletonModel->getRotation(), _skeletonModel->getTranslation()); - AnimPoseVec limitCenterPoses = ikNode->getLimitCenterPoses(); - - // HACK: convert joints from geom to avatar space - int hipsIndex = _rig->indexOfJoint("Hips"); - for (size_t i = 0; i < limitCenterPoses.size(); i++) { - if (i == hipsIndex) { - limitCenterPoses[i].trans() = glm::vec3(); // zero the hips - } - // convert from cm to m - limitCenterPoses[i].trans() = 0.01f * limitCenterPoses[i].trans(); - } - _rig->getAnimSkeleton()->convertRelativePosesToAbsolute(limitCenterPoses); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarLimitCenterPoses", _rig->getAnimSkeleton(), limitCenterPoses, xform, glm::vec4(1)); - } - } - */ - if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { auto animSkeleton = _rig->getAnimSkeleton(); diff --git a/libraries/animation/src/AnimInverseKinematics.h b/libraries/animation/src/AnimInverseKinematics.h index 5ad5638709..b40f025ecd 100644 --- a/libraries/animation/src/AnimInverseKinematics.h +++ b/libraries/animation/src/AnimInverseKinematics.h @@ -43,9 +43,6 @@ public: float getMaxErrorOnLastSolve() { return _maxErrorOnLastSolve; } - // AJT: TODO REMOVE? for debugging. - const AnimPoseVec& getLimitCenterPoses() const { return _limitCenterPoses; } - protected: void computeTargets(const AnimVariantMap& animVars, std::vector& targets, const AnimPoseVec& underPoses); void solveWithCyclicCoordinateDescent(const std::vector& targets);