use kDop volume of avatar mesh parts for capsule

Andrew Meadows committed 10 years ago

Commit ee751ed1 parent 9c29ba23 files · +38 −58Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 3 files). Show all

Unified · Split

     totalExtents.addPoint(glm::vec3(0.0f));
     int numStates = _rig->getJointStateCount();
     for (int i = 0; i < numStates; i++) {
-        const JointState& state = _rig->getJointState(i);
-        const glm::mat4& jointTransform = state.getTransform();
-        float scale = extractUniformScale(jointTransform);
         // Each joint contributes a capsule defined by FBXJoint.shapeInfo.
         // For totalExtents we use the capsule endpoints expanded by the radius.
+        const JointState& state = _rig->getJointState(i);
+        const glm::mat4& jointTransform = state.getTransform();
         const FBXJointShapeInfo& shapeInfo = geometry.joints.at(i).shapeInfo;
-        for (int j = 0; j < shapeInfo.points.size(); ++j) {
+        if (shapeInfo.points.size() > 0) {
-            glm::vec3 transformedPoint = extractTranslation(jointTransform * glm::translate(shapeInfo.points[j]));
+            for (int j = 0; j < shapeInfo.points.size(); ++j) {
-            vec3 radius(scale * shapeInfo.radius);
+                totalExtents.addPoint(extractTranslation(jointTransform * glm::translate(shapeInfo.points[j])));
-            totalExtents.addPoint(transformedPoint + radius);
+            }
-            totalExtents.addPoint(transformedPoint - radius);
         }
         // HACK so that default legless robot doesn't knuckle-drag
         if (shapeInfo.points.size() == 0 && (state.getName() == "LeftFoot" || state.getName() == "RightFoot")) {

Keyboard shortcuts