get rid of nullptr and std::function

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

View File

@@ -29,7 +29,7 @@ struct DeformableContactConstraint
DeformableContactConstraint(const btVector3 dir)
{
m_contact.push_back(nullptr);
m_contact.push_back(NULL);
m_direction.push_back(dir);
m_value.push_back(0);
m_accumulated_normal_impulse.push_back(0);
@@ -37,7 +37,7 @@ struct DeformableContactConstraint
DeformableContactConstraint()
{
m_contact.push_back(nullptr);
m_contact.push_back(NULL);
m_direction.push_back(btVector3(0,0,0));
m_value.push_back(0);
m_accumulated_normal_impulse.push_back(0);