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

Fixes to allow compilation of BulletMultiThreaded under 64bit linux

Browse Source
This commit is contained in:
erwin.coumans
2008-11-14 23:51:49 +00:00
parent 86727242a2
commit cc43193b25
16 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
View File

@@ -106,9 +106,9 @@ public:
//by default, Bullet will use this near callback
{
///userInfo is used to determine if the SPU has to handle this case or not (skip PPU tasks)
if (!collisionPair.m_userInfo)
if (!collisionPair.m_internalTmpValue)
{
collisionPair.m_userInfo = (void*) 1;
collisionPair.m_internalTmpValue = 1;
}
if (!collisionPair.m_algorithm)
{
@@ -132,11 +132,11 @@ public:
void* mem = m_dispatcher->allocateCollisionAlgorithm(so);
#endif
collisionPair.m_algorithm = new(mem) SpuContactManifoldCollisionAlgorithm(ci,colObj0,colObj1);
collisionPair.m_userInfo = (void*) 2;
collisionPair.m_internalTmpValue = 2;
} else
{
collisionPair.m_algorithm = m_dispatcher->findAlgorithm(colObj0,colObj1);
collisionPair.m_userInfo = (void*)3;
collisionPair.m_internalTmpValue = 3;
}
}
}
@@ -179,7 +179,7 @@ void SpuGatheringCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPai
for (i=0;i<numTotalPairs;i++)
{
btBroadphasePair& collisionPair = pairPtr[i];
if (collisionPair.m_userInfo == (void*)3)
if (collisionPair.m_internalTmpValue == 3)
{
if (collisionPair.m_algorithm)
{