Physics[2|3]D/PhysWorld[2|3]D: Add max step count

src/Nazara/Physics2D/PhysWorld2D.cpp

@@ -80,6 +80,7 @@ namespace Nz
 	}
 
 	PhysWorld2D::PhysWorld2D() :
+	m_maxStepCount(50),
 	m_stepSize(0.005f),
 	m_timestepAccumulator(0.f)
 	{
@@ -149,6 +150,11 @@ namespace Nz
 		return cpSpaceGetIterations(m_handle);
 	}
 
+	std::size_t PhysWorld2D::GetMaxStepCount() const
+	{
+		return m_maxStepCount;
+	}
+
 	float PhysWorld2D::GetStepSize() const
 	{
 		return m_stepSize;
@@ -291,6 +297,11 @@ namespace Nz
 		cpSpaceSetIterations(m_handle, int(iterationCount));
 	}
 
+	void PhysWorld2D::SetMaxStepCount(std::size_t maxStepCount)
+	{
+		m_maxStepCount = maxStepCount;
+	}
+
 	void PhysWorld2D::SetStepSize(float stepSize)
 	{
 		m_stepSize = stepSize;
@@ -300,7 +311,8 @@ namespace Nz
 	{
 		m_timestepAccumulator += timestep;
 
-		while (m_timestepAccumulator >= m_stepSize)
+		std::size_t stepCount = 0;
+		while (m_timestepAccumulator >= m_stepSize && stepCount < m_maxStepCount)
 		{
 			OnPhysWorld2DPreStep(this);
 
@@ -319,6 +331,7 @@ namespace Nz
 			}
 
 			m_timestepAccumulator -= m_stepSize;
+			stepCount++;
 		}
 	}
 

src/Nazara/Physics3D/PhysWorld3D.cpp

@@ -10,6 +10,7 @@ namespace Nz
 {
 	PhysWorld3D::PhysWorld3D() :
 	m_gravity(Vector3f::Zero()),
+	m_maxStepCount(50),
 	m_stepSize(0.005f),
 	m_timestepAccumulator(0.f)
 	{
@@ -32,6 +33,11 @@ namespace Nz
 		return m_world;
 	}
 
+	std::size_t PhysWorld3D::GetMaxStepCount() const
+	{
+		return m_maxStepCount;
+	}
+
 	float PhysWorld3D::GetStepSize() const
 	{
 		return m_stepSize;
@@ -42,6 +48,11 @@ namespace Nz
 		m_gravity = gravity;
 	}
 
+	void PhysWorld3D::SetMaxStepCount(std::size_t maxStepCount)
+	{
+		m_maxStepCount = maxStepCount;
+	}
+
 	void PhysWorld3D::SetSolverModel(unsigned int model)
 	{
 		NewtonSetSolverModel(m_world, model);
@@ -56,10 +67,12 @@ namespace Nz
 	{
 		m_timestepAccumulator += timestep;
 
-		while (m_timestepAccumulator >= m_stepSize)
+		std::size_t stepCount = 0;
+		while (m_timestepAccumulator >= m_stepSize && stepCount < m_maxStepCount)
 		{
 			NewtonUpdate(m_world, m_stepSize);
 			m_timestepAccumulator -= m_stepSize;
+			stepCount++;
 		}
 	}
 }