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

move erp for deformable into a separate parameter

Browse Source
This commit is contained in:
Xuchen Han
2019-11-07 12:13:51 -08:00
parent e66982d658
commit baa9dcdf08
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletSoftBody/btDeformableContactProjection.cpp
View File

@@ -59,7 +59,7 @@ void btDeformableContactProjection::splitImpulseSetup(const btContactSolverInfo&
btAlignedObjectArray<btDeformableNodeRigidContactConstraint>& constraints = *m_nodeRigidConstraints.getAtIndex(index);
for (int i = 0; i < constraints.size(); ++i)
{
constraints[i].setPenetrationScale(infoGlobal.m_erp);
constraints[i].setPenetrationScale(infoGlobal.m_deformable_erp);
}
}
@@ -67,7 +67,7 @@ void btDeformableContactProjection::splitImpulseSetup(const btContactSolverInfo&
for (int index = 0; index < m_allFaceConstraints.size(); ++index)
{
btDeformableContactConstraint* constraint = m_allFaceConstraints[index];
constraint->setPenetrationScale(infoGlobal.m_erp);
constraint->setPenetrationScale(infoGlobal.m_deformable_erp);
}
}