From 12e2a5c57c9b7b9b8d62e849b17850c545d2aa9f Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sat, 22 Sep 2007 00:04:37 +0000 Subject: [PATCH] BoxBoxCollisionAlgorithm needs to use dispatcher for memory allocation --- .../BoxBoxCollisionAlgorithm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h b/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h index 8b046a9df..b9f024a26 100644 --- a/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h +++ b/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.h @@ -18,7 +18,9 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" +#include "BulletCollision/BroadphaseCollision/btDispatcher.h" #include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" + class btPersistentManifold; ///box-box collision detection @@ -43,7 +45,9 @@ public: { virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1) { - return new BoxBoxCollisionAlgorithm(0,ci,body0,body1); + int bbsize = sizeof(BoxBoxCollisionAlgorithm); + void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize); + return new(ptr) BoxBoxCollisionAlgorithm(0,ci,body0,body1); } };