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

get rid of nullptr and std::function

Browse Source
This commit is contained in:
Xuchen Han
2019-08-03 00:10:36 -07:00
parent 021cbb2a0e
commit c5d84c1a0b
5 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/BulletSoftBody/btDeformableRigidDynamicsWorld.cpp
View File

@@ -58,7 +58,7 @@ void btDeformableRigidDynamicsWorld::positionCorrection(btScalar dt)
{
const btSoftBody::RContact* c = constraint.m_contact[j];
// skip anchor points
if (c == nullptr || c->m_node->m_im == 0)
if (c == NULL || c->m_node->m_im == 0)
continue;
const btSoftBody::sCti& cti = c->m_cti;
btVector3 va(0, 0, 0);
@@ -206,14 +206,24 @@ void btDeformableRigidDynamicsWorld::beforeSolverCallbacks(btScalar timeStep)
{
(*m_internalTickCallback)(this, timeStep);
}
for (int i = 0; i < m_beforeSolverCallbacks.size(); ++i)
m_beforeSolverCallbacks[i](m_internalTime, this);
if (0 != m_solverCallback)
{
(*m_solverCallback)(m_internalTime, this);
}
// for (int i = 0; i < m_beforeSolverCallbacks.size(); ++i)
// m_beforeSolverCallbacks[i](m_internalTime, this);
}
void btDeformableRigidDynamicsWorld::afterSolverCallbacks(btScalar timeStep)
{
for (int i = 0; i < m_beforeSolverCallbacks.size(); ++i)
m_beforeSolverCallbacks[i](m_internalTime, this);
if (0 != m_solverCallback)
{
(*m_solverCallback)(m_internalTime, this);
}
// for (int i = 0; i < m_beforeSolverCallbacks.size(); ++i)
// m_beforeSolverCallbacks[i](m_internalTime, this);
}
void btDeformableRigidDynamicsWorld::addForce(btSoftBody* psb, btDeformableLagrangianForce* force)