enable deformable vs. deformable and self-collision in deformable loading

This commit is contained in:
Xuchen Han
2019-09-28 15:10:06 -07:00
parent 2d045de589
commit 187019268c

View File

@@ -8087,7 +8087,7 @@ bool PhysicsServerCommandProcessor::processLoadSoftBodyCommand(const struct Shar
} }
#endif #endif
} }
}
if (psb != NULL) if (psb != NULL)
{ {
#ifndef SKIP_DEFORMABLE_BODY #ifndef SKIP_DEFORMABLE_BODY
@@ -8126,8 +8126,10 @@ bool PhysicsServerCommandProcessor::processLoadSoftBodyCommand(const struct Shar
} }
// turn on the collision flag for deformable // turn on the collision flag for deformable
// collision // collision between deformable and rigid
psb->m_cfg.collisions = btSoftBody::fCollision::SDF_RD; psb->m_cfg.collisions = btSoftBody::fCollision::SDF_RD;
// collion between deformable and deformable and self-collision
psb->m_cfg.collisions |= btSoftBody::fCollision::VF_DD;
psb->setCollisionFlags(0); psb->setCollisionFlags(0);
psb->setTotalMass(mass); psb->setTotalMass(mass);
#else #else