merge loek/scripts

4 files changed, 45 insertions, 19 deletions

diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 2422cdc..5f68928 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -48,14 +48,23 @@ protected:
 	 */
 	virtual void init() {}
 	/**
-	 * \brief Script update function (empty by default)
+	 * \brief Script fixed 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.
+	 * \note 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) {}
+	virtual void fixed_update(duration_t delta_time) {}
+	/**
+	 * \brief Script frame update function (empty by default)
+	 *
+	 * \param delta_time Time since last frame update
+	 *
+	 * \note This function is called during the ScriptSystem::update() routine if the \c
+	 * BehaviorScript component holding this script instance is active.
+	 */
+	virtual void frame_update(duration_t delta_time) {}
 	//! \}
 
 	//! ScriptSystem calls \c init() and \c update()
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index 9a10f9b..06caa54 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,7 +1,8 @@
-#include "../util/dbg.h"
+#include "../Resource.h"
+#include "../facade/SDLContext.h"
 #include "../manager/Mediator.h"
 #include "../types.h"
-#include "../Resource.h"
+#include "../util/dbg.h"
 
 #include "SDLContext.h"
 #include "Texture.h"
@@ -27,4 +28,3 @@ const ivec2 & Texture::get_size() const noexcept { return this->size; }
 const float & Texture::get_ratio() const noexcept { return this->aspect_ratio; }
 
 SDL_Texture * Texture::get_img() const noexcept { return this->texture.get(); }
-
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 746285f..93b4853 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,7 +1,6 @@
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 #include "../manager/ComponentManager.h"
-#include "../util/dbg.h"
 
 #include "ScriptSystem.h"
 
@@ -9,10 +8,20 @@ using namespace std;
 using namespace crepe;
 
 void ScriptSystem::fixed_update() {
-	dbg_trace();
+	LoopTimerManager & timer = this->mediator.loop_timer;
+	duration_t delta_time = timer.get_scaled_fixed_delta_time();
+	this->update(&Script::fixed_update, delta_time);
+}
 
-	ComponentManager & mgr = this->mediator.component_manager;
+void ScriptSystem::frame_update() {
 	LoopTimerManager & timer = this->mediator.loop_timer;
+	duration_t delta_time = timer.get_delta_time();
+	this->update(&Script::frame_update, delta_time);
+}
+
+void ScriptSystem::update(void (Script::*update_function)(duration_t),
+						  const duration_t & delta_time) {
+	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
 	for (BehaviorScript & behavior_script : behavior_scripts) {
@@ -26,7 +35,6 @@ void ScriptSystem::fixed_update() {
 			script->initialized = true;
 		}
 
-		duration_t delta_time = timer.get_scaled_fixed_delta_time();
-		script->update(delta_time);
+		(*script.*update_function)(delta_time);
 	}
 }
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index 612c2ae..257b615 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../manager/LoopTimerManager.h"
+
 #include "System.h"
 
 namespace crepe {
@@ -9,20 +11,27 @@ class Script;
 /**
  * \brief Script system
  *
- * The script system is responsible for all \c BehaviorScript components, and
- * calls the methods on classes derived from \c Script.
+ * The script system is responsible for all \c BehaviorScript components, and calls the methods
+ * on classes derived from \c Script.
  */
 class ScriptSystem : public System {
 public:
 	using System::System;
+
+public:
+	//! Call Script::fixed_update() on all active \c BehaviorScript instances
+	void fixed_update() override;
+	//! Call Script::frame_update() on all active \c BehaviorScript instances
+	void frame_update() override;
+
+private:
 	/**
-	 * \brief Call Script::update() on all active \c BehaviorScript instances
+	 * \brief Call Script `*_update` member function on all active \c BehaviorScript instances
 	 *
-	 * This routine updates all scripts sequentially using the Script::update()
-	 * method. It also calls Script::init() if this has not been done before on
-	 * the \c BehaviorScript instance.
+	 * \note This routine also calls Script::init() if this has not been done before on the \c
+	 * BehaviorScript instance.
 	 */
-	void fixed_update() override;
+	void update(void (Script::*update_function)(duration_t), const duration_t & delta_time);
 };
 
 } // namespace crepe