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/example/replay.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/example/replay.cpp

(limited to 'src/example/replay.cpp')

diff --git a/src/example/replay.cpp b/src/example/replay.cpp
new file mode 100644
index 0000000..6b1ed46
--- /dev/null
+++ b/src/example/replay.cpp
@@ -0,0 +1,69 @@
+#include "util/OptionalRef.h"
+#include <crepe/api/BoxCollider.h>
+#include <crepe/api/Camera.h>
+#include <crepe/api/Color.h>
+#include <crepe/api/Event.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/LoopManager.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Texture.h>
+#include <crepe/api/Transform.h>
+#include <crepe/manager/ComponentManager.h>
+#include <crepe/manager/Mediator.h>
+
+using namespace crepe;
+using namespace std;
+
+class AnimationScript : public Script {
+	Transform * transform;
+	float t = 0;
+
+	void init() {
+		Log::logf("AnimationScript init");
+		transform = &get_component<Transform>();
+	}
+
+	void update() {
+		Log::logf("AnimationScript update");
+		t += 0.01;
+		transform->position = { sin(t), cos(t) };
+	}
+};
+
+class TestScene : public Scene {
+public:
+	using Scene::Scene;
+
+	void load_scene() {
+		Log::logf("Initializing scene...");
+		Mediator & m = this->mediator;
+		ComponentManager & mgr = m.component_manager;
+
+
+		GameObject cam = mgr.new_object("cam");
+		cam.add_component<Camera>(ivec2{640,480},vec2{3,3}, Camera::Data{
+			.bg_color = Color::WHITE,
+		});
+
+		GameObject square = mgr.new_object("square");
+		Texture texture{"asset/texture/square.png"};
+		square.add_component<Sprite>(texture, Sprite::Data{
+			.size = { 0.5, 0.5 },
+		});
+		square.add_component<BehaviorScript>().set_script<AnimationScript>();
+		Log::logf("Done initializing scene");
+	}
+
+	string get_name() const { return "scene1"; }
+};
+
+int main(int argc, char * argv[]) {
+	LoopManager gameloop;
+
+	gameloop.add_scene<TestScene>();
+	gameloop.start();
+	return 0;
+}
-- 
cgit v1.2.3


From f0ecbea57a4d75905c4ee79608807187cd8f3e72 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 16:51:03 +0100
Subject: WIP

---
 src/crepe/Component.cpp              |  5 ++++
 src/crepe/Component.h                |  8 +++++--
 src/crepe/api/LoopManager.cpp        | 35 ++++++++++++++--------------
 src/crepe/api/LoopManager.h          | 21 +++++++++++++++--
 src/crepe/api/LoopManager.hpp        | 34 +++++++++++++++++++++++++++
 src/crepe/manager/ComponentManager.h | 24 +++++++++----------
 src/crepe/manager/ReplayManager.h    | 17 +++++++++-----
 src/example/replay.cpp               | 45 ++++++++++++++++++++++++++++++------
 8 files changed, 141 insertions(+), 48 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index acfd35c..141e1a8 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -3,3 +3,8 @@
 using namespace crepe;
 
 Component::Component(game_object_id_t id) : game_object_id(id) {}
+
+Component & Component::operator=(const Component &) {
+	return *this;
+}
+
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index eff5a58..47c5c34 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -32,9 +32,13 @@ protected:
 	//! Only ComponentManager can create components
 	friend class ComponentManager;
 
-	Component(const Component &) = delete;
+	// create snapshot
+	Component(const Component &) = default;
+	// restore snapshot
+	virtual Component & operator=(const Component &);
+
+	// components are never moved
 	Component(Component &&) = delete;
-	virtual Component & operator=(const Component &) = delete;
 	virtual Component & operator=(Component &&) = delete;
 
 public:
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 637fbe1..ff428fd 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -13,18 +13,17 @@
 using namespace crepe;
 using namespace std;
 
-LoopManager::LoopManager()
-	: systems({
-		ScriptSystem{this->mediator},
-		PhysicsSystem{this->mediator},
-		CollisionSystem{this->mediator},
-		AnimatorSystem{this->mediator},
-		ParticleSystem{this->mediator},
-		RenderSystem{this->mediator},
-		InputSystem{this->mediator},
-		EventSystem{this->mediator},
-		AudioSystem{this->mediator},
-	}) { }
+LoopManager::LoopManager() {
+	this->load_system<ScriptSystem>();
+	this->load_system<PhysicsSystem>();
+	this->load_system<CollisionSystem>();
+	this->load_system<AnimatorSystem>();
+	this->load_system<ParticleSystem>();
+	this->load_system<RenderSystem>();
+	this->load_system<InputSystem>();
+	this->load_system<EventSystem>();
+	this->load_system<AudioSystem>();
+}
 
 void LoopManager::start() {
 	this->setup();
@@ -32,16 +31,16 @@ void LoopManager::start() {
 }
 
 void LoopManager::fixed_update() {
-	for (System & system : this->systems) {
-		if (!system.active) continue;
-		system.fixed_update();
+	for (auto & [type, system] : this->systems) {
+		if (!system->active) continue;
+		system->fixed_update();
 	}
 }
 
 void LoopManager::frame_update() {
-	for (System & system : this->systems) {
-		if (!system.active) continue;
-		system.frame_update();
+	for (auto & [type, system] : this->systems) {
+		if (!system->active) continue;
+		system->frame_update();
 	}
 }
 
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 1183a4d..4b1fc1e 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -73,15 +73,32 @@ private:
 	SaveManager save_manager{mediator};
 
 	//! SDL context \todo no more singletons!
-	SDLContext & sdl_context = SDLContext::get_instance();
+	SDLContext & sdl_context = mediator.sdl_context;
 	//! Loop timer \todo no more singletons!
 	LoopTimer & loop_timer = LoopTimer::get_instance();
 
 private:
 	/**
 	 * \brief Collection of System instances
+	 *
+	 * This map holds System instances indexed by the system's class typeid. It is filled in the
+	 * constructor of \c LoopManager using LoopManager::load_system.
+	 */
+	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
+	/**
+	 * \brief Initialize a system
+	 * \tparam T System type (must be derivative of \c System)
+	 */
+	template <class T>
+	void load_system();
+	/**
+	 * \brief Retrieve a reference to ECS system
+	 * \tparam T System type
+	 * \returns Reference to system instance
+	 * \throws std::runtime_error if the System is not initialized
 	 */
-	std::vector<System> systems;
+	template <class T>
+	T & get_system();
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index 51afa70..627b281 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <cassert>
+#include <format>
+
+#include "../system/System.h"
 #include "LoopManager.h"
 
 namespace crepe {
@@ -9,4 +14,33 @@ void LoopManager::add_scene() {
 	this->scene_manager.add_scene<T>();
 }
 
+template <class T>
+T & LoopManager::get_system() {
+	using namespace std;
+	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))
+		throw runtime_error(format("LoopManager: {} is not initialized", type.name()));
+
+	System * system = this->systems.at(type).get();
+	T * concrete_system = dynamic_cast<T *>(system);
+	assert(concrete_system != nullptr);
+
+	return *concrete_system;
+}
+
+template <class T>
+void LoopManager::load_system() {
+	using namespace std;
+	static_assert(is_base_of<System, T>::value,
+			"load_system must recieve a derivative class of System");
+
+	const type_info & type = typeid(T);
+	if (this->systems.contains(type))
+		throw runtime_error(format("LoopManager: {} is already initialized", type.name()));
+	System * system = new T(this->mediator);
+	this->systems[type] = unique_ptr<System>(system);
+}
+
 } // namespace crepe
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index 19a8e81..94fd94f 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -21,13 +21,6 @@ class GameObject;
  * This class manages all components. It provides methods to add, delete and get components.
  */
 class ComponentManager : public Manager {
-	// TODO: This relation should be removed! I (loek) believe that the scene manager should
-	// create/destroy components because the GameObject's are stored in concrete Scene classes,
-	// which will in turn call GameObject's destructor, which will in turn call
-	// ComponentManager::delete_components_by_id or something. This is a pretty major change, so
-	// here is a comment and temporary fix instead :tada:
-	friend class SceneManager;
-
 public:
 	ComponentManager(Mediator & mediator);
 	~ComponentManager(); // dbg_trace
@@ -49,12 +42,7 @@ public:
 						  const vec2 & position = {0, 0}, double rotation = 0,
 						  double scale = 1);
 
-protected:
-	/**
-	 * GameObject is used as an interface to add/remove components, and the game programmer is
-	 * supposed to use it instead of interfacing with the component manager directly.
-	 */
-	friend class GameObject;
+public:
 	/**
 	 * \brief Add a component to the ComponentManager
 	 *
@@ -154,6 +142,16 @@ public:
 	template <typename T>
 	RefVector<T> get_components_by_tag(const std::string & tag) const;
 
+	struct SnapshotComponent {
+		by_type<by_id_index<std::vector<std::unique_ptr<Component>>>> components;
+		Component component;
+	};
+	struct Snapshot {
+		
+	};
+	Snapshot save();
+	void restore(const Snapshot &);
+
 private:
 	/**
 	 * \brief Get object IDs by predicate function
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
index 242eae4..c50196c 100644
--- a/src/crepe/manager/ReplayManager.h
+++ b/src/crepe/manager/ReplayManager.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "Manager.h"
+#include "ComponentManager.h"
+#include <unordered_map>
 
 namespace crepe {
 
@@ -18,15 +20,18 @@ protected:
 	void record_frame();
 
 private:
-	bool recording;
-	struct Recording {
-		recording_t id;
-		std::vector<Memento> frames;
-	};
+	typedef std::vector<ComponentManager::Snapshot> Recording;
+
+	bool recording = false;
+	recording_t current_recording = -1;
+
+
+	std::unordered_map<recording_t, std::unique_ptr<Recording>> memory;
 public:
 	void record_start();
 	recording_t record_end();
-	
+	void play(recording_t handle);
+	void release(recording_t handle);
 };
 
 } // namespace crepe
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 6b1ed46..a3c7fba 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -1,4 +1,4 @@
-#include "util/OptionalRef.h"
+#include <crepe/util/OptionalRef.h>
 #include <crepe/api/BoxCollider.h>
 #include <crepe/api/Camera.h>
 #include <crepe/api/Color.h>
@@ -13,6 +13,7 @@
 #include <crepe/api/Transform.h>
 #include <crepe/manager/ComponentManager.h>
 #include <crepe/manager/Mediator.h>
+#include <crepe/manager/ReplayManager.h>
 
 using namespace crepe;
 using namespace std;
@@ -22,27 +23,55 @@ class AnimationScript : public Script {
 	float t = 0;
 
 	void init() {
-		Log::logf("AnimationScript init");
 		transform = &get_component<Transform>();
 	}
 
 	void update() {
-		Log::logf("AnimationScript update");
-		t += 0.01;
+		t += 0.05;
 		transform->position = { sin(t), cos(t) };
 	}
 };
 
+class Timeline : public Script {
+	unsigned i = 0;
+	OptionalRef<ReplayManager> mgr;
+	recording_t recording;
+	void update() {
+		ReplayManager & mgr = this->mgr;
+		switch (i++) {
+			default: break;
+			case 10:
+							 mgr.record_start();
+							 Log::logf("start");
+							 break;
+			case 60:
+							 this->recording = mgr.record_end();
+							 Log::logf("stop");
+							 break;
+			case 70:
+							 mgr.play(this->recording);
+							 Log::logf("play");
+							 break;
+			case 71:
+							 mgr.release(this->recording);
+							 Log::logf("end");
+							 break;
+			case 72:
+							 Log::logf("exit");
+							 throw;
+							 break;
+		};
+	}
+};
+
 class TestScene : public Scene {
 public:
 	using Scene::Scene;
 
 	void load_scene() {
-		Log::logf("Initializing scene...");
 		Mediator & m = this->mediator;
 		ComponentManager & mgr = m.component_manager;
 
-
 		GameObject cam = mgr.new_object("cam");
 		cam.add_component<Camera>(ivec2{640,480},vec2{3,3}, Camera::Data{
 			.bg_color = Color::WHITE,
@@ -54,7 +83,9 @@ public:
 			.size = { 0.5, 0.5 },
 		});
 		square.add_component<BehaviorScript>().set_script<AnimationScript>();
-		Log::logf("Done initializing scene");
+
+		GameObject scapegoat = mgr.new_object("");
+		scapegoat.add_component<BehaviorScript>().set_script<Timeline>();
 	}
 
 	string get_name() const { return "scene1"; }
-- 
cgit v1.2.3


From a2b67f879e2073c5b094c9a480bf637c98703001 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 18:42:38 +0100
Subject: example working again

---
 src/crepe/api/LoopManager.h         |  5 ++++-
 src/crepe/manager/Mediator.h        |  2 ++
 src/crepe/manager/ReplayManager.cpp | 17 +++++++++++++++++
 src/example/replay.cpp              | 22 +++++++++++++---------
 4 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 28aa423..f34a5a0 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,13 +2,14 @@
 
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
+#include "../manager/ReplayManager.h"
+#include "../manager/ResourceManager.h"
 #include "../manager/ResourceManager.h"
 #include "../manager/SaveManager.h"
 #include "../manager/SceneManager.h"
 #include "../system/System.h"
 
 #include "LoopTimer.h"
-#include "manager/ResourceManager.h"
 
 namespace crepe {
 
@@ -76,6 +77,8 @@ private:
 	SDLContext sdl_context{mediator};
 	//! LoopTimer instance
 	LoopTimer loop_timer{mediator};
+	//! ReplayManager instance
+	ReplayManager replay_manager{mediator};
 
 private:
 	/**
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index 628154a..eef4432 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -13,6 +13,7 @@ class SaveManager;
 class ResourceManager;
 class SDLContext;
 class LoopTimer;
+class ReplayManager;
 
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
@@ -34,6 +35,7 @@ struct Mediator {
 	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 	OptionalRef<ResourceManager> resource_manager;
 	OptionalRef<LoopTimer> timer;
+	OptionalRef<ReplayManager> replay_manager;
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/ReplayManager.cpp b/src/crepe/manager/ReplayManager.cpp
index 3643a8e..40d34a4 100644
--- a/src/crepe/manager/ReplayManager.cpp
+++ b/src/crepe/manager/ReplayManager.cpp
@@ -4,5 +4,22 @@
 using namespace crepe;
 
 ReplayManager::ReplayManager(Mediator & mediator) : Manager(mediator) {
+	mediator.replay_manager = *this;
+}
+
+void ReplayManager::record_start() {
+
+}
+
+recording_t ReplayManager::record_end() {
+	return 0;
+}
+
+void ReplayManager::play(recording_t handle) {
+
+}
+
+void ReplayManager::release(recording_t handle) {
+
 }
 
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 0c4f9b3..67acbd8 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -33,26 +33,30 @@ class AnimationScript : public Script {
 
 class Timeline : public Script {
 	unsigned i = 0;
-	OptionalRef<ReplayManager> mgr;
+	ReplayManager & mgr;
 	recording_t recording;
+
+public:
+	Timeline(ReplayManager & mgr)
+		: mgr(mgr) {}
+
 	void update() {
-		ReplayManager & mgr = this->mgr;
 		switch (i++) {
 			default: break;
 			case 10:
-							 // mgr.record_start();
+							 mgr.record_start();
 							 Log::logf("start");
 							 break;
 			case 60:
-							 // this->recording = mgr.record_end();
+							 this->recording = mgr.record_end();
 							 Log::logf("stop");
 							 break;
 			case 70:
-							 // mgr.play(this->recording);
+							 mgr.play(this->recording);
 							 Log::logf("play");
 							 break;
 			case 71:
-							 // mgr.release(this->recording);
+							 mgr.release(this->recording);
 							 Log::logf("end");
 							 break;
 			case 72:
@@ -68,8 +72,8 @@ public:
 	using Scene::Scene;
 
 	void load_scene() {
-		Mediator & m = this->mediator;
-		ComponentManager & mgr = m.component_manager;
+		Mediator & mediator = this->mediator;
+		ComponentManager & mgr = mediator.component_manager;
 
 		GameObject cam = mgr.new_object("cam");
 		cam.add_component<Camera>(ivec2{640,480},vec2{3,3}, Camera::Data{
@@ -86,7 +90,7 @@ public:
 		square.add_component<BehaviorScript>().set_script<AnimationScript>();
 
 		GameObject scapegoat = mgr.new_object("");
-		scapegoat.add_component<BehaviorScript>().set_script<Timeline>();
+		scapegoat.add_component<BehaviorScript>().set_script<Timeline>(mediator.replay_manager);
 	}
 
 	string get_name() const { return "scene1"; }
-- 
cgit v1.2.3


From 313da47b72aafa0b40ac2cd2b586d525ed17fbd4 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 18:51:58 +0100
Subject: more WIP

---
 src/crepe/manager/ReplayManager.cpp | 17 ++++++++++++++---
 src/example/replay.cpp              |  8 +++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/manager/ReplayManager.cpp b/src/crepe/manager/ReplayManager.cpp
index 40d34a4..82c2275 100644
--- a/src/crepe/manager/ReplayManager.cpp
+++ b/src/crepe/manager/ReplayManager.cpp
@@ -1,25 +1,36 @@
+#include "../util/Log.h"
+
 #include "ReplayManager.h"
-#include "manager/Manager.h"
+#include "Manager.h"
 
 using namespace crepe;
+using namespace std;
 
 ReplayManager::ReplayManager(Mediator & mediator) : Manager(mediator) {
 	mediator.replay_manager = *this;
 }
 
 void ReplayManager::record_start() {
-
+	if (this->recording) this->release(this->current_recording);
+	this->current_recording++;
+	this->recording = true;
 }
 
 recording_t ReplayManager::record_end() {
-	return 0;
+	this->recording = false;
+	return this->current_recording;
 }
 
 void ReplayManager::play(recording_t handle) {
+	if (!this->memory.contains(handle))
+		throw out_of_range(format("ReplayManager: no recording for handle {}", handle));
+	Recording & recording = *this->memory.at(handle);
 
+	dbg_log("TODO: magic");
 }
 
 void ReplayManager::release(recording_t handle) {
+	dbg_log("release");
 
 }
 
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 67acbd8..2f9c63e 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -2,6 +2,7 @@
 #include <crepe/api/BoxCollider.h>
 #include <crepe/api/Camera.h>
 #include <crepe/api/Color.h>
+#include <crepe/api/Config.h>
 #include <crepe/api/Event.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/LoopManager.h>
@@ -45,22 +46,17 @@ public:
 			default: break;
 			case 10:
 							 mgr.record_start();
-							 Log::logf("start");
 							 break;
 			case 60:
 							 this->recording = mgr.record_end();
-							 Log::logf("stop");
 							 break;
 			case 70:
 							 mgr.play(this->recording);
-							 Log::logf("play");
 							 break;
 			case 71:
 							 mgr.release(this->recording);
-							 Log::logf("end");
 							 break;
 			case 72:
-							 Log::logf("exit");
 							 throw;
 							 break;
 		};
@@ -97,6 +93,8 @@ public:
 };
 
 int main(int argc, char * argv[]) {
+	Config & cfg = Config::get_instance();
+	cfg.log.level = Log::Level::DEBUG;
 	LoopManager gameloop;
 
 	gameloop.add_scene<TestScene>();
-- 
cgit v1.2.3


From 000062b462a3af86db4dac4d8c9e5ef32feb2996 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 21:19:57 +0100
Subject: split up loopmanager into SystemManager and Engine

---
 src/crepe/api/CMakeLists.txt        |   5 +-
 src/crepe/api/Engine.cpp            |  37 ++++++++++++
 src/crepe/api/Engine.h              |  73 ++++++++++++++++++++++++
 src/crepe/api/Engine.hpp            |  12 ++++
 src/crepe/api/LoopManager.cpp       |  75 -------------------------
 src/crepe/api/LoopManager.h         | 109 ------------------------------------
 src/crepe/api/LoopManager.hpp       |  46 ---------------
 src/crepe/api/LoopTimer.h           |   2 +-
 src/crepe/manager/CMakeLists.txt    |   3 +
 src/crepe/manager/Mediator.h        |   4 +-
 src/crepe/manager/SystemManager.cpp |  45 +++++++++++++++
 src/crepe/manager/SystemManager.h   |  55 ++++++++++++++++++
 src/crepe/manager/SystemManager.hpp |  40 +++++++++++++
 src/crepe/system/ReplaySystem.cpp   |  11 ++--
 src/example/replay.cpp              |   9 +--
 15 files changed, 282 insertions(+), 244 deletions(-)
 create mode 100644 src/crepe/api/Engine.cpp
 create mode 100644 src/crepe/api/Engine.h
 create mode 100644 src/crepe/api/Engine.hpp
 delete mode 100644 src/crepe/api/LoopManager.cpp
 delete mode 100644 src/crepe/api/LoopManager.h
 delete mode 100644 src/crepe/api/LoopManager.hpp
 create mode 100644 src/crepe/manager/SystemManager.cpp
 create mode 100644 src/crepe/manager/SystemManager.h
 create mode 100644 src/crepe/manager/SystemManager.hpp

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 46deb67..6e062f9 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(crepe PUBLIC
 	CircleCollider.cpp
 	IKeyListener.cpp
 	IMouseListener.cpp
-	LoopManager.cpp
+	Engine.cpp
 	LoopTimer.cpp
 	Asset.cpp
 	EventHandler.cpp
@@ -49,7 +49,8 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Event.h
 	IKeyListener.h
 	IMouseListener.h
-	LoopManager.h
+	Engine.h
+	Engine.hpp
 	LoopTimer.h
 	Asset.h
 	Button.h
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
new file mode 100644
index 0000000..8ed55fa
--- /dev/null
+++ b/src/crepe/api/Engine.cpp
@@ -0,0 +1,37 @@
+#include "Engine.h"
+
+using namespace crepe;
+using namespace std;
+
+void Engine::start() {
+	this->setup();
+	this->loop();
+}
+
+void Engine::setup() {
+	LoopTimer & timer = this->loop_timer;
+	this->game_running = true;
+	this->scene_manager.load_next_scene();
+	timer.start();
+	timer.set_fps(200);
+}
+
+void Engine::loop() {
+	LoopTimer & timer = this->loop_timer;
+	SystemManager & systems = this->system_manager;
+
+	timer.start();
+
+	while (game_running) {
+		timer.update();
+
+		while (timer.get_lag() >= timer.get_fixed_delta_time()) {
+			systems.fixed_update();
+			timer.advance_fixed_update();
+		}
+
+		systems.frame_update();
+		timer.enforce_frame_rate();
+	}
+}
+
diff --git a/src/crepe/api/Engine.h b/src/crepe/api/Engine.h
new file mode 100644
index 0000000..7601015
--- /dev/null
+++ b/src/crepe/api/Engine.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include "../facade/SDLContext.h"
+#include "../manager/ComponentManager.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 "LoopTimer.h"
+
+namespace crepe {
+
+/**
+ * \brief Main game entrypoint
+ *
+ * This class is responsible for managing the game loop, including initialization and updating.
+ */
+class Engine {
+public:
+	void start();
+
+	/**
+	 * \brief Add a new concrete scene to the scene manager
+	 *
+	 * \tparam T  Type of concrete scene
+	 */
+	template <typename T>
+	void add_scene();
+
+private:
+	/**
+	 * \brief Setup function for one-time initialization.
+	 *
+	 * This function initializes necessary components for the game.
+	 */
+	void setup();
+	/**
+	 * \brief Main game loop function.
+	 *
+	 * This function runs the main loop, handling game updates and rendering.
+	 */
+	void loop();
+
+	bool game_running = false;
+
+private:
+	//! Global context
+	Mediator mediator;
+
+	//! Component manager instance
+	ComponentManager component_manager{mediator};
+	//! Scene manager instance
+	SceneManager scene_manager{mediator};
+	//! Resource manager instance
+	ResourceManager resource_manager{mediator};
+	//! Save manager instance
+	SaveManager save_manager{mediator};
+	//! SDLContext instance
+	SDLContext sdl_context{mediator};
+	//! LoopTimer instance
+	LoopTimer loop_timer{mediator};
+	//! ReplayManager instance
+	ReplayManager replay_manager{mediator};
+	//! SystemManager
+	SystemManager system_manager{mediator};
+};
+
+} // namespace crepe
+
+#include "Engine.hpp"
diff --git a/src/crepe/api/Engine.hpp b/src/crepe/api/Engine.hpp
new file mode 100644
index 0000000..f2fdc0a
--- /dev/null
+++ b/src/crepe/api/Engine.hpp
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "Engine.h"
+
+namespace crepe {
+
+template <class T>
+void Engine::add_scene() {
+	this->scene_manager.add_scene<T>();
+}
+
+} // namespace crepe
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
deleted file mode 100644
index 2855455..0000000
--- a/src/crepe/api/LoopManager.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "../system/AISystem.h"
-#include "../system/AnimatorSystem.h"
-#include "../system/AudioSystem.h"
-#include "../system/CollisionSystem.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 "LoopManager.h"
-
-using namespace crepe;
-using namespace std;
-
-LoopManager::LoopManager() {
-	this->load_system<ScriptSystem>();
-	this->load_system<AISystem>();
-	this->load_system<PhysicsSystem>();
-	this->load_system<CollisionSystem>();
-	this->load_system<AnimatorSystem>();
-	this->load_system<ParticleSystem>();
-	this->load_system<RenderSystem>();
-	this->load_system<InputSystem>();
-	this->load_system<EventSystem>();
-	this->load_system<AudioSystem>();
-
-	this->mediator.loop_manager = *this;
-}
-
-void LoopManager::start() {
-	this->setup();
-	this->loop();
-}
-
-void LoopManager::fixed_update() {
-	for (auto & [type, system] : this->systems) {
-		if (!system->active) continue;
-		system->fixed_update();
-	}
-}
-
-void LoopManager::frame_update() {
-	for (auto & [type, system] : this->systems) {
-		if (!system->active) continue;
-		system->frame_update();
-	}
-}
-
-void LoopManager::setup() {
-	LoopTimer & timer = this->loop_timer;
-	this->game_running = true;
-	this->scene_manager.load_next_scene();
-	timer.start();
-	timer.set_fps(200);
-}
-
-void LoopManager::loop() {
-	LoopTimer & timer = this->loop_timer;
-	timer.start();
-
-	while (game_running) {
-		timer.update();
-
-		while (timer.get_lag() >= timer.get_fixed_delta_time()) {
-			this->fixed_update();
-			timer.advance_fixed_update();
-		}
-
-		this->frame_update();
-		timer.enforce_frame_rate();
-	}
-}
-
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
deleted file mode 100644
index f34a5a0..0000000
--- a/src/crepe/api/LoopManager.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "../facade/SDLContext.h"
-#include "../manager/ComponentManager.h"
-#include "../manager/ReplayManager.h"
-#include "../manager/ResourceManager.h"
-#include "../manager/ResourceManager.h"
-#include "../manager/SaveManager.h"
-#include "../manager/SceneManager.h"
-#include "../system/System.h"
-
-#include "LoopTimer.h"
-
-namespace crepe {
-
-/**
- * \brief Main game loop manager
- *
- * This class is responsible for managing the game loop, including initialization and updating.
- */
-class LoopManager {
-public:
-	void start();
-	LoopManager();
-
-	/**
-	 * \brief Add a new concrete scene to the scene manager
-	 *
-	 * \tparam T  Type of concrete scene
-	 */
-	template <typename T>
-	void add_scene();
-
-private:
-	/**
-	 * \brief Setup function for one-time initialization.
-	 *
-	 * This function initializes necessary components for the game.
-	 */
-	void setup();
-	/**
-	 * \brief Main game loop function.
-	 *
-	 * This function runs the main loop, handling game updates and rendering.
-	 */
-	void loop();
-
-	/**
-	 * \brief Per-frame update.
-	 *
-	 * Updates the game state based on the elapsed time since the last frame.
-	 */
-	void frame_update();
-
-	/**
-	 * \brief Fixed update executed at a fixed rate.
-	 *
-	 * This function updates physics and game logic based on LoopTimer's fixed_delta_time.
-	 */
-	void fixed_update();
-
-	bool game_running = false;
-
-private:
-	//! Global context
-	Mediator mediator;
-
-	//! Component manager instance
-	ComponentManager component_manager{mediator};
-	//! Scene manager instance
-	SceneManager scene_manager{mediator};
-	//! Resource manager instance
-	ResourceManager resource_manager{mediator};
-	//! Save manager instance
-	SaveManager save_manager{mediator};
-	//! SDLContext instance
-	SDLContext sdl_context{mediator};
-	//! LoopTimer instance
-	LoopTimer loop_timer{mediator};
-	//! ReplayManager instance
-	ReplayManager replay_manager{mediator};
-
-private:
-	/**
-	 * \brief Collection of System instances
-	 *
-	 * This map holds System instances indexed by the system's class typeid. It is filled in the
-	 * constructor of \c LoopManager using LoopManager::load_system.
-	 */
-	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
-	/**
-	 * \brief Initialize a system
-	 * \tparam T System type (must be derivative of \c System)
-	 */
-	template <class T>
-	void load_system();
-	/**
-	 * \brief Retrieve a reference to ECS system
-	 * \tparam T System type
-	 * \returns Reference to system instance
-	 * \throws std::runtime_error if the System is not initialized
-	 */
-	template <class T>
-	T & get_system();
-};
-
-} // namespace crepe
-
-#include "LoopManager.hpp"
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
deleted file mode 100644
index 627b281..0000000
--- a/src/crepe/api/LoopManager.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <cassert>
-#include <format>
-
-#include "../system/System.h"
-#include "LoopManager.h"
-
-namespace crepe {
-
-template <class T>
-void LoopManager::add_scene() {
-	this->scene_manager.add_scene<T>();
-}
-
-template <class T>
-T & LoopManager::get_system() {
-	using namespace std;
-	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))
-		throw runtime_error(format("LoopManager: {} is not initialized", type.name()));
-
-	System * system = this->systems.at(type).get();
-	T * concrete_system = dynamic_cast<T *>(system);
-	assert(concrete_system != nullptr);
-
-	return *concrete_system;
-}
-
-template <class T>
-void LoopManager::load_system() {
-	using namespace std;
-	static_assert(is_base_of<System, T>::value,
-			"load_system must recieve a derivative class of System");
-
-	const type_info & type = typeid(T);
-	if (this->systems.contains(type))
-		throw runtime_error(format("LoopManager: {} is already initialized", type.name()));
-	System * system = new T(this->mediator);
-	this->systems[type] = unique_ptr<System>(system);
-}
-
-} // namespace crepe
diff --git a/src/crepe/api/LoopTimer.h b/src/crepe/api/LoopTimer.h
index 0a73a4c..fb52a10 100644
--- a/src/crepe/api/LoopTimer.h
+++ b/src/crepe/api/LoopTimer.h
@@ -54,7 +54,7 @@ public:
 	void set_game_scale(double game_scale);
 
 private:
-	friend class LoopManager;
+	friend class Engine;
 
 	/**
 	 * \brief Start the loop timer.
diff --git a/src/crepe/manager/CMakeLists.txt b/src/crepe/manager/CMakeLists.txt
index 459bbfa..aa19f3e 100644
--- a/src/crepe/manager/CMakeLists.txt
+++ b/src/crepe/manager/CMakeLists.txt
@@ -6,6 +6,7 @@ target_sources(crepe PUBLIC
 	SceneManager.cpp
 	ResourceManager.cpp
 	ReplayManager.cpp
+	SystemManager.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -21,5 +22,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	ResourceManager.h
 	ResourceManager.hpp
 	ReplayManager.h
+	SystemManager.h
+	SystemManager.hpp
 )
 
diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index f5864e7..95ca4b5 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -14,7 +14,7 @@ class ResourceManager;
 class SDLContext;
 class LoopTimer;
 class ReplayManager;
-class LoopManager;
+class SystemManager;
 
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
@@ -37,7 +37,7 @@ struct Mediator {
 	OptionalRef<ResourceManager> resource_manager;
 	OptionalRef<LoopTimer> timer;
 	OptionalRef<ReplayManager> replay_manager;
-	OptionalRef<LoopManager> loop_manager;
+	OptionalRef<SystemManager> system_manager;
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/SystemManager.cpp b/src/crepe/manager/SystemManager.cpp
new file mode 100644
index 0000000..8fd80a7
--- /dev/null
+++ b/src/crepe/manager/SystemManager.cpp
@@ -0,0 +1,45 @@
+#include "../system/AISystem.h"
+#include "../system/AnimatorSystem.h"
+#include "../system/AudioSystem.h"
+#include "../system/CollisionSystem.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 "SystemManager.h"
+
+using namespace crepe;
+using namespace std;
+
+SystemManager::SystemManager(Mediator & mediator) : Manager(mediator) {
+	this->load_system<ScriptSystem>();
+	this->load_system<AISystem>();
+	this->load_system<PhysicsSystem>();
+	this->load_system<CollisionSystem>();
+	this->load_system<AnimatorSystem>();
+	this->load_system<ParticleSystem>();
+	this->load_system<RenderSystem>();
+	this->load_system<InputSystem>();
+	this->load_system<EventSystem>();
+	this->load_system<AudioSystem>();
+
+	this->mediator.system_manager = *this;
+}
+
+void SystemManager::fixed_update() {
+	for (auto & [type, system] : this->systems) {
+		if (!system->active) continue;
+		system->fixed_update();
+	}
+}
+
+void SystemManager::frame_update() {
+	for (auto & [type, system] : this->systems) {
+		if (!system->active) continue;
+		system->frame_update();
+	}
+}
+
diff --git a/src/crepe/manager/SystemManager.h b/src/crepe/manager/SystemManager.h
new file mode 100644
index 0000000..5726a5c
--- /dev/null
+++ b/src/crepe/manager/SystemManager.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include "../system/System.h"
+
+#include "Manager.h"
+
+namespace crepe {
+
+class SystemManager : public Manager {
+public:
+	SystemManager(Mediator &);
+
+	/**
+	 * \brief Per-frame update.
+	 *
+	 * Updates the game state based on the elapsed time since the last frame.
+	 */
+	void frame_update();
+
+	/**
+	 * \brief Fixed update executed at a fixed rate.
+	 *
+	 * This function updates physics and game logic based on LoopTimer's fixed_delta_time.
+	 */
+	void fixed_update();
+
+private:
+	/**
+	 * \brief Collection of System instances
+	 *
+	 * This map holds System instances indexed by the system's class typeid. It is filled in the
+	 * constructor of \c SystemManager using SystemManager::load_system.
+	 */
+	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
+	/**
+	 * \brief Initialize a system
+	 * \tparam T System type (must be derivative of \c System)
+	 */
+	template <class T>
+	void load_system();
+
+public:
+	/**
+	 * \brief Retrieve a reference to ECS system
+	 * \tparam T System type
+	 * \returns Reference to system instance
+	 * \throws std::runtime_error if the System is not initialized
+	 */
+	template <class T>
+	T & get_system();
+};
+
+} // namespace crepe
+
+#include "SystemManager.hpp"
diff --git a/src/crepe/manager/SystemManager.hpp b/src/crepe/manager/SystemManager.hpp
new file mode 100644
index 0000000..46ada5f
--- /dev/null
+++ b/src/crepe/manager/SystemManager.hpp
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <memory>
+#include <cassert>
+#include <format>
+
+#include "SystemManager.h"
+
+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");
+
+	const type_info & type = typeid(T);
+	if (!this->systems.contains(type))
+		throw runtime_error(format("SystemManager: {} is not initialized", type.name()));
+
+	System * system = this->systems.at(type).get();
+	T * concrete_system = dynamic_cast<T *>(system);
+	assert(concrete_system != nullptr);
+
+	return *concrete_system;
+}
+
+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");
+
+	const type_info & type = typeid(T);
+	if (this->systems.contains(type))
+		throw runtime_error(format("SystemManager: {} is already initialized", type.name()));
+	System * system = new T(this->mediator);
+	this->systems[type] = unique_ptr<System>(system);
+}
+
+} // namespace crepe
diff --git a/src/crepe/system/ReplaySystem.cpp b/src/crepe/system/ReplaySystem.cpp
index 85595a2..5a90752 100644
--- a/src/crepe/system/ReplaySystem.cpp
+++ b/src/crepe/system/ReplaySystem.cpp
@@ -1,11 +1,10 @@
-#include "system/ScriptSystem.h"
+#include "ScriptSystem.h"
 
 #include "../manager/ReplayManager.h"
+#include "../manager/SystemManager.h"
 
 #include "ReplaySystem.h"
 
-#include "../api/LoopManager.h"
-
 using namespace crepe;
 using namespace std;
 
@@ -58,7 +57,8 @@ void ReplaySystem::update_playing() {
 }
 
 void ReplaySystem::playback_begin() {
-	LoopManager & loop_manager = this->mediator.loop_manager;
+	SystemManager & systems = this->mediator.system_manager;
+	systems.get_system<ScriptSystem>().active = false;
 	// TODO: store system active state
 	// TODO: disable most systems
 	// TODO: store components snapshot
@@ -69,7 +69,8 @@ void ReplaySystem::playback_end() {
 
 	replay.state = ReplayManager::IDLE;
 
-	LoopManager & loop_manager = this->mediator.loop_manager;
+	SystemManager & systems = this->mediator.system_manager;
+	systems.get_system<ScriptSystem>().active = true;
 
 	// TODO: restore system active state snapshot
 	// TODO: restore components snapshot
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 2f9c63e..11413fa 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -5,7 +5,7 @@
 #include <crepe/api/Config.h>
 #include <crepe/api/Event.h>
 #include <crepe/api/GameObject.h>
-#include <crepe/api/LoopManager.h>
+#include <crepe/api/Engine.h>
 #include <crepe/api/Rigidbody.h>
 #include <crepe/api/Scene.h>
 #include <crepe/api/Script.h>
@@ -95,9 +95,10 @@ public:
 int main(int argc, char * argv[]) {
 	Config & cfg = Config::get_instance();
 	cfg.log.level = Log::Level::DEBUG;
-	LoopManager gameloop;
 
-	gameloop.add_scene<TestScene>();
-	gameloop.start();
+	Engine engine;
+
+	engine.add_scene<TestScene>();
+	engine.start();
 	return 0;
 }
-- 
cgit v1.2.3


From b9694e8cc6b85a0089f97ff3c21862adc75a7ee5 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 11 Dec 2024 21:49:32 +0100
Subject: working proof of concept replay system

---
 src/crepe/manager/SystemManager.cpp | 22 ++++++++++++++++++++++
 src/crepe/manager/SystemManager.h   |  6 ++++++
 src/crepe/system/ReplaySystem.cpp   | 33 ++++++++++++++++++++-------------
 src/crepe/system/ReplaySystem.h     |  8 +++++++-
 src/example/replay.cpp              | 20 ++++++++++----------
 5 files changed, 65 insertions(+), 24 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/manager/SystemManager.cpp b/src/crepe/manager/SystemManager.cpp
index 8fd80a7..db7430e 100644
--- a/src/crepe/manager/SystemManager.cpp
+++ b/src/crepe/manager/SystemManager.cpp
@@ -8,6 +8,7 @@
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
 #include "../system/EventSystem.h"
+#include "../system/ReplaySystem.h"
 
 #include "SystemManager.h"
 
@@ -15,6 +16,7 @@ using namespace crepe;
 using namespace std;
 
 SystemManager::SystemManager(Mediator & mediator) : Manager(mediator) {
+	this->load_system<ReplaySystem>();
 	this->load_system<ScriptSystem>();
 	this->load_system<AISystem>();
 	this->load_system<PhysicsSystem>();
@@ -43,3 +45,23 @@ void SystemManager::frame_update() {
 	}
 }
 
+SystemManager::Snapshot SystemManager::save() {
+	Snapshot snapshot;
+	for (auto & [type, system] : this->systems) {
+		snapshot[type] = system->active;
+	}
+	return snapshot;
+}
+
+void SystemManager::restore(const Snapshot & snapshot) {
+	for (auto & [type, active] : snapshot) {
+		this->systems[type]->active = active;
+	}
+}
+
+void SystemManager::disable_all() {
+	for (auto & [type, system] : this->systems) {
+		system->active = false;
+	}
+}
+
diff --git a/src/crepe/manager/SystemManager.h b/src/crepe/manager/SystemManager.h
index 5726a5c..6cf7f2b 100644
--- a/src/crepe/manager/SystemManager.h
+++ b/src/crepe/manager/SystemManager.h
@@ -48,6 +48,12 @@ public:
 	 */
 	template <class T>
 	T & get_system();
+
+public:
+	typedef std::unordered_map<std::type_index, bool> Snapshot;
+	Snapshot save();
+	void restore(const Snapshot & snapshot);
+	void disable_all();
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/ReplaySystem.cpp b/src/crepe/system/ReplaySystem.cpp
index 5a90752..a6b8fb1 100644
--- a/src/crepe/system/ReplaySystem.cpp
+++ b/src/crepe/system/ReplaySystem.cpp
@@ -1,8 +1,8 @@
-#include "ScriptSystem.h"
-
+#include "../util/Log.h"
 #include "../manager/ReplayManager.h"
 #include "../manager/SystemManager.h"
 
+#include "RenderSystem.h"
 #include "ReplaySystem.h"
 
 using namespace crepe;
@@ -45,6 +45,7 @@ void ReplaySystem::update_playing() {
 	ReplayManager::Recording & recording = replay.recording;
 
 	if (recording.frames.size() == recording.frame) {
+		dbg_log("Finished playback");
 		this->playback_end();
 		return;
 	}
@@ -52,27 +53,33 @@ void ReplaySystem::update_playing() {
 	ComponentManager & components = this->mediator.component_manager;
 	ComponentManager::Snapshot & frame = recording.frames.at(recording.frame);
 
+	dbg_logf("Playing recording frame {}", recording.frame);
 	components.restore(frame);
 	recording.frame++;
 }
 
 void ReplaySystem::playback_begin() {
 	SystemManager & systems = this->mediator.system_manager;
-	systems.get_system<ScriptSystem>().active = false;
-	// TODO: store system active state
-	// TODO: disable most systems
-	// TODO: store components snapshot
-}
+	ComponentManager & components = this->mediator.component_manager;
 
-void ReplaySystem::playback_end() {
-	ReplayManager & replay = this->mediator.replay_manager;
+	this->playback = {
+		.components = components.save(),
+		.systems = systems.save(),
+	};
 
-	replay.state = ReplayManager::IDLE;
+	systems.disable_all();
+	systems.get_system<RenderSystem>().active = true;
+	systems.get_system<ReplaySystem>().active = true;
+}
 
+void ReplaySystem::playback_end() {
 	SystemManager & systems = this->mediator.system_manager;
-	systems.get_system<ScriptSystem>().active = true;
+	ComponentManager & components = this->mediator.component_manager;
 
-	// TODO: restore system active state snapshot
-	// TODO: restore components snapshot
+	components.restore(this->playback.components);
+	systems.restore(this->playback.systems);
+
+	ReplayManager & replay = this->mediator.replay_manager;
+	replay.state = ReplayManager::IDLE;
 }
 
diff --git a/src/crepe/system/ReplaySystem.h b/src/crepe/system/ReplaySystem.h
index fb40176..6f6fce4 100644
--- a/src/crepe/system/ReplaySystem.h
+++ b/src/crepe/system/ReplaySystem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../manager/ReplayManager.h"
+#include "../manager/SystemManager.h"
 
 #include "System.h"
 
@@ -17,7 +18,12 @@ private:
 	void update_recording();
 	void update_playing();
 
-	std::unordered_map<std::type_index, bool> system_active_snapshot;
+	struct Snapshot {
+		ComponentManager::Snapshot components;
+		SystemManager::Snapshot systems;
+	};
+	Snapshot playback;
+
 	void playback_begin();
 	void playback_end();
 };
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 11413fa..e7f4e6d 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -45,20 +45,20 @@ public:
 		switch (i++) {
 			default: break;
 			case 10:
-							 mgr.record_start();
-							 break;
+				mgr.record_start();
+				break;
 			case 60:
-							 this->recording = mgr.record_end();
-							 break;
+				this->recording = mgr.record_end();
+				break;
 			case 70:
-							 mgr.play(this->recording);
-							 break;
+				mgr.play(this->recording);
+				break;
 			case 71:
-							 mgr.release(this->recording);
-							 break;
+				mgr.release(this->recording);
+				break;
 			case 72:
-							 throw;
-							 break;
+				throw;
+				break;
 		};
 	}
 };
-- 
cgit v1.2.3


From 45f1f18c78e73280a8a861df2db6237bae6f6d80 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 19:02:40 +0100
Subject: add script api for replaymanager

---
 src/crepe/Component.cpp           |  3 ++-
 src/crepe/api/Script.cpp          | 21 +++++++++++++++++++++
 src/crepe/api/Script.h            | 18 ++++++++++++++++++
 src/crepe/manager/ReplayManager.h |  5 +++++
 src/crepe/system/ReplaySystem.h   |  2 --
 src/example/replay.cpp            | 35 ++++++++---------------------------
 6 files changed, 54 insertions(+), 30 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index 8086492..1aed507 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -5,7 +5,8 @@ using namespace std;
 
 Component::Component(game_object_id_t id) : game_object_id(id) {}
 
-Component & Component::operator=(const Component &) {
+Component & Component::operator=(const Component & other) {
+	this->active = other.active;
 	return *this;
 }
 
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 753a9e3..8b95cc9 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -25,3 +25,24 @@ void Script::set_next_scene(const string & name) {
 }
 
 SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; }
+
+void Script::replay::record_start() {
+	ReplayManager & mgr = this->mediator->replay_manager;
+	return mgr.record_start();
+}
+
+recording_t Script::replay::record_end() {
+	ReplayManager & mgr = this->mediator->replay_manager;
+	return mgr.record_end();
+}
+
+void Script::replay::play(recording_t recording) {
+	ReplayManager & mgr = this->mediator->replay_manager;
+	return mgr.play(recording);
+}
+
+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 668e5d1..c797db0 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 
+#include "../manager/ReplayManager.h"
 #include "../manager/EventManager.h"
 #include "../manager/Mediator.h"
 #include "../system/CollisionSystem.h"
@@ -135,6 +136,23 @@ protected:
 	//! Retrieve SaveManager reference
 	SaveManager & get_save_manager() const;
 
+	//! Replay management functions
+	struct replay { // NOLINT
+		//! \copydoc ReplayManager::record_start
+		void record_start();
+		//! \copydoc ReplayManager::record_end
+		recording_t record_end();
+		//! \copydoc ReplayManager::play
+		void play(recording_t);
+		//! \copydoc ReplayManager::release
+		void release(recording_t);
+
+	private:
+		OptionalRef<Mediator> & mediator;
+		replay(OptionalRef<Mediator> & mediator) : mediator(mediator) {}
+		friend class Script;
+	} replay{mediator};
+
 	//! \}
 
 private:
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
index 5794761..7be18f3 100644
--- a/src/crepe/manager/ReplayManager.h
+++ b/src/crepe/manager/ReplayManager.h
@@ -12,7 +12,12 @@ class ReplaySystem;
 
 typedef size_t recording_t;
 
+/**
+ * \brief Replay manager
+ *
+ */
 class ReplayManager : public Manager {
+	// TODO: Delete recordings at end of scene
 public:
 	ReplayManager(Mediator & mediator);
 
diff --git a/src/crepe/system/ReplaySystem.h b/src/crepe/system/ReplaySystem.h
index 6f6fce4..919c554 100644
--- a/src/crepe/system/ReplaySystem.h
+++ b/src/crepe/system/ReplaySystem.h
@@ -15,8 +15,6 @@ public:
 
 private:
 	ReplayManager::State last_state = ReplayManager::IDLE;
-	void update_recording();
-	void update_playing();
 
 	struct Snapshot {
 		ComponentManager::Snapshot components;
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index e7f4e6d..4c606d7 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -1,19 +1,6 @@
-#include <crepe/util/OptionalRef.h>
-#include <crepe/api/BoxCollider.h>
-#include <crepe/api/Camera.h>
-#include <crepe/api/Color.h>
-#include <crepe/api/Config.h>
-#include <crepe/api/Event.h>
-#include <crepe/api/GameObject.h>
 #include <crepe/api/Engine.h>
-#include <crepe/api/Rigidbody.h>
-#include <crepe/api/Scene.h>
 #include <crepe/api/Script.h>
-#include <crepe/api/Sprite.h>
-#include <crepe/api/Transform.h>
-#include <crepe/manager/ComponentManager.h>
-#include <crepe/manager/Mediator.h>
-#include <crepe/manager/ReplayManager.h>
+#include <crepe/api/Config.h>
 
 using namespace crepe;
 using namespace std;
@@ -34,27 +21,20 @@ class AnimationScript : public Script {
 
 class Timeline : public Script {
 	unsigned i = 0;
-	ReplayManager & mgr;
 	recording_t recording;
 
-public:
-	Timeline(ReplayManager & mgr)
-		: mgr(mgr) {}
-
 	void update() {
 		switch (i++) {
 			default: break;
 			case 10:
-				mgr.record_start();
+				replay.record_start();
 				break;
 			case 60:
-				this->recording = mgr.record_end();
-				break;
-			case 70:
-				mgr.play(this->recording);
+				this->recording = replay.record_end();
+				replay.play(this->recording);
 				break;
-			case 71:
-				mgr.release(this->recording);
+			case 61:
+				replay.release(this->recording);
 				break;
 			case 72:
 				throw;
@@ -86,7 +66,7 @@ public:
 		square.add_component<BehaviorScript>().set_script<AnimationScript>();
 
 		GameObject scapegoat = mgr.new_object("");
-		scapegoat.add_component<BehaviorScript>().set_script<Timeline>(mediator.replay_manager);
+		scapegoat.add_component<BehaviorScript>().set_script<Timeline>();
 	}
 
 	string get_name() const { return "scene1"; }
@@ -100,5 +80,6 @@ int main(int argc, char * argv[]) {
 
 	engine.add_scene<TestScene>();
 	engine.start();
+
 	return 0;
 }
-- 
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/example/replay.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 23196be83778973d9688cc5d465e4e4a16476568 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 12 Dec 2024 22:45:12 +0100
Subject: add documentation

---
 src/crepe/Component.h                | 17 ++++++++++++
 src/crepe/api/BehaviorScript.h       |  1 -
 src/crepe/api/Engine.cpp             |  7 ++---
 src/crepe/api/Engine.h               | 14 ++++++----
 src/crepe/api/GameObject.h           |  3 ++-
 src/crepe/api/ParticleEmitter.cpp    | 15 +++++++++++
 src/crepe/api/ParticleEmitter.h      |  6 +++++
 src/crepe/api/Script.hpp             | 11 ++++++--
 src/crepe/api/Transform.h            |  1 -
 src/crepe/manager/ComponentManager.h | 24 +++++++++++++++--
 src/crepe/manager/ReplayManager.cpp  |  7 +++++
 src/crepe/manager/ReplayManager.h    | 52 +++++++++++++++++++++++++++++++-----
 src/crepe/manager/SystemManager.h    | 24 +++++++++++++++++
 src/crepe/system/CMakeLists.txt      |  1 +
 src/crepe/system/EventSystem.h       |  7 +++++
 src/crepe/system/ReplaySystem.h      | 15 +++++++++++
 src/example/replay.cpp               |  4 +--
 17 files changed, 185 insertions(+), 24 deletions(-)

(limited to 'src/example/replay.cpp')

diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index fc0268c..52e06d5 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -39,10 +39,27 @@ protected:
 	virtual Component & operator=(Component &&) = delete;
 
 protected:
+	/**
+	 * \name ReplayManager (Memento) functions
+	 * \{
+	 */
+	/**
+	 * \brief Save a snapshot of this component's state
+	 * \note This function should only be implemented on components that should be saved/restored
+	 * by ReplayManager.
+	 * \returns Unique pointer to a deep copy of this component
+	 */
 	virtual std::unique_ptr<Component> save() const;
+	//! Copy constructor (used by \c save())
 	Component(const Component &) = default;
+	/**
+	 * \brief Restore this component from a snapshot
+	 * \param snapshot Data to fill this component with (as returned by \c save())
+	 */
 	virtual void restore(const Component & snapshot);
+	//! Copy assignment operator (used by \c restore())
 	virtual Component & operator=(const Component &);
+	//! \}
 
 public:
 	virtual ~Component() = default;
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 02d588a..3909b96 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -9,7 +9,6 @@
 namespace crepe {
 
 class ScriptSystem;
-class Mediator;
 class ComponentManager;
 class Script;
 
diff --git a/src/crepe/api/Engine.cpp b/src/crepe/api/Engine.cpp
index 7ae89b9..e8b7fd6 100644
--- a/src/crepe/api/Engine.cpp
+++ b/src/crepe/api/Engine.cpp
@@ -5,12 +5,12 @@
 using namespace crepe;
 using namespace std;
 
-void Engine::start() {
+int Engine::main() noexcept {
 	try {
 		this->setup();
 	} catch (const exception & e) {
 		Log::logf(Log::Level::ERROR, "Uncaught exception in setup: {}\n", e.what());
-		return;
+		return EXIT_FAILURE;
 	}
 
 	try {
@@ -19,10 +19,11 @@ void Engine::start() {
 		Log::logf(Log::Level::ERROR, "Uncaught exception in main loop: {}\n", e.what());
 		this->event_manager.trigger_event<ShutDownEvent>();
 	}
+
+	return EXIT_SUCCESS;
 }
 
 void Engine::setup() {
-	this->game_running = true;
 	this->loop_timer.start();
 	this->scene_manager.load_next_scene();
 
diff --git a/src/crepe/api/Engine.h b/src/crepe/api/Engine.h
index 5421d60..efe7853 100644
--- a/src/crepe/api/Engine.h
+++ b/src/crepe/api/Engine.h
@@ -20,13 +20,16 @@ namespace crepe {
  */
 class Engine {
 public:
-	void start();
-
 	/**
-	 * \brief Add a new concrete scene to the scene manager
+	 * \brief Engine entrypoint
+	 *
+	 * This function is called by the game programmer after registering all scenes
 	 *
-	 * \tparam T  Type of concrete scene
+	 * \returns process exit code
 	 */
+	int main() noexcept;
+
+	//! \copydoc SceneManager::add_scene
 	template <typename T>
 	void add_scene();
 
@@ -44,7 +47,8 @@ private:
 	 */
 	void loop();
 
-	bool game_running = false;
+	//! Game loop condition
+	bool game_running = true;
 
 private:
 	//! Global context
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 6203f81..0dabed1 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -39,8 +39,9 @@ private:
 public:
 	//! The id of the GameObject
 	const game_object_id_t id;
-
+	//! This entity's transform
 	Transform & transform;
+	//! This entity's metadata
 	Metadata & metadata;
 
 public:
diff --git a/src/crepe/api/ParticleEmitter.cpp b/src/crepe/api/ParticleEmitter.cpp
index 90b77a0..fd69e26 100644
--- a/src/crepe/api/ParticleEmitter.cpp
+++ b/src/crepe/api/ParticleEmitter.cpp
@@ -1,6 +1,7 @@
 #include "ParticleEmitter.h"
 
 using namespace crepe;
+using namespace std;
 
 ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Data & data)
 	: Component(game_object_id),
@@ -9,3 +10,17 @@ ParticleEmitter::ParticleEmitter(game_object_id_t game_object_id, const Data & d
 		this->data.particles.emplace_back();
 	}
 }
+
+unique_ptr<Component> ParticleEmitter::save() const {
+	return unique_ptr<Component>{new ParticleEmitter(*this)};
+}
+
+void ParticleEmitter::restore(const Component & snapshot) {
+	*this = static_cast<const ParticleEmitter &>(snapshot);
+}
+
+ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter & other) {
+	data.particles = other.data.particles;
+	return *this;
+}
+
diff --git a/src/crepe/api/ParticleEmitter.h b/src/crepe/api/ParticleEmitter.h
index b83fd61..5f563de 100644
--- a/src/crepe/api/ParticleEmitter.h
+++ b/src/crepe/api/ParticleEmitter.h
@@ -80,6 +80,12 @@ public:
 public:
 	//! Configuration data for particle emission settings.
 	Data data;
+
+protected:
+	virtual std::unique_ptr<Component> save() const;
+	ParticleEmitter(const ParticleEmitter &) = default;
+	virtual void restore(const Component & snapshot);
+	virtual ParticleEmitter & operator=(const ParticleEmitter &);
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
index 2553fd1..b42a6df 100644
--- a/src/crepe/api/Script.hpp
+++ b/src/crepe/api/Script.hpp
@@ -40,10 +40,17 @@ void Script::subscribe_internal(const EventHandler<EventType> & callback,
 	EventManager & mgr = this->mediator->event_manager;
 	subscription_t listener = mgr.subscribe<EventType>(
 		[this, callback](const EventType & data) -> bool {
+			// check if (parent) BehaviorScript component is active
 			bool & active = this->active;
 			if (!active) return false;
-			ReplayManager & replay = this->mediator->replay_manager;
-			if (replay.get_state() == ReplayManager::PLAYING) return false;
+
+			// check if replay manager is playing (if initialized)
+			try {
+				ReplayManager & replay = this->mediator->replay_manager;
+				if (replay.get_state() == ReplayManager::PLAYING) return false;
+			} catch (const std::runtime_error &) {}
+
+			// call user-provided callback
 			return callback(data);
 		},
 		channel);
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index bbd23e0..a6f3486 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -41,7 +41,6 @@ protected:
 	Transform(const Transform &) = default;
 	virtual void restore(const Component & snapshot);
 	virtual Transform & operator=(const Transform &) = default;
-
 };
 
 } // namespace crepe
diff --git a/src/crepe/manager/ComponentManager.h b/src/crepe/manager/ComponentManager.h
index 457a196..c3a5b4a 100644
--- a/src/crepe/manager/ComponentManager.h
+++ b/src/crepe/manager/ComponentManager.h
@@ -142,19 +142,39 @@ public:
 	template <typename T>
 	RefVector<T> get_components_by_tag(const std::string & tag) const;
 
+	//! Snapshot of single component (including path in \c components)
 	struct SnapshotComponent {
+		//! \c components path
 		std::type_index type;
+		//! \c components path
 		game_object_id_t id;
+		//! \c components path
 		size_t index;
+		//! Actual component snapshot
 		std::unique_ptr<Component> component;
 	};
+	//! Snapshot of the entire component manager state
 	struct Snapshot {
+		//! All components
+		std::vector<SnapshotComponent> components;
 		// TODO: some kind of hash code that ensures components exist in all the same places as
 		// this snapshot
-		std::vector<SnapshotComponent> components;
 	};
+	/**
+	 * \name ReplayManager (Memento) functions
+	 * \{
+	 */
+	/**
+	 * \brief Save a snapshot of the component manager state
+	 * \returns Deep copy of the component manager's internal state
+	 */
 	Snapshot save();
-	void restore(const Snapshot &);
+	/**
+	 * \brief Restore component manager from a snapshot
+	 * \param snapshot Snapshot to restore from (as returned by \c save())
+	 */
+	void restore(const Snapshot & snapshot);
+	//! \}
 
 private:
 	/**
diff --git a/src/crepe/manager/ReplayManager.cpp b/src/crepe/manager/ReplayManager.cpp
index ab8a5a0..db6acb0 100644
--- a/src/crepe/manager/ReplayManager.cpp
+++ b/src/crepe/manager/ReplayManager.cpp
@@ -38,6 +38,9 @@ void ReplayManager::release(recording_t handle) {
 }
 
 void ReplayManager::frame_record() {
+	if (this->state != RECORDING)
+		throw runtime_error("ReplayManager: frame_step called while not playing");
+
 	ComponentManager & components = this->mediator.component_manager;
 	Recording & recording = this->recording;
 
@@ -46,6 +49,9 @@ void ReplayManager::frame_record() {
 }
 
 bool ReplayManager::frame_step() {
+	if (this->state != PLAYING)
+		throw runtime_error("ReplayManager: frame_step called while not playing");
+
 	ComponentManager & components = this->mediator.component_manager;
 	Recording & recording = this->recording;
 
@@ -58,6 +64,7 @@ bool ReplayManager::frame_step() {
 	// end of recording
 	recording.frame = 0;
 	this->state = IDLE;
+	this->recording.clear();
 	return true;
 }
 
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
index 7be18f3..d3af879 100644
--- a/src/crepe/manager/ReplayManager.h
+++ b/src/crepe/manager/ReplayManager.h
@@ -8,13 +8,14 @@
 
 namespace crepe {
 
-class ReplaySystem;
-
 typedef size_t recording_t;
 
 /**
  * \brief Replay manager
  *
+ * The replay manager is responsible for creating, storing and restoring ComponentManager
+ * snapshots. Sequential snapshots can be recorded and replayed in combination with
+ * ReplaySystem.
  */
 class ReplayManager : public Manager {
 	// TODO: Delete recordings at end of scene
@@ -22,31 +23,70 @@ public:
 	ReplayManager(Mediator & mediator);
 
 public:
+	//! Start a new recording
 	void record_start();
+	/**
+	 * \brief End the latest recording started by \c record_start()
+	 * \returns Handle to recording
+	 */
 	recording_t record_end();
+	/**
+	 * \brief Play a recording
+	 * \param handle Handle to recording (as returned by \c record_end())
+	 */
 	void play(recording_t handle);
+	/**
+	 * \brief Delete a recording from memory
+	 * \param handle Handle to recording (as returned by \c record_end())
+	 */
 	void release(recording_t handle);
 	
 public:
+	//! Internal state
 	enum State {
-		IDLE,
-		RECORDING,
-		PLAYING,
+		IDLE, //!< Not doing anything
+		RECORDING, //!< Currently recording
+		PLAYING, //!< Currently playing back a recording
 	};
+	//! Get current internal state
 	State get_state() const;
 
 public:
+	/**
+	 * \brief Record a single frame to the current recording
+	 *
+	 * This function is called by ReplaySystem after the game programmer has called \c
+	 * record_start()
+	 */
 	void frame_record();
+	/**
+	 * \brief Play the next frame of the current recording
+	 *
+	 * \returns `true` if the recording is finished playing
+	 * \returns `false` if there are more frames
+	 *
+	 * This function also automatically resets the internal state from PLAYING to IDLE at the end
+	 * of a recording.
+	 */
 	bool frame_step();
 
 private:
+	/**
+	 * \brief Recording data
+	 */
 	struct Recording {
+		//! Current frame being shown
 		size_t frame = 0;
+		//! All frames in recording
 		std::vector<ComponentManager::Snapshot> frames;
 	};
+	//! Internal state
 	State state = IDLE;
-	OptionalRef<Recording> recording;
+	//! Current recording handle
 	recording_t id = -1;
+	//! Current recording data
+	OptionalRef<Recording> recording;
+	//! Recording storage
 	std::unordered_map<recording_t, std::unique_ptr<Recording>> memory;
 };
 
diff --git a/src/crepe/manager/SystemManager.h b/src/crepe/manager/SystemManager.h
index 6cf7f2b..a47961b 100644
--- a/src/crepe/manager/SystemManager.h
+++ b/src/crepe/manager/SystemManager.h
@@ -1,11 +1,21 @@
 #pragma once
 
+#include <typeindex>
+#include <unordered_map>
+#include <memory>
+
 #include "../system/System.h"
 
 #include "Manager.h"
 
 namespace crepe {
 
+/**
+ * \brief Collection of all systems
+ *
+ * This manager aggregates all systems and provides utility functions to retrieve references to
+ * and update systems.
+ */
 class SystemManager : public Manager {
 public:
 	SystemManager(Mediator &);
@@ -50,9 +60,23 @@ public:
 	T & get_system();
 
 public:
+	/**
+	 * \brief SystemManager snapshot
+	 *
+	 * The SystemManager snapshot only stores which systems are active
+	 */
 	typedef std::unordered_map<std::type_index, bool> Snapshot;
+	/**
+	 * \brief Save a snapshot of the systems' state
+	 * \returns Copy of each system's active property
+	 */
 	Snapshot save();
+	/**
+	 * \brief Restore system active state from a snapshot
+	 * \param snapshot Snapshot to restore from (as returned by \c save())
+	 */
 	void restore(const Snapshot & snapshot);
+	//! Disable all systems
 	void disable_all();
 };
 
diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt
index 3473876..52369d0 100644
--- a/src/crepe/system/CMakeLists.txt
+++ b/src/crepe/system/CMakeLists.txt
@@ -23,5 +23,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	AnimatorSystem.h
 	InputSystem.h
 	EventSystem.h
+	ReplaySystem.h
 	AISystem.h
 )
diff --git a/src/crepe/system/EventSystem.h b/src/crepe/system/EventSystem.h
index a179d00..ff3ca4e 100644
--- a/src/crepe/system/EventSystem.h
+++ b/src/crepe/system/EventSystem.h
@@ -4,10 +4,17 @@
 
 namespace crepe {
 
+/**
+ * \brief EventManager dispatch helper system
+ */
 class EventSystem : public System {
 public:
 	using System::System;
 
+	/**
+	 * \brief Dispatch queued events
+	 * \see EventManager::dispatch_events
+	 */
 	void fixed_update() override;
 };
 
diff --git a/src/crepe/system/ReplaySystem.h b/src/crepe/system/ReplaySystem.h
index 919c554..8ba60d5 100644
--- a/src/crepe/system/ReplaySystem.h
+++ b/src/crepe/system/ReplaySystem.h
@@ -7,6 +7,11 @@
 
 namespace crepe {
 
+/**
+ * \brief ReplayManager helper system
+ *
+ * This system records and replays recordings using ReplayManager.
+ */
 class ReplaySystem : public System {
 public:
 	using System::System;
@@ -14,15 +19,25 @@ public:
 	void fixed_update() override;
 
 private:
+	//! Last ReplayManager state
 	ReplayManager::State last_state = ReplayManager::IDLE;
 
+	/**
+	 * \brief Playback snapshot
+	 *
+	 * When starting playback, the component state is saved and most systems are disabled. This
+	 * struct stores the engine state before ReplayManager::play is called.
+	 */
 	struct Snapshot {
 		ComponentManager::Snapshot components;
 		SystemManager::Snapshot systems;
 	};
+	//! Before playback snapshot
 	Snapshot playback;
 
+	//! Snapshot state and disable systems during playback
 	void playback_begin();
+	//! Restore state from before \c playback_begin()
 	void playback_end();
 };
 
diff --git a/src/example/replay.cpp b/src/example/replay.cpp
index 7faf6cb..130c0d3 100644
--- a/src/example/replay.cpp
+++ b/src/example/replay.cpp
@@ -83,7 +83,5 @@ int main(int argc, char * argv[]) {
 	Engine engine;
 
 	engine.add_scene<TestScene>();
-	engine.start();
-
-	return 0;
+	return engine.main();
 }
-- 
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/example/replay.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