merge `loek/scripts`

3 files changed, 19 insertions, 2 deletions

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 34e7908..cafc636 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -45,3 +45,6 @@ void Script::replay::release(recording_t recording) {
 	ReplayManager & mgr = this->mediator->replay_manager;
 	return mgr.release(recording);
 }
+
+LoopTimerManager & Script::get_loop_timer() const { return this->mediator->loop_timer; }
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 6536fa4..b052f8b 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -3,6 +3,7 @@
 #include <vector>
 
 #include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
 #include "../manager/Mediator.h"
 #include "../manager/ReplayManager.h"
 #include "../system/CollisionSystem.h"
@@ -48,9 +49,17 @@ protected:
 	/**
 	 * \brief Script update function (empty by default)
 	 *
+	 * \param delta_time Time since last fixed update
+	 *
 	 * This function is called during the ScriptSystem::update() routine if the \c BehaviorScript
 	 * component holding this script instance is active.
 	 */
+	virtual void update(duration_t delta_time) { return this->update(); }
+	/**
+	 * \brief Fallback script update function (empty by default)
+	 *
+	 * Allows the game programmer to ignore parameters passed to \c update()
+	 */
 	virtual void update() {}
 	//! \}
 
@@ -157,7 +166,9 @@ protected:
 		replay(OptionalRef<Mediator> & mediator) : mediator(mediator) {}
 		friend class Script;
 	} replay{mediator};
-	//! \}
+
+	//! Retrieve LoopTimerManager reference
+	LoopTimerManager & get_loop_timer() const;
 
 private:
 	/**
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 0d10011..58055d6 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -12,6 +12,7 @@ void ScriptSystem::fixed_update() {
 	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
+	LoopTimerManager & timer = this->mediator.loop_timer;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
 	for (BehaviorScript & behavior_script : behavior_scripts) {
@@ -24,6 +25,8 @@ void ScriptSystem::fixed_update() {
 			script->init();
 			script->initialized = true;
 		}
-		script->update();
+
+		duration_t delta_time = timer.get_delta_time();
+		script->update(delta_time);
 	}
 }