diff options
Diffstat (limited to 'extern/bullet/Bullet/CollisionShapes/BoxShape.cpp')
| -rw-r--r-- | extern/bullet/Bullet/CollisionShapes/BoxShape.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp index 37552194df0..12fbd895bb3 100644 --- a/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/BoxShape.cpp @@ -12,12 +12,10 @@ #include "BoxShape.h" SimdVector3 BoxShape::GetHalfExtents() const -{ - SimdVector3 scalingCorrectedHalfExtents = m_boxHalfExtents1 * m_localScaling; - SimdVector3 marginCorrection (CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN); - return (scalingCorrectedHalfExtents - marginCorrection).absolute(); +{ + return m_boxHalfExtents1 * m_localScaling; } - +//{ void BoxShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3& aabbMax) const @@ -33,9 +31,8 @@ void BoxShape::GetAabb(const SimdTransform& t,SimdVector3& aabbMin,SimdVector3& //todo: this is a quick fix, we need to enlarge the aabb dependent on several criteria - SimdVector3 extra(CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN,CONVEX_DISTANCE_MARGIN); - extent += extra; - + //extent += SimdVector3(.2f,.2f,.2f); + aabbMin = center - extent; aabbMax = center + extent; |