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

dispatcher was missing actual implementation for user-registration function

Browse Source
This commit is contained in:
ejcoumans
2006-09-08 02:41:47 +00:00
parent 3a9c5dcc35
commit 7b5da11662
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Bullet/CollisionDispatch/CollisionDispatcher.cpp
View File

@@ -60,6 +60,10 @@ CollisionDispatcher::CollisionDispatcher ():
}; };
void CollisionDispatcher::RegisterCollisionCreateFunc(int proxyType0, int proxyType1, CollisionAlgorithmCreateFunc *createFunc)
{
m_doubleDispatch[proxyType0][proxyType1] = createFunc;
}
CollisionDispatcher::~CollisionDispatcher() CollisionDispatcher::~CollisionDispatcher()
{ {

1
Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
View File

@@ -113,6 +113,7 @@ void ConvexTriangleCallback::ProcessTriangle(SimdVector3* triangle,int partId, i
CollisionShape* tmpShape = ob->m_collisionShape; CollisionShape* tmpShape = ob->m_collisionShape;
ob->m_collisionShape = &tm; ob->m_collisionShape = &tm;
///this should use the Dispatcher, so the actual registered algorithm is used
ConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexProxy,&m_triangleProxy); ConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexProxy,&m_triangleProxy);
cvxcvxalgo.SetShapeIdentifiers(-1,-1,partId,triangleIndex); cvxcvxalgo.SetShapeIdentifiers(-1,-1,partId,triangleIndex);
cvxcvxalgo.ProcessCollision(m_convexProxy,&m_triangleProxy,*m_dispatchInfoPtr); cvxcvxalgo.ProcessCollision(m_convexProxy,&m_triangleProxy,*m_dispatchInfoPtr);