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

Physics2D/RigidBody2D: Fix collisions

This commit is contained in:
Lynix 2016-11-18 18:03:40 +01:00
parent ac2193e0c2
commit e4f507e67f
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ namespace Nz
m_geom(), m_geom(),
m_world(world), m_world(world),
m_gravityFactor(1.f), m_gravityFactor(1.f),
m_mass(0.f) m_mass(1.f)
{ {
NazaraAssert(m_world, "Invalid world"); NazaraAssert(m_world, "Invalid world");
@ -191,6 +191,12 @@ namespace Nz
m_geom = NullCollider2D::New(); m_geom = NullCollider2D::New();
m_shapes = m_geom->CreateShapes(this); m_shapes = m_geom->CreateShapes(this);
cpSpace* space = m_world->GetHandle();
for (cpShape* shape : m_shapes)
cpSpaceAddShape(space, shape);
cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass));
} }
void RigidBody2D::SetMass(float mass) void RigidBody2D::SetMass(float mass)
@ -198,7 +204,10 @@ namespace Nz
if (m_mass > 0.f) if (m_mass > 0.f)
{ {
if (mass > 0.f) if (mass > 0.f)
{
cpBodySetMass(m_handle, mass); cpBodySetMass(m_handle, mass);
cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass));
}
else else
cpBodySetType(m_handle, CP_BODY_TYPE_STATIC); cpBodySetType(m_handle, CP_BODY_TYPE_STATIC);
} }
@ -208,6 +217,7 @@ namespace Nz
{ {
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));
} }
} }
@ -223,6 +233,8 @@ namespace Nz
void RigidBody2D::SetPosition(const Vector2f& position) void RigidBody2D::SetPosition(const Vector2f& position)
{ {
cpBodySetPosition(m_handle, cpv(position.x, position.y)); cpBodySetPosition(m_handle, cpv(position.x, position.y));
if (cpBodyGetType(m_handle) == CP_BODY_TYPE_STATIC)
cpSpaceReindexShapesForBody(m_world->GetHandle(), m_handle);
} }
void RigidBody2D::SetRotation(float rotation) void RigidBody2D::SetRotation(float rotation)
@ -266,12 +278,16 @@ namespace Nz
void RigidBody2D::Destroy() void RigidBody2D::Destroy()
{ {
cpSpace* space = m_world->GetHandle();
for (cpShape* shape : m_shapes) for (cpShape* shape : m_shapes)
{
cpSpaceRemoveShape(space, shape);
cpShapeFree(shape); cpShapeFree(shape);
}
if (m_handle) if (m_handle)
{ {
cpSpaceRemoveBody(m_world->GetHandle(), m_handle); cpSpaceRemoveBody(space, m_handle);
cpBodyFree(m_handle); cpBodyFree(m_handle);
} }
} }