This reverts commit 569bef50fdaea8b51abf14c8ed9afc935c84ed16.
Showing the changes to libraries/render-utils/src/AnimDebugDraw.cpp (1 of 17 files). Show all
Unified · Split
| @@ -374,7 +374,7 @@ void AnimDebugDraw::update() { · 373 unmodified lines | |||
| 374 | glm::vec4 color = std::get<3>(iter.second); | 374 | glm::vec4 color = std::get<3>(iter.second); |
| 375 | 375 | ||
| 376 | for (int i = 0; i < skeleton->getNumJoints(); i++) { | 376 | for (int i = 0; i < skeleton->getNumJoints(); i++) { |
| 377 | const float radius = BONE_RADIUS / (absPoses[i].scale() * rootPose.scale()); | 377 | const float radius = BONE_RADIUS / (absPoses[i].scale().x * rootPose.scale().x); |
| 378 | 378 | ||
| 379 | // draw bone | 379 | // draw bone |
| 380 | addBone(rootPose, absPoses[i], radius, color, v); | 380 | addBone(rootPose, absPoses[i], radius, color, v); |
| @@ -394,16 +394,16 @@ void AnimDebugDraw::update() { · 13 unmodified lines | |||
| 394 | glm::vec3 pos = std::get<1>(iter.second); | 394 | glm::vec3 pos = std::get<1>(iter.second); |
| 395 | glm::vec4 color = std::get<2>(iter.second); | 395 | glm::vec4 color = std::get<2>(iter.second); |
| 396 | const float radius = POSE_RADIUS; | 396 | const float radius = POSE_RADIUS; |
| 397 | addBone(AnimPose::identity, AnimPose(1.0f, rot, pos), radius, color, v); | 397 | addBone(AnimPose::identity, AnimPose(glm::vec3(1), rot, pos), radius, color, v); |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | AnimPose myAvatarPose(1.0f, DebugDraw::getInstance().getMyAvatarRot(), DebugDraw::getInstance().getMyAvatarPos()); | 400 | AnimPose myAvatarPose(glm::vec3(1), DebugDraw::getInstance().getMyAvatarRot(), DebugDraw::getInstance().getMyAvatarPos()); |
| 401 | for (auto& iter : myAvatarMarkerMap) { | 401 | for (auto& iter : myAvatarMarkerMap) { |
| 402 | glm::quat rot = std::get<0>(iter.second); | 402 | glm::quat rot = std::get<0>(iter.second); |
| 403 | glm::vec3 pos = std::get<1>(iter.second); | 403 | glm::vec3 pos = std::get<1>(iter.second); |
| 404 | glm::vec4 color = std::get<2>(iter.second); | 404 | glm::vec4 color = std::get<2>(iter.second); |
| 405 | const float radius = POSE_RADIUS; | 405 | const float radius = POSE_RADIUS; |
| 406 | addBone(myAvatarPose, AnimPose(1.0f, rot, pos), radius, color, v); | 406 | addBone(myAvatarPose, AnimPose(glm::vec3(1), rot, pos), radius, color, v); |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | // draw rays from shared DebugDraw singleton | 409 | // draw rays from shared DebugDraw singleton |