From 770496ee9d0e45480c0e0f8951adb8eee247bfe1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 10 Dec 2024 19:50:26 +0100
Subject: big WIP

---
 src/crepe/system/ScriptSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index d6b2ca1..ab79fc3 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 using namespace crepe;
 
-void ScriptSystem::update() {
+void ScriptSystem::fixed_update() {
 	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
-- 
cgit v1.2.3


From 297d621987c224db26eadfb9bde9235741387496 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 19:46:15 +0100
Subject: more cleanup + script utilities

---
 src/crepe/api/Animator.cpp             |  2 +-
 src/crepe/api/BehaviorScript.hpp       |  3 --
 src/crepe/api/Camera.cpp               |  2 +-
 src/crepe/api/Script.h                 | 78 +++++++++++++++++-----------------
 src/crepe/api/Script.hpp               | 23 ++++++++--
 src/crepe/api/Sprite.cpp               |  2 +-
 src/crepe/api/Transform.cpp            |  2 +-
 src/crepe/facade/DB.cpp                |  2 +-
 src/crepe/facade/SDLContext.cpp        |  2 +-
 src/crepe/facade/Sound.cpp             |  2 +-
 src/crepe/facade/SoundContext.cpp      |  2 +-
 src/crepe/facade/Texture.cpp           |  2 +-
 src/crepe/manager/ComponentManager.cpp |  2 +-
 src/crepe/manager/LoopTimerManager.cpp |  2 +-
 src/crepe/manager/ResourceManager.cpp  |  2 +-
 src/crepe/system/ScriptSystem.cpp      |  1 +
 src/crepe/util/Log.cpp                 |  1 +
 src/crepe/util/Log.h                   | 21 ---------
 src/crepe/util/dbg.h                   | 19 +++++++++
 src/example/replay.cpp                 |  6 ++-
 20 files changed, 98 insertions(+), 78 deletions(-)
 create mode 100644 src/crepe/util/dbg.h

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 4ce4bf0..203cef3 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -1,5 +1,5 @@
 
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "Animator.h"
 #include "Component.h"
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index b9bb1e2..353d5e2 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -2,8 +2,6 @@
 
 #include <type_traits>
 
-#include "../util/Log.h"
-
 #include "BehaviorScript.h"
 #include "Script.h"
 
@@ -11,7 +9,6 @@ namespace crepe {
 
 template <class T, typename... Args>
 BehaviorScript & BehaviorScript::set_script(Args &&... args) {
-	dbg_trace();
 	static_assert(std::is_base_of<Script, T>::value);
 	this->script = std::unique_ptr<Script>(new T(std::forward<Args>(args)...));
 
diff --git a/src/crepe/api/Camera.cpp b/src/crepe/api/Camera.cpp
index 179dc18..19a3296 100644
--- a/src/crepe/api/Camera.cpp
+++ b/src/crepe/api/Camera.cpp
@@ -1,4 +1,4 @@
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "Camera.h"
 #include "Component.h"
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index c797db0..18a029b 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -8,6 +8,7 @@
 #include "../system/CollisionSystem.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
+#include "../util/Log.h"
 
 namespace crepe {
 
@@ -58,83 +59,85 @@ protected:
 
 protected:
 	/**
-	 * \name Utility functions
+	 * \name Component query functions
+	 * \see ComponentManager
 	 * \{
 	 */
-
 	/**
 	 * \brief Get single component of type \c T on this game object
-	 *
 	 * \tparam T Type of component
-	 *
 	 * \returns Reference to component
-	 *
 	 * \throws std::runtime_error if this game object does not have a component with type \c T
 	 */
 	template <typename T>
 	T & get_component() const;
-	// TODO: make get_component calls for component types that can have more than 1 instance
-	// cause compile-time errors
-
 	/**
 	 * \brief Get all components of type \c T on this game object
-	 *
 	 * \tparam T Type of component
-	 *
 	 * \returns List of component references
 	 */
 	template <typename T>
 	RefVector<T> get_components() const;
-
-	/**
-	 * \copydoc ComponentManager::get_components_by_id
-	 * \see ComponentManager::get_components_by_id
-	 */
+	//! \copydoc ComponentManager::get_components_by_id
 	template <typename T>
 	RefVector<T> get_components_by_id(game_object_id_t id) const;
-	/**
-	 * \copydoc ComponentManager::get_components_by_name
-	 * \see ComponentManager::get_components_by_name
-	 */
+	//! \copydoc ComponentManager::get_components_by_name
 	template <typename T>
 	RefVector<T> get_components_by_name(const std::string & name) const;
-	/**
-	 * \copydoc ComponentManager::get_components_by_tag
-	 * \see ComponentManager::get_components_by_tag
-	 */
+	//! \copydoc ComponentManager::get_components_by_tag
 	template <typename T>
 	RefVector<T> get_components_by_tag(const std::string & tag) const;
+	//! \}
 
 	/**
-	 * \brief Log a message using Log::logf
-	 *
-	 * \tparam Args Log::logf parameters
-	 * \param args  Log::logf parameters
+	 * \name Logging functions
+	 * \see Log
+	 * \{
 	 */
-	template <typename... Args>
-	void logf(Args &&... args);
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args);
+	//! \copydoc Log::logf
+	template <class... Args>
+	void logf(std::format_string<Args...> fmt, Args &&... args);
+	// \}
 
 	/**
-	 * \brief Subscribe to an event with an explicit channel
-	 * \see EventManager::subscribe
+	 * \name Event manager functions
+	 * \see EventManager
+	 * \{
 	 */
+	//! \copydoc EventManager::subscribe
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback, event_channel_t channel);
-	/**
-	 * \brief Subscribe to an event on EventManager::CHANNEL_ALL
-	 * \see EventManager::subscribe
-	 */
+	//! \copydoc EventManager::subscribe
 	template <typename EventType>
 	void subscribe(const EventHandler<EventType> & callback);
+	//! \copydoc EventManager::trigger_event
+	template <typename EventType>
+	void trigger_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	//! \copydoc EventManager::queue_event
+	template <typename EventType>
+	void queue_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	//! \}
 
 	/**
-	 * \brief Set the next scene using SceneManager
-	 * \see SceneManager::set_next_scene
+	 * \name Scene-related functions
+	 * \see SceneManager
+	 * \{
 	 */
+	//! \copydoc SceneManager::set_next_scene
 	void set_next_scene(const std::string & name);
+	//! \}
 
+	/**
+	 * \name Save data management functions
+	 * \see SaveManager
+	 * \{
+	 */
 	//! Retrieve SaveManager reference
 	SaveManager & get_save_manager() const;
+	//! \}
 
 	//! Replay management functions
 	struct replay { // NOLINT
@@ -152,7 +155,6 @@ protected:
 		replay(OptionalRef<Mediator> & mediator) : mediator(mediator) {}
 		friend class Script;
 	} replay{mediator};
-
 	//! \}
 
 private:
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 547fb8b..2553fd1 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -24,9 +24,14 @@ RefVector<T> Script::get_components() const {
 	return this->get_components_by_id<T>(this->game_object_id);
 }
 
-template <typename... Args>
-void Script::logf(Args &&... args) {
-	Log::logf(std::forward<Args>(args)...);
+template <class... Args>
+void Script::logf(const Log::Level & level, std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(level, fmt, std::forward<Args>(args)...);
+}
+
+template <class... Args>
+void Script::logf(std::format_string<Args...> fmt, Args &&... args) {
+	Log::logf(fmt, std::forward<Args>(args)...);
 }
 
 template <typename EventType>
@@ -55,6 +60,18 @@ void Script::subscribe(const EventHandler<EventType> & callback) {
 	this->subscribe_internal(callback, EventManager::CHANNEL_ALL);
 }
 
+template <typename EventType>
+void Script::trigger_event(const EventType & event, event_channel_t channel) {
+	EventManager & mgr = this->mediator->event_manager;
+	mgr.trigger_event(event, channel);
+}
+
+template <typename EventType>
+void Script::queue_event(const EventType & event, event_channel_t channel) {
+	EventManager & mgr = this->mediator->event_manager;
+	mgr.queue_event(event, channel);
+}
+
 template <typename T>
 RefVector<T> Script::get_components_by_id(game_object_id_t id) const {
 	Mediator & mediator = this->mediator;
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index ba684ba..0107c7b 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "api/Asset.h"
 
 #include "Component.h"
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 5fc886b..32b44e1 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "Transform.h"
 
diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 95cf606..d45cd82 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
 
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "DB.h"
 
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 20bb030..fccc15f 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -19,7 +19,7 @@
 #include "../api/Color.h"
 #include "../api/Config.h"
 #include "../api/Sprite.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "manager/Mediator.h"
 
 #include "SDLContext.h"
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 97e455e..b1e6463 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -1,5 +1,5 @@
 #include "../api/Asset.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "Sound.h"
 
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index b1f8cb3..5091e07 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "SoundContext.h"
 
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index b63403d..23a9c8e 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,4 +1,4 @@
-#include "../util/Log.h"
+#include "../util/dbg.h"
 #include "facade/SDLContext.h"
 #include "manager/Mediator.h"
 
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index 5f5c050..bc104d3 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -1,7 +1,7 @@
 #include "../api/GameObject.h"
 #include "../api/Metadata.h"
 #include "../types.h"
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "ComponentManager.h"
 
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 9819632..a98a29d 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -1,7 +1,7 @@
 #include <chrono>
 #include <thread>
 
-#include "../util/Log.h"
+#include "../util/dbg.h"
 
 #include "LoopTimerManager.h"
 
diff --git a/src/crepe/manager/ResourceManager.cpp b/src/crepe/manager/ResourceManager.cpp
index a141a46..5713183 100644
--- a/src/crepe/manager/ResourceManager.cpp
+++ b/src/crepe/manager/ResourceManager.cpp
@@ -1,4 +1,4 @@
-#include "util/Log.h"
+#include "util/dbg.h"
 
 #include "ResourceManager.h"
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index ab79fc3..11da618 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,3 +1,4 @@
+#include "../util/dbg.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 #include "../manager/ComponentManager.h"
diff --git a/src/crepe/util/Log.cpp b/src/crepe/util/Log.cpp
index 84d80a8..e11a8d9 100644
--- a/src/crepe/util/Log.cpp
+++ b/src/crepe/util/Log.cpp
@@ -3,6 +3,7 @@
 
 #include "../api/Config.h"
 
+#include "LogColor.h"
 #include "Log.h"
 
 using namespace crepe;
diff --git a/src/crepe/util/Log.h b/src/crepe/util/Log.h
index fc0bb3a..b43fe30 100644
--- a/src/crepe/util/Log.h
+++ b/src/crepe/util/Log.h
@@ -2,27 +2,6 @@
 
 #include <format>
 
-// allow user to disable debug macros
-#ifndef CREPE_DISABLE_MACROS
-
-#include "LogColor.h"
-
-// utility macros
-#define _crepe_logf_here(level, fmt, ...) \
-	crepe::Log::logf(level, "{}" fmt, \
-					 crepe::LogColor().fg_white(false).str(std::format( \
-						 "{} ({}:{})", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__)), \
-					 __VA_ARGS__)
-
-// very illegal global function-style macros
-// NOLINTBEGIN
-#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::Log::Level::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(crepe::Log::Level::DEBUG, ": {}", str)
-#define dbg_trace() _crepe_logf_here(crepe::Log::Level::TRACE, "", "")
-// NOLINTEND
-
-#endif
-
 namespace crepe {
 
 /**
diff --git a/src/crepe/util/dbg.h b/src/crepe/util/dbg.h
new file mode 100644
index 0000000..500e959
--- /dev/null
+++ b/src/crepe/util/dbg.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Log.h"
+#include "LogColor.h"
+
+// utility macros
+#define _crepe_logf_here(level, fmt, ...) \
+	crepe::Log::logf(level, "{}" fmt, \
+					 crepe::LogColor().fg_white(false).str(std::format( \
+						 "{} ({}:{})", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__)), \
+					 __VA_ARGS__)
+
+// very illegal global function-style macros
+// NOLINTBEGIN
+#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::Log::Level::DEBUG, ": " fmt, __VA_ARGS__)
+#define dbg_log(str) _crepe_logf_here(crepe::Log::Level::DEBUG, ": {}", str)
+#define dbg_trace() _crepe_logf_here(crepe::Log::Level::TRACE, "", "")
+// NOLINTEND
+
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 4c606d7..7faf6cb 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -27,17 +27,21 @@ class Timeline : public Script {
 		switch (i++) {
 			default: break;
 			case 10:
+				logf("record start");
 				replay.record_start();
 				break;
 			case 60:
+				logf("record end, playing recording");
 				this->recording = replay.record_end();
 				replay.play(this->recording);
 				break;
 			case 61:
+				logf("done, releasing recording");
 				replay.release(this->recording);
 				break;
 			case 72:
-				throw;
+				logf("exit");
+				queue_event<ShutDownEvent>();
 				break;
 		};
 	}
-- 
cgit v1.2.3


From 1d1c256eea43a3d0685919ed2997e10990ef639f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 22:45:30 +0100
Subject: `make format`

---
 src/crepe/Component.cpp                |  5 +----
 src/crepe/api/Engine.cpp               |  7 ++++---
 src/crepe/api/Engine.h                 |  5 ++---
 src/crepe/api/GameObject.cpp           | 11 ++++++-----
 src/crepe/api/GameObject.h             |  5 ++---
 src/crepe/api/ParticleEmitter.cpp      |  1 -
 src/crepe/api/Script.cpp               |  1 -
 src/crepe/api/Script.h                 | 10 ++++++----
 src/crepe/api/Script.hpp               |  3 ++-
 src/crepe/api/Transform.cpp            |  1 -
 src/crepe/manager/ComponentManager.cpp |  1 -
 src/crepe/manager/ReplayManager.cpp    | 10 +++-------
 src/crepe/manager/ReplayManager.h      |  5 +++--
 src/crepe/manager/SystemManager.cpp    |  5 ++---
 src/crepe/manager/SystemManager.h      |  2 +-
 src/crepe/manager/SystemManager.hpp    |  7 ++++---
 src/crepe/system/EventSystem.cpp       |  3 +--
 src/crepe/system/EventSystem.h         |  3 +--
 src/crepe/system/ReplaySystem.cpp      |  6 +++---
 src/crepe/system/ReplaySystem.h        |  3 +--
 src/crepe/system/ScriptSystem.cpp      |  2 +-
 src/crepe/util/Log.cpp                 |  2 +-
 src/crepe/util/dbg.h                   |  1 -
 src/example/replay.cpp                 | 27 ++++++++++++---------------
 src/test/Profiling.cpp                 |  6 ++++--
 src/test/ReplayManagerTest.cpp         | 14 ++++++++------
 26 files changed, 68 insertions(+), 78 deletions(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index 1aed507..ae76e65 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -14,7 +14,4 @@ unique_ptr<Component> Component::save() const {
 	return unique_ptr<Component>(new Component(*this));
 }
 
-void Component::restore(const Component & snapshot) {
-	*this = snapshot;
-}
-
+void Component::restore(const Component & snapshot) { *this = snapshot; }
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index e8b7fd6..bbb4494 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -46,7 +46,8 @@ void Engine::loop() {
 			try {
 				systems.fixed_update();
 			} catch (const exception & e) {
-				Log::logf(Log::Level::WARNING, "Uncaught exception in fixed update function: {}\n", e.what());
+				Log::logf(Log::Level::WARNING,
+						  "Uncaught exception in fixed update function: {}\n", e.what());
 			}
 			timer.advance_fixed_elapsed_time();
 		}
@@ -54,9 +55,9 @@ void Engine::loop() {
 		try {
 			systems.frame_update();
 		} catch (const exception & e) {
-			Log::logf(Log::Level::WARNING, "Uncaught exception in frame update function: {}\n", e.what());
+			Log::logf(Log::Level::WARNING, "Uncaught exception in frame update function: {}\n",
+					  e.what());
 		}
 		timer.enforce_frame_rate();
 	}
 }
-
diff --git a/src/crepe/api/Engine.h b/src/crepe/api/Engine.h
index efe7853..3145723 100644
--- a/src/crepe/api/Engine.h
+++ b/src/crepe/api/Engine.h
@@ -2,14 +2,13 @@
 
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
+#include "../manager/EventManager.h"
+#include "../manager/LoopTimerManager.h"
 #include "../manager/ReplayManager.h"
 #include "../manager/ResourceManager.h"
-#include "../manager/ResourceManager.h"
 #include "../manager/SaveManager.h"
 #include "../manager/SceneManager.h"
 #include "../manager/SystemManager.h"
-#include "../manager/LoopTimerManager.h"
-#include "../manager/EventManager.h"
 
 namespace crepe {
 
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
index 68b074e..9b94cad 100644
--- a/src/crepe/api/GameObject.cpp
+++ b/src/crepe/api/GameObject.cpp
@@ -7,13 +7,14 @@
 using namespace crepe;
 using namespace std;
 
-GameObject::GameObject(Mediator & mediator, game_object_id_t id,
-					   const std::string & name, const std::string & tag,
-					   const vec2 & position, double rotation, double scale)
+GameObject::GameObject(Mediator & mediator, game_object_id_t id, const std::string & name,
+					   const std::string & tag, const vec2 & position, double rotation,
+					   double scale)
 	: id(id),
 	  mediator(mediator),
-		transform(mediator.component_manager->add_component<Transform>(this->id, position, rotation, scale)),
-		metadata(mediator.component_manager->add_component<Metadata>(this->id, name, tag)) { }
+	  transform(mediator.component_manager->add_component<Transform>(this->id, position,
+																	 rotation, scale)),
+	  metadata(mediator.component_manager->add_component<Metadata>(this->id, name, tag)) {}
 
 void GameObject::set_parent(const GameObject & parent) {
 	ComponentManager & mgr = this->mediator.component_manager;
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 0dabed1..572ce3a 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -30,9 +30,8 @@ private:
 	 * \param rotation The rotation of the GameObject
 	 * \param scale The scale of the GameObject
 	 */
-	GameObject(Mediator & mediator, game_object_id_t id,
-			   const std::string & name, const std::string & tag, const vec2 & position,
-			   double rotation, double scale);
+	GameObject(Mediator & mediator, game_object_id_t id, const std::string & name,
+			   const std::string & tag, const vec2 & position, double rotation, double scale);
 	//! ComponentManager instances GameObject
 	friend class ComponentManager;
 
diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index fd69e26..a9c5cf6 100644
--- a/src/crepe/api/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
@@ -23,4 +23,3 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter & other) {
 	data.particles = other.data.particles;
 	return *this;
 }
-
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 8b95cc9..34e7908 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -45,4 +45,3 @@ void Script::replay::release(recording_t recording) {
 	ReplayManager & mgr = this->mediator->replay_manager;
 	return mgr.release(recording);
 }
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 18a029b..6536fa4 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,13 +2,13 @@
 
 #include <vector>
 
-#include "../manager/ReplayManager.h"
 #include "../manager/EventManager.h"
 #include "../manager/Mediator.h"
+#include "../manager/ReplayManager.h"
 #include "../system/CollisionSystem.h"
 #include "../types.h"
-#include "../util/OptionalRef.h"
 #include "../util/Log.h"
+#include "../util/OptionalRef.h"
 
 namespace crepe {
 
@@ -115,10 +115,12 @@ protected:
 	void subscribe(const EventHandler<EventType> & callback);
 	//! \copydoc EventManager::trigger_event
 	template <typename EventType>
-	void trigger_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	void trigger_event(const EventType & event = {},
+					   event_channel_t channel = EventManager::CHANNEL_ALL);
 	//! \copydoc EventManager::queue_event
 	template <typename EventType>
-	void queue_event(const EventType & event = {}, event_channel_t channel = EventManager::CHANNEL_ALL);
+	void queue_event(const EventType & event = {},
+					 event_channel_t channel = EventManager::CHANNEL_ALL);
 	//! \}
 
 	/**
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index b42a6df..4462a41 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -48,7 +48,8 @@ void Script::subscribe_internal(const EventHandler<EventType> & callback,
 			try {
 				ReplayManager & replay = this->mediator->replay_manager;
 				if (replay.get_state() == ReplayManager::PLAYING) return false;
-			} catch (const std::runtime_error &) {}
+			} catch (const std::runtime_error &) {
+			}
 
 			// call user-provided callback
 			return callback(data);
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 32b44e1..fcfce14 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -20,4 +20,3 @@ unique_ptr<Component> Transform::save() const {
 void Transform::restore(const Component & snapshot) {
 	*this = static_cast<const Transform &>(snapshot);
 }
-
diff --git a/src/crepe/manager/ComponentManager.cpp b/src/crepe/manager/ComponentManager.cpp
index bc104d3..745ddae 100644
--- a/src/crepe/manager/ComponentManager.cpp
+++ b/src/crepe/manager/ComponentManager.cpp
@@ -97,4 +97,3 @@ void ComponentManager::restore(const Snapshot & snapshot) {
 		this->components[info.type][info.id][info.index]->restore(*info.component);
 	}
 }
-
diff --git a/src/crepe/manager/ReplayManager.cpp b/src/crepe/manager/ReplayManager.cpp
index db6acb0..090a94e 100644
--- a/src/crepe/manager/ReplayManager.cpp
+++ b/src/crepe/manager/ReplayManager.cpp
@@ -1,7 +1,7 @@
 #include <format>
 
-#include "ReplayManager.h"
 #include "Manager.h"
+#include "ReplayManager.h"
 
 using namespace crepe;
 using namespace std;
@@ -32,8 +32,7 @@ void ReplayManager::play(recording_t handle) {
 }
 
 void ReplayManager::release(recording_t handle) {
-	if (!this->memory.contains(handle))
-		return;
+	if (!this->memory.contains(handle)) return;
 	this->memory.erase(handle);
 }
 
@@ -68,7 +67,4 @@ bool ReplayManager::frame_step() {
 	return true;
 }
 
-ReplayManager::State ReplayManager::get_state() const {
-	return this->state;
-}
-
+ReplayManager::State ReplayManager::get_state() const { return this->state; }
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
index d3af879..ab15b27 100644
--- a/src/crepe/manager/ReplayManager.h
+++ b/src/crepe/manager/ReplayManager.h
@@ -2,8 +2,8 @@
 
 #include <unordered_map>
 
-#include "Manager.h"
 #include "ComponentManager.h"
+#include "Manager.h"
 #include "util/OptionalRef.h"
 
 namespace crepe {
@@ -19,6 +19,7 @@ typedef size_t recording_t;
  */
 class ReplayManager : public Manager {
 	// TODO: Delete recordings at end of scene
+
 public:
 	ReplayManager(Mediator & mediator);
 
@@ -40,7 +41,7 @@ public:
 	 * \param handle Handle to recording (as returned by \c record_end())
 	 */
 	void release(recording_t handle);
-	
+
 public:
 	//! Internal state
 	enum State {
diff --git a/src/crepe/manager/SystemManager.cpp b/src/crepe/manager/SystemManager.cpp
index f67e786..5ada30f 100644
--- a/src/crepe/manager/SystemManager.cpp
+++ b/src/crepe/manager/SystemManager.cpp
@@ -2,13 +2,13 @@
 #include "../system/AnimatorSystem.h"
 #include "../system/AudioSystem.h"
 #include "../system/CollisionSystem.h"
+#include "../system/EventSystem.h"
 #include "../system/InputSystem.h"
 #include "../system/ParticleSystem.h"
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
-#include "../system/ScriptSystem.h"
-#include "../system/EventSystem.h"
 #include "../system/ReplaySystem.h"
+#include "../system/ScriptSystem.h"
 
 #include "SystemManager.h"
 
@@ -64,4 +64,3 @@ void SystemManager::disable_all() {
 		system->active = false;
 	}
 }
-
diff --git a/src/crepe/manager/SystemManager.h b/src/crepe/manager/SystemManager.h
index a47961b..50acf77 100644
--- a/src/crepe/manager/SystemManager.h
+++ b/src/crepe/manager/SystemManager.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <memory>
 #include <typeindex>
 #include <unordered_map>
-#include <memory>
 
 #include "../system/System.h"
 
diff --git a/src/crepe/manager/SystemManager.hpp b/src/crepe/manager/SystemManager.hpp
index 46ada5f..3d26e4c 100644
--- a/src/crepe/manager/SystemManager.hpp
+++ b/src/crepe/manager/SystemManager.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <memory>
 #include <cassert>
 #include <format>
+#include <memory>
 
 #include "SystemManager.h"
 
@@ -11,7 +11,8 @@ namespace crepe {
 template <class T>
 T & SystemManager::get_system() {
 	using namespace std;
-	static_assert(is_base_of<System, T>::value, "get_system must recieve a derivative class of System");
+	static_assert(is_base_of<System, T>::value,
+				  "get_system must recieve a derivative class of System");
 
 	const type_info & type = typeid(T);
 	if (!this->systems.contains(type))
@@ -28,7 +29,7 @@ template <class T>
 void SystemManager::load_system() {
 	using namespace std;
 	static_assert(is_base_of<System, T>::value,
-			"load_system must recieve a derivative class of System");
+				  "load_system must recieve a derivative class of System");
 
 	const type_info & type = typeid(T);
 	if (this->systems.contains(type))
diff --git a/src/crepe/system/EventSystem.cpp b/src/crepe/system/EventSystem.cpp
index 5475798..7e168ab 100644
--- a/src/crepe/system/EventSystem.cpp
+++ b/src/crepe/system/EventSystem.cpp
@@ -1,5 +1,5 @@
-#include "../manager/EventManager.h"
 #include "EventSystem.h"
+#include "../manager/EventManager.h"
 
 using namespace crepe;
 
@@ -7,4 +7,3 @@ void EventSystem::fixed_update() {
 	EventManager & ev = this->mediator.event_manager;
 	ev.dispatch_events();
 }
-
diff --git a/src/crepe/system/EventSystem.h b/src/crepe/system/EventSystem.h
index ff3ca4e..0ae48d2 100644
--- a/src/crepe/system/EventSystem.h
+++ b/src/crepe/system/EventSystem.h
@@ -18,5 +18,4 @@ public:
 	void fixed_update() override;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/system/ReplaySystem.cpp b/src/crepe/system/ReplaySystem.cpp
index 2b2e4ab..efc3be4 100644
--- a/src/crepe/system/ReplaySystem.cpp
+++ b/src/crepe/system/ReplaySystem.cpp
@@ -1,9 +1,9 @@
 #include "../manager/ReplayManager.h"
 #include "../manager/SystemManager.h"
 
+#include "EventSystem.h"
 #include "RenderSystem.h"
 #include "ReplaySystem.h"
-#include "EventSystem.h"
 
 using namespace crepe;
 using namespace std;
@@ -15,7 +15,8 @@ void ReplaySystem::fixed_update() {
 	this->last_state = state;
 
 	switch (state) {
-		case ReplayManager::IDLE: break;
+		case ReplayManager::IDLE:
+			break;
 		case ReplayManager::RECORDING: {
 			replay.frame_record();
 			break;
@@ -51,4 +52,3 @@ void ReplaySystem::playback_end() {
 	components.restore(this->playback.components);
 	systems.restore(this->playback.systems);
 }
-
diff --git a/src/crepe/system/ReplaySystem.h b/src/crepe/system/ReplaySystem.h
index 8ba60d5..bbc8d76 100644
--- a/src/crepe/system/ReplaySystem.h
+++ b/src/crepe/system/ReplaySystem.h
@@ -41,5 +41,4 @@ private:
 	void playback_end();
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 11da618..0d10011 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -1,7 +1,7 @@
-#include "../util/dbg.h"
 #include "../api/BehaviorScript.h"
 #include "../api/Script.h"
 #include "../manager/ComponentManager.h"
+#include "../util/dbg.h"
 
 #include "ScriptSystem.h"
 
diff --git a/src/crepe/util/Log.cpp b/src/crepe/util/Log.cpp
index e11a8d9..ce25a1d 100644
--- a/src/crepe/util/Log.cpp
+++ b/src/crepe/util/Log.cpp
@@ -3,8 +3,8 @@
 
 #include "../api/Config.h"
 
-#include "LogColor.h"
 #include "Log.h"
+#include "LogColor.h"
 
 using namespace crepe;
 using namespace std;
diff --git a/src/crepe/util/dbg.h b/src/crepe/util/dbg.h
index 500e959..c7283ee 100644
--- a/src/crepe/util/dbg.h
+++ b/src/crepe/util/dbg.h
@@ -16,4 +16,3 @@
 #define dbg_log(str) _crepe_logf_here(crepe::Log::Level::DEBUG, ": {}", str)
 #define dbg_trace() _crepe_logf_here(crepe::Log::Level::TRACE, "", "")
 // NOLINTEND
-
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 130c0d3..82fd478 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -1,6 +1,6 @@
+#include <crepe/api/Config.h>
 #include <crepe/api/Engine.h>
 #include <crepe/api/Script.h>
-#include <crepe/api/Config.h>
 
 using namespace crepe;
 using namespace std;
@@ -9,13 +9,11 @@ class AnimationScript : public Script {
 	Transform * transform;
 	float t = 0;
 
-	void init() {
-		transform = &get_component<Transform>();
-	}
+	void init() { transform = &get_component<Transform>(); }
 
 	void update() {
 		t += 0.05;
-		transform->position = { sin(t), cos(t) };
+		transform->position = {sin(t), cos(t)};
 	}
 };
 
@@ -25,7 +23,8 @@ class Timeline : public Script {
 
 	void update() {
 		switch (i++) {
-			default: break;
+			default:
+				break;
 			case 10:
 				logf("record start");
 				replay.record_start();
@@ -56,17 +55,15 @@ public:
 		ComponentManager & mgr = mediator.component_manager;
 
 		GameObject cam = mgr.new_object("cam");
-		cam.add_component<Camera>(ivec2{640,480},vec2{3,3}, Camera::Data{
-			.bg_color = Color::WHITE,
-		});
+		cam.add_component<Camera>(ivec2{640, 480}, vec2{3, 3},
+								  Camera::Data{
+									  .bg_color = Color::WHITE,
+								  });
 
 		GameObject square = mgr.new_object("square");
-		square.add_component<Sprite>(
-			Asset{"asset/texture/square.png"},
-			Sprite::Data{
-				.size = { 0.5, 0.5 },
-			}
-		);
+		square.add_component<Sprite>(Asset{"asset/texture/square.png"}, Sprite::Data{
+																			.size = {0.5, 0.5},
+																		});
 		square.add_component<BehaviorScript>().set_script<AnimationScript>();
 
 		GameObject scapegoat = mgr.new_object("");
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index eccfd89..f5ae4b1 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -102,12 +102,14 @@ public:
 	// Run and profile all systems, return the total time in milliseconds
 	std::chrono::microseconds run_all_systems() {
 		std::chrono::microseconds total_microseconds = 0us;
-		total_microseconds += time_function("PhysicsSystem", [&]() { physics_sys.fixed_update(); });
+		total_microseconds
+			+= time_function("PhysicsSystem", [&]() { physics_sys.fixed_update(); });
 		total_microseconds
 			+= time_function("CollisionSystem", [&]() { collision_sys.fixed_update(); });
 		total_microseconds
 			+= time_function("ParticleSystem", [&]() { particle_sys.fixed_update(); });
-		total_microseconds += time_function("RenderSystem", [&]() { render_sys.frame_update(); });
+		total_microseconds
+			+= time_function("RenderSystem", [&]() { render_sys.frame_update(); });
 		return total_microseconds;
 	}
 
diff --git a/src/test/ReplayManagerTest.cpp b/src/test/ReplayManagerTest.cpp
index aa5a766..5ee4b40 100644
--- a/src/test/ReplayManagerTest.cpp
+++ b/src/test/ReplayManagerTest.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <crepe/manager/ReplayManager.h>
-#include <crepe/system/ReplaySystem.h>
+#include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Scene.h>
 #include <crepe/api/Script.h>
-#include <crepe/api/BehaviorScript.h>
+#include <crepe/manager/ReplayManager.h>
+#include <crepe/system/ReplaySystem.h>
 
 using namespace std;
 using namespace crepe;
@@ -12,14 +12,17 @@ using namespace testing;
 
 class ReplayManagerTest : public Test {
 	Mediator mediator;
+
 public:
 	ComponentManager component_manager{mediator};
 	ReplayManager replay_manager{mediator};
 	ReplaySystem replay_system{mediator};
 
 	GameObject entity = component_manager.new_object("foo");
-	Transform & entity_transform = component_manager.get_components_by_id<Transform>(entity.id).back();
-	Metadata & entity_metadata = component_manager.get_components_by_id<Metadata>(entity.id).back();
+	Transform & entity_transform
+		= component_manager.get_components_by_id<Transform>(entity.id).back();
+	Metadata & entity_metadata
+		= component_manager.get_components_by_id<Metadata>(entity.id).back();
 };
 
 TEST_F(ReplayManagerTest, Default) {
@@ -33,4 +36,3 @@ TEST_F(ReplayManagerTest, Default) {
 
 	// recording_t recording = replay_manager.record_end();
 }
-
-- 
cgit v1.2.3


From 3a23e41255af0de3c5c7f5d9df981c8b205e291f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 13 Dec 2024 17:42:34 +0100
Subject: add timer functionality to script

---
 src/crepe/api/Script.cpp          |  2 ++
 src/crepe/api/Script.h            | 12 ++++++++++++
 src/crepe/system/ScriptSystem.cpp |  5 ++++-
 src/test/CollisionTest.cpp        |  1 +
 src/test/ScriptTest.h             |  1 +
 5 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 753a9e3..50edea0 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -25,3 +25,5 @@ void Script::set_next_scene(const string & name) {
 }
 
 SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; }
+
+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 668e5d1..3569b4a 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include "../manager/LoopTimerManager.h"
 #include "../manager/EventManager.h"
 #include "../manager/Mediator.h"
 #include "../system/CollisionSystem.h"
@@ -46,9 +47,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() {}
 	//! \}
 
@@ -135,6 +144,9 @@ protected:
 	//! Retrieve SaveManager reference
 	SaveManager & get_save_manager() const;
 
+	//! Retrieve LoopTimerManager reference
+	LoopTimerManager & get_loop_timer() const;
+
 	//! \}
 
 private:
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index d6b2ca1..4afd2ba 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -11,6 +11,7 @@ void ScriptSystem::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) {
@@ -23,6 +24,8 @@ void ScriptSystem::update() {
 			script->init();
 			script->initialized = true;
 		}
-		script->update();
+
+		duration_t delta_time = timer.get_delta_time();
+		script->update(delta_time);
 	}
 }
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index 5dbc670..a34189e 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -54,6 +54,7 @@ public:
 	ComponentManager mgr{m};
 	CollisionSystem collision_sys{m};
 	ScriptSystem script_sys{m};
+	LoopTimerManager loop_timer{m};
 
 	GameObject world = mgr.new_object("world", "", {50, 50});
 	GameObject game_object1 = mgr.new_object("object1", "", {50, 50});
diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h
index 31fa7c9..7aa858d 100644
--- a/src/test/ScriptTest.h
+++ b/src/test/ScriptTest.h
@@ -17,6 +17,7 @@ public:
 	crepe::ComponentManager component_manager{mediator};
 	crepe::ScriptSystem system{mediator};
 	crepe::EventManager event_mgr{mediator};
+	crepe::LoopTimerManager loop_timer{mediator};
 	crepe::GameObject entity = component_manager.new_object(OBJ_NAME);
 
 	class MyScript : public crepe::Script {
-- 
cgit v1.2.3


From 40d64aa8f836087fd9a1af51e257533194bf2d80 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 18 Dec 2024 13:55:45 +0100
Subject: fix ScriptSystem delta time

---
 src/crepe/system/ScriptSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 4afd2ba..0605c7a 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -25,7 +25,7 @@ void ScriptSystem::update() {
 			script->initialized = true;
 		}
 
-		duration_t delta_time = timer.get_delta_time();
+		duration_t delta_time = timer.get_scaled_fixed_delta_time();
 		script->update(delta_time);
 	}
 }
-- 
cgit v1.2.3


From cff284cedde9f0cc133ff2855557299ce1d8083c Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 18 Dec 2024 14:20:59 +0100
Subject: add fixed/frame update functions to script

---
 src/crepe/api/Script.h            | 17 +++++++++++++----
 src/crepe/system/ScriptSystem.cpp | 18 +++++++++++++-----
 src/crepe/system/ScriptSystem.h   | 16 +++++++++++++++-
 src/test/ScriptTest.cpp           | 18 +++++++++++++-----
 src/test/ScriptTest.h             |  3 ++-
 5 files changed, 56 insertions(+), 16 deletions(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

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/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 746285f..9977396 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,19 @@ 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 +34,7 @@ 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..ca4534a 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -2,6 +2,8 @@
 
 #include "System.h"
 
+#include "../manager/LoopTimerManager.h"
+
 namespace crepe {
 
 class Script;
@@ -16,13 +18,25 @@ class ScriptSystem : public System {
 public:
 	using System::System;
 	/**
-	 * \brief Call Script::update() on all active \c BehaviorScript instances
+	 * \brief Call Script::fixed_update() 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.
 	 */
 	void fixed_update() override;
+
+	/**
+	 * \brief Call Script::frame_update() 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.
+	 */
+	void frame_update() override;
+
+private:
+	void update(void (Script::* update_function)(duration_t), const duration_t & delta_time);
 };
 
 } // namespace crepe
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index 66b8193..40aa25c 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -28,7 +28,8 @@ void ScriptTest::SetUp() {
 TEST_F(ScriptTest, Default) {
 	MyScript & script = this->script;
 	EXPECT_CALL(script, init()).Times(0);
-	EXPECT_CALL(script, update(_)).Times(0);
+	EXPECT_CALL(script, fixed_update(_)).Times(0);
+	EXPECT_CALL(script, frame_update(_)).Times(0);
 }
 
 TEST_F(ScriptTest, UpdateOnce) {
@@ -38,7 +39,7 @@ TEST_F(ScriptTest, UpdateOnce) {
 		InSequence seq;
 
 		EXPECT_CALL(script, init()).Times(1);
-		EXPECT_CALL(script, update(_)).Times(1);
+		EXPECT_CALL(script, fixed_update(_)).Times(1);
 		system.fixed_update();
 	}
 
@@ -46,9 +47,16 @@ TEST_F(ScriptTest, UpdateOnce) {
 		InSequence seq;
 
 		EXPECT_CALL(script, init()).Times(0);
-		EXPECT_CALL(script, update(_)).Times(1);
+		EXPECT_CALL(script, fixed_update(_)).Times(1);
 		system.fixed_update();
 	}
+
+	{
+		InSequence seq;
+
+		EXPECT_CALL(script, frame_update(_)).Times(1);
+		system.frame_update();
+	}
 }
 
 TEST_F(ScriptTest, UpdateInactive) {
@@ -59,7 +67,7 @@ TEST_F(ScriptTest, UpdateInactive) {
 		InSequence seq;
 
 		EXPECT_CALL(script, init()).Times(0);
-		EXPECT_CALL(script, update(_)).Times(0);
+		EXPECT_CALL(script, fixed_update(_)).Times(0);
 		behaviorscript.active = false;
 		system.fixed_update();
 	}
@@ -68,7 +76,7 @@ TEST_F(ScriptTest, UpdateInactive) {
 		InSequence seq;
 
 		EXPECT_CALL(script, init()).Times(1);
-		EXPECT_CALL(script, update(_)).Times(1);
+		EXPECT_CALL(script, fixed_update(_)).Times(1);
 		behaviorscript.active = true;
 		system.fixed_update();
 	}
diff --git a/src/test/ScriptTest.h b/src/test/ScriptTest.h
index f3dbda4..8637df0 100644
--- a/src/test/ScriptTest.h
+++ b/src/test/ScriptTest.h
@@ -29,7 +29,8 @@ public:
 
 	public:
 		MOCK_METHOD(void, init, (), (override));
-		MOCK_METHOD(void, update, (crepe::duration_t), (override));
+		MOCK_METHOD(void, fixed_update, (crepe::duration_t), (override));
+		MOCK_METHOD(void, frame_update, (crepe::duration_t), (override));
 	};
 
 	crepe::OptionalRef<crepe::BehaviorScript> behaviorscript;
-- 
cgit v1.2.3


From 5605d438a242a6252f7a27ce772eb092b62d78ae Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 18 Dec 2024 14:21:09 +0100
Subject: `make format`

---
 src/crepe/api/Script.cpp          | 1 -
 src/crepe/facade/Texture.cpp      | 5 ++---
 src/crepe/system/ScriptSystem.cpp | 4 ++--
 src/crepe/system/ScriptSystem.h   | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/crepe/system/ScriptSystem.cpp')

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 6de6830..b147252 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -61,4 +61,3 @@ bool Script::get_key_state(Keycode key) const noexcept {
 		return false;
 	}
 }
-
diff --git a/src/crepe/facade/Texture.cpp b/src/crepe/facade/Texture.cpp
index cd06439..6fb22e1 100644
--- a/src/crepe/facade/Texture.cpp
+++ b/src/crepe/facade/Texture.cpp
@@ -1,8 +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 "Texture.h"
 
@@ -27,4 +27,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 9977396..93b4853 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -19,7 +19,8 @@ void ScriptSystem::frame_update() {
 	this->update(&Script::frame_update, delta_time);
 }
 
-void ScriptSystem::update(void (Script::* update_function)(duration_t), const duration_t & 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>();
 
@@ -37,4 +38,3 @@ void ScriptSystem::update(void (Script::* update_function)(duration_t), const du
 		(*script.*update_function)(delta_time);
 	}
 }
-
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index ca4534a..095515f 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -36,7 +36,7 @@ public:
 	void frame_update() override;
 
 private:
-	void update(void (Script::* update_function)(duration_t), const duration_t & delta_time);
+	void update(void (Script::*update_function)(duration_t), const duration_t & delta_time);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3