Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed memory leaks caused by pool allocator, thanks Dev0

Browse Source
This commit is contained in:
ejcoumans
2007-09-10 19:18:50 +00:00
parent ab33083a9c
commit cfde010808
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
View File

@@ -41,9 +41,6 @@ btCollisionDispatcher::btCollisionDispatcher (btCollisionConfiguration* collisio
setNearCallback(defaultNearCallback); setNearCallback(defaultNearCallback);
int maxElements = 16384;
m_collisionAlgorithmPoolAllocator = new btPoolAllocator(m_collisionConfiguration->getCollisionAlgorithmMaxElementSize(),m_collisionConfiguration->getCollisionAlgorithmPoolSize()); m_collisionAlgorithmPoolAllocator = new btPoolAllocator(m_collisionConfiguration->getCollisionAlgorithmMaxElementSize(),m_collisionConfiguration->getCollisionAlgorithmPoolSize());
m_persistentManifoldPoolAllocator = new btPoolAllocator(sizeof(btPersistentManifold),m_collisionConfiguration->getPersistentManifoldPoolSize()); m_persistentManifoldPoolAllocator = new btPoolAllocator(sizeof(btPersistentManifold),m_collisionConfiguration->getPersistentManifoldPoolSize());
@@ -68,7 +65,8 @@ void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int prox
btCollisionDispatcher::~btCollisionDispatcher() btCollisionDispatcher::~btCollisionDispatcher()
{ {
delete m_collisionAlgorithmPoolAllocator;
delete m_persistentManifoldPoolAllocator;
} }
btPersistentManifold* btCollisionDispatcher::getNewManifold(void* b0,void* b1) btPersistentManifold* btCollisionDispatcher::getNewManifold(void* b0,void* b1)

5
src/LinearMath/btPoolAllocator.h
View File

@@ -45,6 +45,11 @@ public:
*(void**)p = 0; *(void**)p = 0;
} }
~btPoolAllocator()
{
delete m_pool;
}
void* allocate(int size) void* allocate(int size)
{ {
btAssert(!size || size<=m_elemSize); btAssert(!size || size<=m_elemSize);