From fa44687de6caad2ee9242f504948174a9758db71 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Wed, 20 Feb 2019 09:22:39 -0700 Subject: [PATCH] fix errors and remove debug draw --- libraries/animation/src/Flow.cpp | 4 ++-- .../src/avatars-renderer/Avatar.cpp | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/libraries/animation/src/Flow.cpp b/libraries/animation/src/Flow.cpp index 86252b698d..480ded2002 100644 --- a/libraries/animation/src/Flow.cpp +++ b/libraries/animation/src/Flow.cpp @@ -659,8 +659,8 @@ void Flow::updateAbsolutePoses(const AnimPoseVec& relativePoses, AnimPoseVec& ab for (auto &joint : _flowJointData) { int index = joint.second.getIndex(); int parentIndex = joint.second.getParentIndex(); - if (index >= 0 && index < relativePoses.size() && - parentIndex >= 0 && parentIndex < absolutePoses.size()) { + if (index >= 0 && index < (int)relativePoses.size() && + parentIndex >= 0 && parentIndex < (int)absolutePoses.size()) { absolutePoses[index] = absolutePoses[parentIndex] * relativePoses[index]; } } diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp index be5eea5161..e6881b0efe 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp @@ -727,20 +727,6 @@ void Avatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { DebugDraw::getInstance().drawRay(rightEyePosition, rightEyePosition + rightEyeRotation * Vectors::UNIT_Z * EYE_RAY_LENGTH, RED); } } - const bool DEBUG_FLOW = true; - if (_skeletonModel->isLoaded() && DEBUG_FLOW) { - Flow* flow = _skeletonModel->getRig().getFlow(); - auto joints = flow->getJoints(); - auto threads = flow->getThreads(); - for (auto &thread : threads) { - auto& jointIndexes = thread._joints; - for (size_t i = 1; i < jointIndexes.size(); i++) { - auto index1 = jointIndexes[i - 1]; - auto index2 = jointIndexes[i]; - DebugDraw::getInstance().drawRay(joints[index1].getCurrentPosition(), joints[index2].getCurrentPosition(), glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)); - } - } - } fixupModelsInScene(scene); updateFitBoundingBox();