Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

src/Nazara/Physics2D/Collider2D.cpp

@@ -13,9 +13,12 @@ namespace Nz
 
 	std::vector<cpShape*> Collider2D::GenerateShapes(RigidBody2D* body) const
 	{
+		cpShapeFilter filter = cpShapeFilterNew(m_collisionGroup, m_categoryMask, m_collisionMask);
+
 		std::vector<cpShape*> shapes = CreateShapes(body);
 		for (cpShape* shape : shapes)
 		{
+			cpShapeSetFilter(shape, filter);
 			cpShapeSetCollisionType(shape, m_collisionId);
 			cpShapeSetSensor(shape, (m_trigger) ? cpTrue : cpFalse);
 		}

src/Nazara/Physics2D/PhysWorld2D.cpp

@@ -37,6 +37,35 @@ namespace Nz
 		return m_stepSize;
 	}
 
+	bool PhysWorld2D::NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, NearestQueryResult* result)
+	{
+		cpShapeFilter filter = cpShapeFilterNew(collisionGroup, categoryMask, collisionMask);
+
+		if (result)
+		{
+			cpPointQueryInfo queryInfo;
+
+			if (cpShape* shape = cpSpacePointQueryNearest(m_handle, { from.x, from.y }, maxDistance, filter, &queryInfo))
+			{
+				result->closestPoint.Set(queryInfo.point.x, queryInfo.point.y);
+				result->distance = queryInfo.distance;
+				result->fraction.Set(queryInfo.gradient.x, queryInfo.gradient.y);
+				result->nearestBody = static_cast<Nz::RigidBody2D*>(cpShapeGetUserData(shape));
+
+				return true;
+			}
+			else
+				return false;
+		}
+		else
+		{
+			if (cpShape* shape = cpSpacePointQueryNearest(m_handle, { from.x, from.y }, maxDistance, filter, nullptr))
+				return true;
+			else
+				return false;
+		}
+	}
+
 	void PhysWorld2D::RegisterCallbacks(unsigned int collisionId, const Callback& callbacks)
 	{
 		InitCallbacks(cpSpaceAddWildcardHandler(m_handle, collisionId), callbacks);
@@ -63,7 +92,12 @@ namespace Nz
 
 		while (m_timestepAccumulator >= m_stepSize)
 		{
+			OnPhysWorld2DPreStep(this);
+
 			cpSpaceStep(m_handle, m_stepSize);
+
+			OnPhysWorld2DPostStep(this);
+
 			m_timestepAccumulator -= m_stepSize;
 		}
 	}

src/Nazara/Physics2D/RigidBody2D.cpp

@@ -229,7 +229,10 @@ namespace Nz
 
 		cpSpace* space = m_world->GetHandle();
 		for (cpShape* shape : m_shapes)
+		{
+			cpShapeSetUserData(shape, this);
 			cpSpaceAddShape(space, shape);
+		}
 
 		cpBodySetMoment(m_handle, m_geom->ComputeInertialMatrix(m_mass));
 	}