diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h index 0c5857dae62..715e3f2ab98 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h @@ -23,7 +23,7 @@ subject to the following restrictions: #include "LinearMath/btMinMax.h" ///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space. -class btBoxShape: public btPolyhedralConvexShape +ATTRIBUTE_ALIGNED16(class) btBoxShape: public btPolyhedralConvexShape { //btVector3 m_boxHalfExtents1; //use m_implicitShapeDimensions instead @@ -31,6 +31,8 @@ class btBoxShape: public btPolyhedralConvexShape public: +BT_DECLARE_ALIGNED_ALLOCATOR(); + btVector3 getHalfExtentsWithMargin() const { btVector3 halfExtents = getHalfExtentsWithoutMargin(); |