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

Merge pull request #1682 from lunkhound/pr-solver-col-body-fix

Browse Source 
constraint solvers: fix crash for collision-bodies with incorrect flags
This commit is contained in:
erwincoumans
2018-05-16 08:41:57 -07:00
committed by GitHub
parent 5ed461f512 4254837170
commit 382a08e373
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -738,14 +738,13 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject&
{ {
#if BT_THREADSAFE #if BT_THREADSAFE
int solverBodyId = -1; int solverBodyId = -1;
if ( !body.isStaticOrKinematicObject() ) bool isRigidBodyType = btRigidBody::upcast( &body ) != NULL;
if ( isRigidBodyType && !body.isStaticOrKinematicObject() )
{ {
// dynamic body // dynamic body
// Dynamic bodies can only be in one island, so it's safe to write to the companionId // Dynamic bodies can only be in one island, so it's safe to write to the companionId
solverBodyId = body.getCompanionId(); solverBodyId = body.getCompanionId();
if ( solverBodyId < 0 ) if ( solverBodyId < 0 )
{
if ( btRigidBody* rb = btRigidBody::upcast( &body ) )
{ {
solverBodyId = m_tmpSolverBodyPool.size(); solverBodyId = m_tmpSolverBodyPool.size();
btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
@@ -753,8 +752,7 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject&
body.setCompanionId( solverBodyId ); body.setCompanionId( solverBodyId );
} }
} }
} else if (isRigidBodyType && body.isKinematicObject())
else if (body.isKinematicObject())
{ {
// //
// NOTE: must test for kinematic before static because some kinematic objects also // NOTE: must test for kinematic before static because some kinematic objects also
@@ -774,7 +772,6 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject&
if ( solverBodyId == INVALID_SOLVER_BODY_ID ) if ( solverBodyId == INVALID_SOLVER_BODY_ID )
{ {
// create a table entry for this body // create a table entry for this body
btRigidBody* rb = btRigidBody::upcast( &body );
solverBodyId = m_tmpSolverBodyPool.size(); solverBodyId = m_tmpSolverBodyPool.size();
btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
initSolverBody( &solverBody, &body, timeStep ); initSolverBody( &solverBody, &body, timeStep );
@@ -783,6 +780,8 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject&
} }
else else
{ {
// Incorrectly set collision object flags can degrade performance in various ways.
btAssert( body.isStaticOrKinematicObject() );
// all fixed bodies (inf mass) get mapped to a single solver id // all fixed bodies (inf mass) get mapped to a single solver id
if ( m_fixedBodyId < 0 ) if ( m_fixedBodyId < 0 )
{ {
@@ -792,7 +791,7 @@ int btSequentialImpulseConstraintSolver::getOrInitSolverBody(btCollisionObject&
} }
solverBodyId = m_fixedBodyId; solverBodyId = m_fixedBodyId;
} }
btAssert( solverBodyId < m_tmpSolverBodyPool.size() ); btAssert( solverBodyId >= 0 && solverBodyId < m_tmpSolverBodyPool.size() );
return solverBodyId; return solverBodyId;
#else // BT_THREADSAFE #else // BT_THREADSAFE

18
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp
View File

@@ -317,7 +317,8 @@ int btSequentialImpulseConstraintSolverMt::getOrInitSolverBodyThreadsafe(btColli
// getOrInitSolverBodyThreadsafe -- attempts to be fully threadsafe (however may affect determinism) // getOrInitSolverBodyThreadsafe -- attempts to be fully threadsafe (however may affect determinism)
// //
int solverBodyId = -1; int solverBodyId = -1;
if ( !body.isStaticOrKinematicObject() ) bool isRigidBodyType = btRigidBody::upcast( &body ) != NULL;
if ( isRigidBodyType && !body.isStaticOrKinematicObject() )
{ {
// dynamic body // dynamic body
// Dynamic bodies can only be in one island, so it's safe to write to the companionId // Dynamic bodies can only be in one island, so it's safe to write to the companionId
@@ -328,19 +329,16 @@ int btSequentialImpulseConstraintSolverMt::getOrInitSolverBodyThreadsafe(btColli
// now that we have the lock, check again // now that we have the lock, check again
solverBodyId = body.getCompanionId(); solverBodyId = body.getCompanionId();
if ( solverBodyId < 0 ) if ( solverBodyId < 0 )
{
if ( btRigidBody* rb = btRigidBody::upcast( &body ) )
{ {
solverBodyId = m_tmpSolverBodyPool.size(); solverBodyId = m_tmpSolverBodyPool.size();
btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
initSolverBody( &solverBody, &body, timeStep ); initSolverBody( &solverBody, &body, timeStep );
body.setCompanionId( solverBodyId ); body.setCompanionId( solverBodyId );
} }
}
m_bodySolverArrayMutex.unlock(); m_bodySolverArrayMutex.unlock();
} }
} }
else if (body.isKinematicObject()) else if (isRigidBodyType && body.isKinematicObject())
{ {
// //
// NOTE: must test for kinematic before static because some kinematic objects also // NOTE: must test for kinematic before static because some kinematic objects also
@@ -373,7 +371,6 @@ int btSequentialImpulseConstraintSolverMt::getOrInitSolverBodyThreadsafe(btColli
if ( INVALID_SOLVER_BODY_ID == solverBodyId ) if ( INVALID_SOLVER_BODY_ID == solverBodyId )
{ {
// create a table entry for this body // create a table entry for this body
btRigidBody* rb = btRigidBody::upcast( &body );
solverBodyId = m_tmpSolverBodyPool.size(); solverBodyId = m_tmpSolverBodyPool.size();
btSolverBody& solverBody = m_tmpSolverBodyPool.expand(); btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
initSolverBody( &solverBody, &body, timeStep ); initSolverBody( &solverBody, &body, timeStep );
@@ -400,7 +397,7 @@ int btSequentialImpulseConstraintSolverMt::getOrInitSolverBodyThreadsafe(btColli
} }
solverBodyId = m_fixedBodyId; solverBodyId = m_fixedBodyId;
} }
btAssert( solverBodyId < m_tmpSolverBodyPool.size() ); btAssert( solverBodyId >= 0 && solverBodyId < m_tmpSolverBodyPool.size() );
return solverBodyId; return solverBodyId;
} }
@@ -425,9 +422,10 @@ void btSequentialImpulseConstraintSolverMt::internalCollectContactManifoldCached
btSolverBody* solverBodyA = &m_tmpSolverBodyPool[ solverBodyIdA ]; btSolverBody* solverBodyA = &m_tmpSolverBodyPool[ solverBodyIdA ];
btSolverBody* solverBodyB = &m_tmpSolverBodyPool[ solverBodyIdB ]; btSolverBody* solverBodyB = &m_tmpSolverBodyPool[ solverBodyIdB ];
///avoid collision response between two static objects // A contact manifold between 2 static object should not exist!
if ( solverBodyA->m_invMass.fuzzyZero() && solverBodyB->m_invMass.fuzzyZero() ) // check the collision flags of your objects if this assert fires.
break; // Incorrectly set collision object flags can degrade performance in various ways.
btAssert( !m_tmpSolverBodyPool[ solverBodyIdA ].m_invMass.isZero() || !m_tmpSolverBodyPool[ solverBodyIdB ].m_invMass.isZero() );
int iContact = 0; int iContact = 0;
for ( int j = 0; j < manifold->getNumContacts(); j++ ) for ( int j = 0; j < manifold->getNumContacts(); j++ )