AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-16 06:30:05 +00:00
Code Issues Releases Wiki Activity

removed obsolete code, added #ifdef to allow skipping of default registration of collision algorithm (avoid linking of unneeded code)

Browse Source
This commit is contained in:
ejcoumans 2006-12-13 22:44:20 +00:00
parent 6dff5a218e
commit df0c044228
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,10 @@ m_emptyCreateFunc(0)
}
}
}
//if you want to not link with the default collision algorithms, you can
//define BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
//in your Bullet library build system
#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
btCollisionDispatcher::btCollisionDispatcher ():
m_useIslands(true),
@ -86,6 +89,9 @@ btCollisionDispatcher::btCollisionDispatcher ():
};
#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc)
{
m_doubleDispatch[proxyType0][proxyType1] = createFunc;
@ -164,6 +170,8 @@ btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(btCollisionObject* bo
}
#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
btCollisionAlgorithmCreateFunc* btCollisionDispatcher::internalFindCreateFunc(int proxyType0,int proxyType1)
{
@ -197,6 +205,8 @@ btCollisionAlgorithmCreateFunc* btCollisionDispatcher::internalFindCreateFunc(in
return m_emptyCreateFunc;
}
#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
#ifndef USE_DISPATCH_REGISTRY_ARRAY

14
src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
View File

@ -43,23 +43,9 @@ subject to the following restrictions:
#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
#ifdef WIN32
#if _MSC_VER >= 1310
//only use SIMD Hull code under Win32
#ifdef TEST_HULL
#define USE_HULL 1
#endif //TEST_HULL
#endif //_MSC_VER
#endif //WIN32
#ifdef USE_HULL
#include "NarrowPhaseCollision/Hull.h"
#include "NarrowPhaseCollision/HullContactCollector.h"
#endif //USE_HULL
btConvexConvexAlgorithm::CreateFunc::CreateFunc()

2
src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
View File

@ -63,7 +63,7 @@ class btManifoldPoint
float m_combinedRestitution;
void* m_userPersistentData;
mutable void* m_userPersistentData;
int m_lifeTime;//lifetime of the contactpoint in frames