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

add back preTickCallback & disable position Correction for more stability

Browse Source
This commit is contained in:
Xuchen Han
2019-09-09 16:34:54 -07:00
committed by Xuchen Han
parent acfcc3fc9a
commit 36278edc00
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp
View File

@@ -37,6 +37,10 @@ The algorithm also closely resembles the one in http://physbam.stanford.edu/~fed
void btDeformableMultiBodyDynamicsWorld::internalSingleStepSimulation(btScalar timeStep) void btDeformableMultiBodyDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
{ {
BT_PROFILE("internalSingleStepSimulation"); BT_PROFILE("internalSingleStepSimulation");
if (0 != m_internalPreTickCallback)
{
(*m_internalPreTickCallback)(this, timeStep);
}
reinitialize(timeStep); reinitialize(timeStep);
// add gravity to velocity of rigid and multi bodys // add gravity to velocity of rigid and multi bodys
applyRigidBodyGravity(timeStep); applyRigidBodyGravity(timeStep);
@@ -144,8 +148,8 @@ void btDeformableMultiBodyDynamicsWorld::positionCorrection(btScalar timeStep)
void btDeformableMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep) void btDeformableMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep)
{ {
BT_PROFILE("integrateTransforms"); BT_PROFILE("integrateTransforms");
m_deformableBodySolver->backupVelocity(); //m_deformableBodySolver->backupVelocity();
positionCorrection(timeStep); //positionCorrection(timeStep);
btMultiBodyDynamicsWorld::integrateTransforms(timeStep); btMultiBodyDynamicsWorld::integrateTransforms(timeStep);
for (int i = 0; i < m_softBodies.size(); ++i) for (int i = 0; i < m_softBodies.size(); ++i)
{ {
@@ -170,8 +174,9 @@ void btDeformableMultiBodyDynamicsWorld::integrateTransforms(btScalar timeStep)
node.m_q = node.m_x; node.m_q = node.m_x;
node.m_vn = node.m_v; node.m_vn = node.m_v;
} }
psb->interpolateRenderMesh();
} }
m_deformableBodySolver->revertVelocity(); //m_deformableBodySolver->revertVelocity();
} }
void btDeformableMultiBodyDynamicsWorld::solveConstraints(btScalar timeStep) void btDeformableMultiBodyDynamicsWorld::solveConstraints(btScalar timeStep)