sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE: Simplify collision callback registration.

Browse Source 
Remove list m_triggerController and just use getter CcdPhysicsController->Registered().

Reviewers: sybren, agoose77
This commit is contained in:
Porteries Tristan 2015-06-19 11:52:37 +02:00
parent ae0ed5e9d5
commit e9406256d0
2 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -466,14 +466,6 @@ void CcdPhysicsEnvironment::AddCcdPhysicsController(CcdPhysicsController* ctrl)
return;
}
/* In the case of compound child controller (see also RemoveCcdPhysicsController)
* we add the controller to the trigger controlers list : m_triggerControllers
* if it use collision callbacks.
*/
if (ctrl->Registered()) {
m_triggerControllers.insert(ctrl);
}
btRigidBody* body = ctrl->GetRigidBody();
btCollisionObject* obj = ctrl->GetCollisionObject();
@ -521,16 +513,6 @@ bool CcdPhysicsEnvironment::RemoveCcdPhysicsController(CcdPhysicsController* ctr
return false;
}
/* In the case of compound child controller which use collision callbacks
* we remove it from the m_triggerControllers list but leave m_registerCount
* to know in AddCcdPhysicsController if we have to add it in m_triggerControllers
* and to avoid an useless added in RequestCollisionCallback, indeed we can't register
* more than one time a controller.
*/
if (ctrl->Registered()) {
m_triggerControllers.erase(ctrl);
}
//also remove constraint
btRigidBody* body = ctrl->GetRigidBody();
if (body)
@ -2199,10 +2181,7 @@ void CcdPhysicsEnvironment::AddSensor(PHY_IPhysicsController* ctrl)
bool CcdPhysicsEnvironment::RemoveCollisionCallback(PHY_IPhysicsController* ctrl)
{
CcdPhysicsController* ccdCtrl = (CcdPhysicsController*)ctrl;
if (!ccdCtrl->Unregister())
return false;
m_triggerControllers.erase(ccdCtrl);
return true;
return ccdCtrl->Unregister();
}
@ -2246,11 +2225,7 @@ void CcdPhysicsEnvironment::AddTouchCallback(int response_class, PHY_ResponseCal
bool CcdPhysicsEnvironment::RequestCollisionCallback(PHY_IPhysicsController* ctrl)
{
CcdPhysicsController* ccdCtrl = static_cast<CcdPhysicsController*>(ctrl);
if (!ccdCtrl->Register())
return false;
m_triggerControllers.insert(ccdCtrl);
return true;
return !ccdCtrl->Register();
}
void CcdPhysicsEnvironment::CallbackTriggers()
@ -2289,16 +2264,17 @@ void CcdPhysicsEnvironment::CallbackTriggers()
//m_internalOwner is set in 'addPhysicsController'
CcdPhysicsController* ctrl0 = static_cast<CcdPhysicsController*>(rb0->getUserPointer());
CcdPhysicsController* ctrl1 = static_cast<CcdPhysicsController*>(rb1->getUserPointer());
bool usecallback = false;
std::set<CcdPhysicsController*>::const_iterator iter = m_triggerControllers.find(ctrl0);
if (iter == m_triggerControllers.end())
{
iter = m_triggerControllers.find(ctrl1);
// Test if one of the controller is registered and use collision callback.
if (ctrl0->Registered())
usecallback = true;
else if (ctrl1->Registered()) {
colliding_ctrl0 = false;
usecallback = true;
}
if (iter != m_triggerControllers.end())
{
if (usecallback) {
static PHY_CollData coll_data;
const btManifoldPoint &cp = manifold->getContactPoint(0);

1
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
View File

@ -291,7 +291,6 @@ protected:
std::set<CcdPhysicsController*> m_controllers;
std::set<CcdPhysicsController*> m_triggerControllers;
PHY_ResponseCallback m_triggerCallbacks[PHY_NUM_RESPONSE];
void* m_triggerCallbacksUserPtrs[PHY_NUM_RESPONSE];