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

Physics2D/RigidBody2D: Fix SetMass occasionnal crash

Browse Source
This commit is contained in:
Jérôme Leclercq
2017-03-08 13:16:53 +01:00
parent 78d6a69bcb
commit 43f8f21df6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Nazara/Physics2D/RigidBody2D.cpp
View File

@@ -244,24 +244,27 @@ namespace Nz
if (m_mass > 0.f) if (m_mass > 0.f)
{ {
if (mass > 0.f) if (mass > 0.f)
{
m_world->RegisterPostStep(this, [this, mass]()
{ {
cpBodySetMass(m_handle, mass); cpBodySetMass(m_handle, mass);
cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass)); cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass));
});
} }
else else
m_world->RegisterPostStep(this, [this]() { cpBodySetType(m_handle, CP_BODY_TYPE_STATIC); } ); m_world->RegisterPostStep(this, [this]() { cpBodySetType(m_handle, CP_BODY_TYPE_STATIC); } );
} }
else if (mass > 0.f) else if (mass > 0.f)
{
if (cpBodyGetType(m_handle) == CP_BODY_TYPE_STATIC)
{ {
m_world->RegisterPostStep(this, [this, mass]() m_world->RegisterPostStep(this, [this, mass]()
{
if (cpBodyGetType(m_handle) == CP_BODY_TYPE_STATIC)
{ {
cpBodySetType(m_handle, CP_BODY_TYPE_DYNAMIC); cpBodySetType(m_handle, CP_BODY_TYPE_DYNAMIC);
cpBodySetMass(m_handle, mass); cpBodySetMass(m_handle, mass);
cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass)); cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass));
});
} }
});
} }
m_mass = mass; m_mass = mass;