diff --git a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp index dda064954..8fef85ef6 100644 --- a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp @@ -18,32 +18,30 @@ subject to the following restrictions: #include "btCollisionObject.h" btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci) -:btCollisionAlgorithm(ci), -m_colObj0(0), -m_colObj1(0) +:btCollisionAlgorithm(ci) +//, +//m_colObj0(0), +//m_colObj1(0) { } btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* colObj0,btCollisionObject* colObj1) -:btCollisionAlgorithm(ci), -m_colObj0(0), -m_colObj1(0) +:btCollisionAlgorithm(ci) +//, +//m_colObj0(0), +//m_colObj1(0) { - if (ci.m_dispatcher1->needsCollision(colObj0,colObj1)) - { - m_colObj0 = colObj0; - m_colObj1 = colObj1; - - if (!m_colObj0->isActive()) - m_colObj0->activate(); - if (!m_colObj1->isActive()) - m_colObj1->activate(); - } +// if (ci.m_dispatcher1->needsCollision(colObj0,colObj1)) +// { +// m_colObj0 = colObj0; +// m_colObj1 = colObj1; +// +// m_colObj0->activate(); +// m_colObj1->activate(); +// } } btActivatingCollisionAlgorithm::~btActivatingCollisionAlgorithm() { - if (m_colObj0) - m_colObj0->activate(); - if (m_colObj1) - m_colObj1->activate(); -} \ No newline at end of file +// m_colObj0->activate(); +// m_colObj1->activate(); +} diff --git a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h index 30d4dadab..a1f8746c1 100644 --- a/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h @@ -18,10 +18,11 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" +///This class is not enabled yet (work-in-progress) to more aggressively activate objects. class btActivatingCollisionAlgorithm : public btCollisionAlgorithm { - btCollisionObject* m_colObj0; - btCollisionObject* m_colObj1; +// btCollisionObject* m_colObj0; +// btCollisionObject* m_colObj1; public: @@ -32,4 +33,4 @@ public: virtual ~btActivatingCollisionAlgorithm(); }; -#endif //__BT_ACTIVATING_COLLISION_ALGORITHM_H \ No newline at end of file +#endif //__BT_ACTIVATING_COLLISION_ALGORITHM_H