From 04006a9f76047f6d65d1d34b181732148aca73ed Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 15 Aug 2017 11:19:41 -0700 Subject: [PATCH] code review feedback --- interface/src/avatar/MyAvatar.cpp | 3 ++- libraries/animation/src/Rig.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 2109aa7dfa..77fa0cfda3 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1811,7 +1811,7 @@ void MyAvatar::postUpdate(float deltaTime) { updateHoldActions(_prePhysicsRoomPose, postUpdateRoomPose); if (_enableDebugDrawDetailedCollision) { - AnimPose rigToWorldPose(glm::vec3(1.0f), Quaternions::Y_180 * getRotation(), getPosition()); + AnimPose rigToWorldPose(glm::vec3(1.0f), getRotation() * Quaternions::Y_180, getPosition()); const int NUM_DEBUG_COLORS = 7; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), @@ -1821,6 +1821,7 @@ void MyAvatar::postUpdate(float deltaTime) { glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index e01624655b..3a31ccd25f 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1118,7 +1118,7 @@ const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = { -glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3) }; -// returns true if the given point lies in side of the k-dop, specified by shapeInfo & shapePose. +// returns true if the given point lies inside of the k-dop, specified by shapeInfo & shapePose. // if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward // such that it lies on the surface of the kdop. static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {