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

Physics2D/Collider2D: Fix CompoundCollider2D filters

Browse Source
This commit is contained in:
Lynix
2018-08-29 20:54:57 +02:00
parent 652ecd2404
commit e62afabd71
3 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Nazara/Physics2D/Collider2D.cpp
View File

@@ -11,20 +11,21 @@ namespace Nz
{
Collider2D::~Collider2D() = default;
std::vector<cpShape*> Collider2D::GenerateShapes(RigidBody2D* body) const
std::size_t Collider2D::GenerateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
std::vector<cpShape*> shapes;
CreateShapes(body, shapes);
std::size_t shapeCount = CreateShapes(body, shapes);
cpShapeFilter filter = cpShapeFilterNew(m_collisionGroup, m_categoryMask, m_collisionMask);
for (cpShape* shape : shapes)
for (std::size_t i = shapes->size() - shapeCount; i < shapes->size(); ++i)
{
cpShape* shape = (*shapes)[i];
cpShapeSetFilter(shape, filter);
cpShapeSetCollisionType(shape, m_collisionId);
cpShapeSetSensor(shape, (m_trigger) ? cpTrue : cpFalse);
}
return shapes;
return shapeCount;
}
/******************************** BoxCollider2D *********************************/
@@ -50,9 +51,10 @@ namespace Nz
return ColliderType2D_Box;
}
void BoxCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>& shapes) const
std::size_t BoxCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
shapes.push_back(cpBoxShapeNew2(body->GetHandle(), cpBBNew(m_rect.x, m_rect.y, m_rect.x + m_rect.width, m_rect.y + m_rect.height), m_radius));
shapes->push_back(cpBoxShapeNew2(body->GetHandle(), cpBBNew(m_rect.x, m_rect.y, m_rect.x + m_rect.width, m_rect.y + m_rect.height), m_radius));
return 1;
}
/******************************** CircleCollider2D *********************************/
@@ -73,9 +75,10 @@ namespace Nz
return ColliderType2D_Circle;
}
void CircleCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>& shapes) const
std::size_t CircleCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
shapes.push_back(cpCircleShapeNew(body->GetHandle(), m_radius, cpv(m_offset.x, m_offset.y)));
shapes->push_back(cpCircleShapeNew(body->GetHandle(), m_radius, cpv(m_offset.x, m_offset.y)));
return 1;
}
/******************************** CompoundCollider2D *********************************/
@@ -102,24 +105,29 @@ namespace Nz
return ColliderType2D_Compound;
}
void CompoundCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>& shapes) const
std::size_t CompoundCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
// Since C++ does not allow protected call from other objects, we have to be a friend of Collider2D, yay
std::size_t shapeCount = 0;
for (const auto& geom : m_geoms)
geom->CreateShapes(body, shapes);
shapeCount += geom->CreateShapes(body, shapes);
return shapeCount;
}
std::vector<cpShape*> CompoundCollider2D::GenerateShapes(RigidBody2D* body) const
std::size_t CompoundCollider2D::GenerateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
// This is our parent's default behavior
if (m_doesOverrideCollisionProperties)
return Collider2D::GenerateShapes(body);
return Collider2D::GenerateShapes(body, shapes);
else
{
std::vector<cpShape*> shapes;
CreateShapes(body, shapes);
std::size_t shapeCount = 0;
for (const auto& geom : m_geoms)
shapeCount += geom->GenerateShapes(body, shapes);
return shapes;
return shapeCount;
}
}
@@ -145,9 +153,10 @@ namespace Nz
return ColliderType2D_Convex;
}
void ConvexCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>& shapes) const
std::size_t ConvexCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
shapes.push_back(cpPolyShapeNew(body->GetHandle(), int(m_vertices.size()), reinterpret_cast<const cpVect*>(m_vertices.data()), cpTransformIdentity, m_radius));
shapes->push_back(cpPolyShapeNew(body->GetHandle(), int(m_vertices.size()), reinterpret_cast<const cpVect*>(m_vertices.data()), cpTransformIdentity, m_radius));
return 1;
}
/********************************* NullCollider2D **********************************/
@@ -162,8 +171,9 @@ namespace Nz
return (mass > 0.f) ? 1.f : 0.f; //< Null inertia is only possible for static/kinematic objects
}
void NullCollider2D::CreateShapes(RigidBody2D* /*body*/, std::vector<cpShape*>& /*shapes*/) const
std::size_t NullCollider2D::CreateShapes(RigidBody2D* /*body*/, std::vector<cpShape*>* /*shapes*/) const
{
return 0;
}
/******************************** SegmentCollider2D *********************************/
@@ -178,8 +188,9 @@ namespace Nz
return ColliderType2D_Segment;
}
void SegmentCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>& shapes) const
std::size_t SegmentCollider2D::CreateShapes(RigidBody2D* body, std::vector<cpShape*>* shapes) const
{
shapes.push_back(cpSegmentShapeNew(body->GetHandle(), cpv(m_first.x, m_first.y), cpv(m_second.x, m_second.y), m_thickness));
shapes->push_back(cpSegmentShapeNew(body->GetHandle(), cpv(m_first.x, m_first.y), cpv(m_second.x, m_second.y), m_thickness));
return 1;
}
}

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

@@ -311,7 +311,7 @@ namespace Nz
else
m_geom = NullCollider2D::New();
m_shapes = m_geom->GenerateShapes(this);
m_geom->GenerateShapes(this, &m_shapes);
cpSpace* space = m_world->GetHandle();
for (cpShape* shape : m_shapes)