diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h')
-rw-r--r-- | extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h index ef01f8a3e60..8ec63735cd8 100644 --- a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h +++ b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h @@ -34,7 +34,7 @@ class btPairCachingGhostObject; ///btKinematicCharacterController is an object that supports a sliding motion in a world. ///It uses a ghost object and convex sweep test to test for upcoming collisions. This is combined with discrete collision detection to recover from penetrations. ///Interaction between btKinematicCharacterController and dynamic rigid bodies needs to be explicity implemented by the user. -class btKinematicCharacterController : public btCharacterControllerInterface +ATTRIBUTE_ALIGNED16(class) btKinematicCharacterController : public btCharacterControllerInterface { protected: @@ -92,6 +92,9 @@ protected: void stepForwardAndStrafe (btCollisionWorld* collisionWorld, const btVector3& walkMove); void stepDown (btCollisionWorld* collisionWorld, btScalar dt); public: + + BT_DECLARE_ALIGNED_ALLOCATOR(); + btKinematicCharacterController (btPairCachingGhostObject* ghostObject,btConvexShape* convexShape,btScalar stepHeight, int upAxis = 1); ~btKinematicCharacterController (); |