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

initialize m_useSelfCollision

Browse Source
This commit is contained in:
Xuchen Han
2019-10-24 15:28:21 -07:00
parent 270028363b
commit 23dbea16f3
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/DeformableDemo/ClothFriction.cpp
View File

@@ -104,6 +104,8 @@ void ClothFriction::initPhysics()
btVector3 gravity = btVector3(0, -10, 0); btVector3 gravity = btVector3(0, -10, 0);
m_dynamicsWorld->setGravity(gravity); m_dynamicsWorld->setGravity(gravity);
getDeformableDynamicsWorld()->getWorldInfo().m_gravity = gravity; getDeformableDynamicsWorld()->getWorldInfo().m_gravity = gravity;
getDeformableDynamicsWorld()->getWorldInfo().m_sparsesdf.setDefaultVoxelsz(0.25);
getDeformableDynamicsWorld()->getWorldInfo().m_sparsesdf.Reset();
m_guiHelper->createPhysicsDebugDrawer(m_dynamicsWorld); m_guiHelper->createPhysicsDebugDrawer(m_dynamicsWorld);

1
examples/DeformableDemo/DeformableSelfCollision.cpp
View File

@@ -166,6 +166,7 @@ void DeformableSelfCollision::initPhysics()
psb->m_cfg.collisions = btSoftBody::fCollision::SDF_RD; psb->m_cfg.collisions = btSoftBody::fCollision::SDF_RD;
psb->m_cfg.collisions |= btSoftBody::fCollision::VF_DD; psb->m_cfg.collisions |= btSoftBody::fCollision::VF_DD;
getDeformableDynamicsWorld()->addSoftBody(psb); getDeformableDynamicsWorld()->addSoftBody(psb);
psb->setSelfCollision(true);
btDeformableMassSpringForce* mass_spring = new btDeformableMassSpringForce(10,0.2, true); btDeformableMassSpringForce* mass_spring = new btDeformableMassSpringForce(10,0.2, true);
getDeformableDynamicsWorld()->addForce(psb, mass_spring); getDeformableDynamicsWorld()->addForce(psb, mass_spring);

1
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -119,6 +119,7 @@ void btSoftBody::initDefaults()
m_dampingCoefficient = 1; m_dampingCoefficient = 1;
m_sleepingThreshold = 0.1; m_sleepingThreshold = 0.1;
m_useFaceContact = false; m_useFaceContact = false;
m_useSelfCollision = false;
m_collisionFlags = 0; m_collisionFlags = 0;
} }