Fix previous commit, accidently removed some aabbMin/aabbMax assignments.

move margin calculation for aabb before basis transform.
This commit is contained in:
erwin.coumans
2008-09-05 00:26:02 +00:00
parent 4f1a015b41
commit 359c84d3b3
7 changed files with 18 additions and 11 deletions

View File

@@ -49,10 +49,11 @@ public:
{
btVector3 halfExtents(getRadius(),getRadius(),getRadius());
halfExtents[m_upAxis] = getRadius() + getHalfHeight();
halfExtents += btVector3(getMargin(),getMargin(),getMargin());
btMatrix3x3 abs_b = t.getBasis().absolute();
btPoint3 center = t.getOrigin();
btVector3 extent = btVector3(abs_b[0].dot(halfExtents),abs_b[1].dot(halfExtents),abs_b[2].dot(halfExtents));
extent += btVector3(getMargin(),getMargin(),getMargin());
aabbMin = center - extent;
aabbMax = center + extent;
}