From 9a169f26333141b1f9e0ef4609c7ef3dba2f5835 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 12 Dec 2006 03:08:15 +0000 Subject: added some new Bullet files, and upgraded to latest Bullet 2.x Please make sure to have extern/bullet/src/LinearMath/btAlignedAllocator.cpp in your build, if you add the files by name, instead of wildcard *.cpp --- .../bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h') diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h index 9c548784829..bd09d8c4d5d 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -173,7 +173,7 @@ public: struct ClosestRayResultCallback : public RayResultCallback { - ClosestRayResultCallback(btVector3 rayFromWorld,btVector3 rayToWorld) + ClosestRayResultCallback(const btVector3& rayFromWorld,const btVector3& rayToWorld) :m_rayFromWorld(rayFromWorld), m_rayToWorld(rayToWorld), m_collisionObject(0) @@ -237,7 +237,7 @@ public: void removeCollisionObject(btCollisionObject* collisionObject); - virtual void performDiscreteCollisionDetection( btDispatcherInfo& dispatchInfo); + virtual void performDiscreteCollisionDetection(); btDispatcherInfo& getDispatchInfo() { -- cgit v1.2.3