diff options
author | Chuyuan Kelly Fu <fuchuyuan@google.com> | 2022-02-18 17:59:32 -0800 |
---|---|---|
committer | Chuyuan Kelly Fu <fuchuyuan@google.com> | 2022-03-03 12:03:06 -0800 |
commit | c014789db0907e9c2289fd6f2030d06470ea4c8b (patch) | |
tree | d64eb745145efa732536b1894e671d6affe4c2bc | |
parent | 4b12767b60c56dd14227809bfa3ed19a656dd3e6 (diff) | |
download | bullet3-c014789db0907e9c2289fd6f2030d06470ea4c8b.tar.gz |
remove redundant functions
-rw-r--r-- | src/BulletSoftBody/btSoftBody.cpp | 8 | ||||
-rw-r--r-- | src/BulletSoftBody/btSoftBody.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp index 366c8a477..c6226a008 100644 --- a/src/BulletSoftBody/btSoftBody.cpp +++ b/src/BulletSoftBody/btSoftBody.cpp @@ -4288,14 +4288,6 @@ void btSoftBody::geometricCollisionHandler(btSoftBody* psb) } } } -void btSoftBody::approximateCollisionHandler(btSoftBody* psb) -{ - if (psb->isActive() || this->isActive()) - { - // test aabb collision - } -} - void btSoftBody::setWindVelocity(const btVector3& velocity) { diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h index 641883dec..9f2ef3200 100644 --- a/src/BulletSoftBody/btSoftBody.h +++ b/src/BulletSoftBody/btSoftBody.h @@ -407,7 +407,7 @@ public: btScalar m_friction; // Friction btScalar m_imf; // inverse mass of the face at contact point btScalar m_c0; // scale of the impulse matrix; - const btCollisionObject* m_colObj; // Collision object to collide with. + const btCollisionObject* m_colObj; // Collision object to collide with. }; /* SContact */ @@ -1091,7 +1091,6 @@ public: /* defaultCollisionHandlers */ void defaultCollisionHandler(const btCollisionObjectWrapper* pcoWrap); void defaultCollisionHandler(btSoftBody* psb); - void approximateCollisionHandler(btSoftBody* psb) void setSelfCollision(bool useSelfCollision); bool useSelfCollision(); void updateDeactivation(btScalar timeStep); |