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

apply patch: soft bodies should not collide with ghost objects.

Browse Source 
Thanks to Sergej Reich for the patch, fixes Issue 757
This commit is contained in:
erwin.coumans@gmail.com
2013-11-04 01:12:52 +00:00
parent 439ab03940
commit 0536f986a6
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -3027,8 +3027,9 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti)
{ {
const RContact& c = psb->m_rcontacts[i]; const RContact& c = psb->m_rcontacts[i];
const sCti& cti = c.m_cti; const sCti& cti = c.m_cti;
if (cti.m_colObj->hasContactResponse())
{
btRigidBody* tmpRigid = (btRigidBody*)btRigidBody::upcast(cti.m_colObj); btRigidBody* tmpRigid = (btRigidBody*)btRigidBody::upcast(cti.m_colObj);
const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0); const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0);
const btVector3 vb = c.m_node->m_x-c.m_node->m_q; const btVector3 vb = c.m_node->m_x-c.m_node->m_q;
const btVector3 vr = vb-va; const btVector3 vr = vb-va;
@@ -3044,6 +3045,7 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti)
tmpRigid->applyImpulse(impulse,c.m_c1); tmpRigid->applyImpulse(impulse,c.m_c1);
} }
} }
}
} }
// //