From 0a3baf93d6123fbdd971712ea0790862c3c07aaa Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 20 Apr 2008 15:42:21 +0000 Subject: [PATCH] make btSoftBody versus btCompoundShape work --- .../btSoftBodyRigidBodyCollisionConfiguration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp b/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp index 5bd80f52f..78057608a 100644 --- a/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp +++ b/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp @@ -60,14 +60,14 @@ btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCo return m_softSoftCreateFunc; } - ///other can't be also softbody, so assume rigid for now - if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE ) + ///softbody versus convex + if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE && btBroadphaseProxy::isConvex(proxyType1)) { return m_softRigidCreateFunc; } - ///other can't be also softbody, so assume rigid for now - if (proxyType1 == SOFTBODY_SHAPE_PROXYTYPE ) + ///convex versus soft body + if (btBroadphaseProxy::isConvex(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE ) { return m_swappedSoftRigidCreateFunc; }