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

disable btActivatingCollisionAlgorithm

Browse Source
This commit is contained in:
erwin.coumans
2008-11-08 17:14:13 +00:00
parent 98e66fc1c7
commit 3e9af21cec
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
View File

@@ -18,32 +18,30 @@ subject to the following restrictions:
#include "btCollisionObject.h" #include "btCollisionObject.h"
btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci) btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci)
:btCollisionAlgorithm(ci), :btCollisionAlgorithm(ci)
m_colObj0(0), //,
m_colObj1(0) //m_colObj0(0),
//m_colObj1(0)
{ {
} }
btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* colObj0,btCollisionObject* colObj1) btActivatingCollisionAlgorithm::btActivatingCollisionAlgorithm (const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* colObj0,btCollisionObject* colObj1)
:btCollisionAlgorithm(ci), :btCollisionAlgorithm(ci)
m_colObj0(0), //,
m_colObj1(0) //m_colObj0(0),
//m_colObj1(0)
{ {
if (ci.m_dispatcher1->needsCollision(colObj0,colObj1)) // if (ci.m_dispatcher1->needsCollision(colObj0,colObj1))
{ // {
m_colObj0 = colObj0; // m_colObj0 = colObj0;
m_colObj1 = colObj1; // m_colObj1 = colObj1;
//
if (!m_colObj0->isActive()) // m_colObj0->activate();
m_colObj0->activate(); // m_colObj1->activate();
if (!m_colObj1->isActive()) // }
m_colObj1->activate();
}
} }
btActivatingCollisionAlgorithm::~btActivatingCollisionAlgorithm() btActivatingCollisionAlgorithm::~btActivatingCollisionAlgorithm()
{ {
if (m_colObj0) // m_colObj0->activate();
m_colObj0->activate(); // m_colObj1->activate();
if (m_colObj1)
m_colObj1->activate();
} }

5
src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
View File

@@ -18,10 +18,11 @@ subject to the following restrictions:
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
///This class is not enabled yet (work-in-progress) to more aggressively activate objects.
class btActivatingCollisionAlgorithm : public btCollisionAlgorithm class btActivatingCollisionAlgorithm : public btCollisionAlgorithm
{ {
btCollisionObject* m_colObj0; // btCollisionObject* m_colObj0;
btCollisionObject* m_colObj1; // btCollisionObject* m_colObj1;
public: public: