From d6a716a1aa5f7619cb0b651be53730fb9bc86df0 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 15 Feb 2016 10:29:29 -0800
Subject: [PATCH] only head and torso for bounding capsule radius
---
libraries/animation/src/Rig.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 4146d8e1cf..817054a9f5 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1274,15 +1274,18 @@ void Rig::computeAvatarBoundingCapsule(
// even if they do not have legs (default robot)
totalExtents.addPoint(glm::vec3(0.0f));
- int numPoses = (int)finalPoses.size();
- for (int i = 0; i < numPoses; i++) {
- const FBXJointShapeInfo& shapeInfo = geometry.joints.at(i).shapeInfo;
- AnimPose pose = finalPoses[i];
+ // HACK to reduce the radius of the bounding capsule to be tight with the torso, we only consider joints
+ // from the head to the hips when computing the rest of the bounding capsule.
+ int index = _animSkeleton->nameToJointIndex(QString("Head"));
+ while (index != -1) {
+ const FBXJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
+ AnimPose pose = finalPoses[index];
if (shapeInfo.points.size() > 0) {
for (int j = 0; j < shapeInfo.points.size(); ++j) {
totalExtents.addPoint((pose * shapeInfo.points[j]));
}
}
+ index = _animSkeleton->getParentIndex(index);
}
// compute bounding shape parameters