apply patch for convex decomposition performance improvements, thanks to Tuan Kuranes:

http://code.google.com/p/bullet/issues/detail?id=199
Fix in soft body collision, adding collision margin twice (was visible when rigid body spheres rested on cloth)
This commit is contained in:
erwin.coumans
2009-02-28 00:21:30 +00:00
parent 93dd14dfff
commit a216ce4bf6
2 changed files with 27 additions and 5 deletions

View File

@@ -743,8 +743,8 @@ struct btSoftColliders
psb = ps;
m_colObj = colOb;
idt = ps->m_sst.isdt;
margin = m_colObj->getCollisionShape()->getMargin()+
m_colObj->getCollisionShape()->getMargin();
margin = m_colObj->getCollisionShape()->getMargin();
///Bullet rigid body uses multiply instead of minimum to determine combined friction. Some customization would be useful.
friction = btMin(psb->m_cfg.kDF,m_colObj->getFriction());
btVector3 mins;
btVector3 maxs;