- physics: pre-integrate and post-integrate as events

Author: SoapyMan

shared/physics/eqPhysics_World.cpp

@@ -1225,7 +1225,7 @@ void CEqPhysicsWorld::ProcessContactPair(eqContactPair& pair)
 //
 //----------------------------------------------------------------------------------------------------
 
-void CEqPhysicsWorld::SimulateStep(float deltaTime, int iteration, FNSIMULATECALLBACK preIntegrFunc)
+void CEqPhysicsWorld::SimulateStep(float deltaTime, int iteration)
 {
 	if(!m_broadphase)
 		return;
@@ -1251,7 +1251,7 @@ void CEqPhysicsWorld::SimulateStep(float deltaTime, int iteration, FNSIMULATECAL
 			contr->Update(m_fDt);
 		}
 	}
-	
+
 	m_simMovingMoveables.clear();
 	m_simMovingMoveables.reserve(m_moveable.numElem());
 
@@ -1288,8 +1288,7 @@ void CEqPhysicsWorld::SimulateStep(float deltaTime, int iteration, FNSIMULATECAL
 
 	m_fDt = deltaTime;
 
-	if(preIntegrFunc)
-		preIntegrFunc(m_fDt, iteration);
+	m_preIntegrateEvt(m_fDt, iteration);
 
 	if(m_collDetJob)
 	{
@@ -1323,6 +1322,8 @@ void CEqPhysicsWorld::SimulateStep(float deltaTime, int iteration, FNSIMULATECAL
 				callbacks->PostSimulate(m_fDt);
 		}
 	}
+	
+	m_postIntegrateEvt(m_fDt, iteration);
 
 	{
 		PROF_EVENT("Constraits apply");

shared/physics/eqPhysics_World.h

@@ -31,6 +31,7 @@
 #pragma once
 #include "eqPhysics_Defs.h"
 #include "core/IEqParallelJobs.h"
+#include "ds/event.h"
 
 struct btDispatcherInfo;
 class btCollisionWorld;
@@ -48,7 +49,7 @@ class CEqPhysicsBroadphase;
 class IEqPhysicsConstraint;
 class IEqPhysController;
 
-typedef void (*FNSIMULATECALLBACK)(float fDt, int iterNum);
+using PhysIntegrateEvent = Event<void(float delta, int iterNum)>;
 
 //--------------------------------------------------------------------------------------------------------------
 
@@ -78,6 +79,9 @@ class CEqPhysicsWorld
 	const eqPhysSurfParam*			FindSurfaceParam(const char* name) const;
 	const eqPhysSurfParam*			GetSurfaceParamByID(int id) const;
 
+	PhysIntegrateEvent&				GetPreIntegrateEvent() { return m_preIntegrateEvt; }
+	PhysIntegrateEvent&				GetPostIntegrateEvent() { return m_postIntegrateEvt; }
+
 	void							AddToMoveableList( CEqRigidBody* body );			///< adds object to moveable list
 	void							RemoveFromMoveableList( CEqRigidBody* body );
 
@@ -144,7 +148,7 @@ class CEqPhysicsWorld
 	void							DebugDrawBodies(int mode);
 
 	///< Simulates physics
-	void							SimulateStep( float deltaTime, int iteration, FNSIMULATECALLBACK preIntegrFunc);	///< simulates physics
+	void							SimulateStep( float deltaTime, int iteration);	///< simulates physics
 
 
 	// checks collision (made especially for rays, but could be used in other situations)
@@ -171,6 +175,9 @@ class CEqPhysicsWorld
 	class PreSimulateJob;
 	class CollisionDetectionJob;
 
+	PhysIntegrateEvent				m_preIntegrateEvt{ PP_SL };
+	PhysIntegrateEvent				m_postIntegrateEvt{ PP_SL };
+
 	CEqJobManager&					m_jobMng;
 	PreSimulateJob*					m_preSimJob{ nullptr };
 	CollisionDetectionJob*			m_collDetJob{ nullptr };