Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4560 from AndrewMeadows/bispinor

Browse source 
improved bounding shape calculation for Mery model
This commit is contained in:
Philip Rosedale 2015-03-31 18:19:34 -07:00
commit d57959503b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/SkeletonModel.cpp
View file

@ -685,6 +685,10 @@ void SkeletonModel::computeBoundingShape(const FBXGeometry& geometry) {
* joint.preTransform * glm::mat4_cast(modifiedRotation) * joint.postTransform; * joint.preTransform * glm::mat4_cast(modifiedRotation) * joint.postTransform;
} }
// Each joint contributes its point to the bounding box
glm::vec3 jointPosition = extractTranslation(transforms[i]);
totalExtents.addPoint(jointPosition);
Shape* shape = _shapes[i]; Shape* shape = _shapes[i];
if (!shape) { if (!shape) {
continue; continue;
@ -694,8 +698,6 @@ void SkeletonModel::computeBoundingShape(const FBXGeometry& geometry) {
// that contains the sphere centered at the end of the joint with radius of the bone. // that contains the sphere centered at the end of the joint with radius of the bone.
// TODO: skip hand and arm shapes for bounding box calculation // TODO: skip hand and arm shapes for bounding box calculation
glm::vec3 jointPosition = extractTranslation(transforms[i]);
int type = shape->getType(); int type = shape->getType();
if (type == CAPSULE_SHAPE) { if (type == CAPSULE_SHAPE) {
// add the two furthest surface points of the capsule // add the two furthest surface points of the capsule