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

make btSoftBody versus btCompoundShape work

Browse Source
This commit is contained in:
erwin.coumans
2008-04-20 15:42:21 +00:00
parent 7a7b46b448
commit 0a3baf93d6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
View File

@@ -60,14 +60,14 @@ btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCo
return m_softSoftCreateFunc; return m_softSoftCreateFunc;
} }
///other can't be also softbody, so assume rigid for now ///softbody versus convex
if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE ) if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE && btBroadphaseProxy::isConvex(proxyType1))
{ {
return m_softRigidCreateFunc; return m_softRigidCreateFunc;
} }
///other can't be also softbody, so assume rigid for now ///convex versus soft body
if (proxyType1 == SOFTBODY_SHAPE_PROXYTYPE ) if (btBroadphaseProxy::isConvex(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE )
{ {
return m_swappedSoftRigidCreateFunc; return m_swappedSoftRigidCreateFunc;
} }