sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Physics2D/PhysWorld2D: Fix multiple calls to RegisterCallbacks with the same collision id

Browse Source
This commit is contained in:
Lynix
2019-04-15 16:25:40 +02:00
parent 8c7d886f73
commit e61faae089
4 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/Nazara/Physics2D/PhysWorld2D.cpp
View File

@@ -273,14 +273,14 @@ namespace Nz
cpSpaceBBQuery(m_handle, cpBBNew(boundingBox.x, boundingBox.y, boundingBox.x + boundingBox.width, boundingBox.y + boundingBox.height), filter, callback, bodies);
}
void PhysWorld2D::RegisterCallbacks(unsigned int collisionId, const Callback& callbacks)
void PhysWorld2D::RegisterCallbacks(unsigned int collisionId, Callback callbacks)
{
InitCallbacks(cpSpaceAddWildcardHandler(m_handle, collisionId), callbacks);
InitCallbacks(cpSpaceAddWildcardHandler(m_handle, collisionId), std::move(callbacks));
}
void PhysWorld2D::RegisterCallbacks(unsigned int collisionIdA, unsigned int collisionIdB, const Callback& callbacks)
void PhysWorld2D::RegisterCallbacks(unsigned int collisionIdA, unsigned int collisionIdB, Callback callbacks)
{
InitCallbacks(cpSpaceAddCollisionHandler(m_handle, collisionIdA, collisionIdB), callbacks);
InitCallbacks(cpSpaceAddCollisionHandler(m_handle, collisionIdA, collisionIdB), std::move(callbacks));
}
void PhysWorld2D::SetDamping(float dampingValue)
@@ -341,15 +341,20 @@ namespace Nz
cpSpaceUseSpatialHash(m_handle, cpFloat(cellSize), int(entityCount));
}
void PhysWorld2D::InitCallbacks(cpCollisionHandler* handler, const Callback& callbacks)
void PhysWorld2D::InitCallbacks(cpCollisionHandler* handler, Callback callbacks)
{
auto it = m_callbacks.emplace(handler, std::make_unique<Callback>(callbacks)).first;
auto it = m_callbacks.find(handler);
if (it == m_callbacks.end())
it = m_callbacks.emplace(handler, std::make_unique<Callback>(std::move(callbacks))).first;
else
it->second = std::make_unique<Callback>(std::move(callbacks));
handler->userData = it->second.get();
Callback* callbackFunctions = it->second.get();
handler->userData = callbackFunctions;
if (callbacks.startCallback)
if (callbackFunctions->startCallback)
{
handler->beginFunc = [](cpArbiter* arb, cpSpace* space, void *data) -> cpBool
handler->beginFunc = [](cpArbiter* arb, cpSpace* space, void*) -> cpBool
{
cpBody* firstBody;
cpBody* secondBody;
@@ -372,10 +377,19 @@ namespace Nz
return cpFalse;
};
}
if (callbacks.endCallback)
else
{
handler->separateFunc = [](cpArbiter* arb, cpSpace* space, void *data)
handler->beginFunc = [](cpArbiter* arb, cpSpace* space, void*) -> cpBool
{
cpBool retA = cpArbiterCallWildcardBeginA(arb, space);
cpBool retB = cpArbiterCallWildcardBeginB(arb, space);
return retA && retB;
};
}
if (callbackFunctions->endCallback)
{
handler->separateFunc = [](cpArbiter* arb, cpSpace* space, void*)
{
cpBody* firstBody;
cpBody* secondBody;
@@ -394,10 +408,18 @@ namespace Nz
cpArbiterCallWildcardSeparateB(arb, space);
};
}
if (callbacks.preSolveCallback)
else
{
handler->preSolveFunc = [](cpArbiter* arb, cpSpace* space, void *data) -> cpBool
handler->separateFunc = [](cpArbiter* arb, cpSpace* space, void*)
{
cpArbiterCallWildcardSeparateA(arb, space);
cpArbiterCallWildcardSeparateB(arb, space);
};
}
if (callbackFunctions->preSolveCallback)
{
handler->preSolveFunc = [](cpArbiter* arb, cpSpace* space, void* data) -> cpBool
{
cpBody* firstBody;
cpBody* secondBody;
@@ -420,8 +442,17 @@ namespace Nz
return cpFalse;
};
}
else
{
handler->preSolveFunc = [](cpArbiter* arb, cpSpace* space, void* data) -> cpBool
{
cpBool retA = cpArbiterCallWildcardPreSolveA(arb, space);
cpBool retB = cpArbiterCallWildcardPreSolveB(arb, space);
return retA && retB;
};
}
if (callbacks.postSolveCallback)
if (callbackFunctions->postSolveCallback)
{
handler->postSolveFunc = [](cpArbiter* arb, cpSpace* space, void *data)
{
@@ -442,6 +473,14 @@ namespace Nz
cpArbiterCallWildcardPostSolveB(arb, space);
};
}
else
{
handler->postSolveFunc = [](cpArbiter* arb, cpSpace* space, void* data)
{
cpArbiterCallWildcardPostSolveA(arb, space);
cpArbiterCallWildcardPostSolveB(arb, space);
};
}
}
void PhysWorld2D::OnRigidBodyMoved(RigidBody2D* oldPointer, RigidBody2D* newPointer)