big WIP

41 files changed, 325 insertions, 218 deletions

diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 3e9e21c..637fbe1 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -6,40 +6,51 @@
 #include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
-#include "manager/EventManager.h"
+#include "../system/EventSystem.h"
 
 #include "LoopManager.h"
 
 using namespace crepe;
 using namespace std;
 
-LoopManager::LoopManager() {
-	this->load_system<AnimatorSystem>();
-	this->load_system<CollisionSystem>();
-	this->load_system<ParticleSystem>();
-	this->load_system<PhysicsSystem>();
-	this->load_system<RenderSystem>();
-	this->load_system<ScriptSystem>();
-	this->load_system<InputSystem>();
-	this->load_system<AudioSystem>();
-}
-
-void LoopManager::process_input() { this->get_system<InputSystem>().update(); }
+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},
+	}) { }
 
 void LoopManager::start() {
 	this->setup();
 	this->loop();
 }
-void LoopManager::set_running(bool running) { this->game_running = running; }
 
 void LoopManager::fixed_update() {
-	// TODO: retrieve EventManager from direct member after singleton refactor
-	EventManager & ev = this->mediator.event_manager;
-	ev.dispatch_events();
-	this->get_system<ScriptSystem>().update();
-	this->get_system<PhysicsSystem>().update();
-	this->get_system<CollisionSystem>().update();
-	this->get_system<AudioSystem>().update();
+	for (System & 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();
+	}
+}
+
+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() {
@@ -50,31 +61,12 @@ void LoopManager::loop() {
 		timer.update();
 
 		while (timer.get_lag() >= timer.get_fixed_delta_time()) {
-			this->process_input();
 			this->fixed_update();
 			timer.advance_fixed_update();
 		}
 
-		this->update();
-		this->render();
-
+		this->frame_update();
 		timer.enforce_frame_rate();
 	}
 }
 
-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::render() {
-	if (!this->game_running) return;
-
-	this->get_system<AnimatorSystem>().update();
-	this->get_system<RenderSystem>().update();
-}
-
-void LoopManager::update() {}
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 0947f94..1ac6a39 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <memory>
-
 #include "../facade/SDLContext.h"
 #include "../manager/ComponentManager.h"
 #include "../manager/ResourceManager.h"
@@ -45,25 +43,11 @@ private:
 	void loop();
 
 	/**
-	 * \brief Function for handling input-related system calls.
-	 *
-	 * Processes user inputs from keyboard and mouse.
-	 */
-	void process_input();
-
-	/**
 	 * \brief Per-frame update.
 	 *
 	 * Updates the game state based on the elapsed time since the last frame.
 	 */
-	void update();
-
-	/**
-	 * \brief Late update which is called after update().
-	 *
-	 * This function can be used for final adjustments before rendering.
-	 */
-	void late_update();
+	void frame_update();
 
 	/**
 	 * \brief Fixed update executed at a fixed rate.
@@ -72,20 +56,6 @@ private:
 	 */
 	void fixed_update();
 
-	/**
-	 * \brief Set game running variable
-	 *
-	 * \param running running (false = game shutdown, true = game running)
-	 */
-	void set_running(bool running);
-
-	/**
-	 * \brief Function for executing render-related systems.
-	 *
-	 * Renders the current state of the game to the screen.
-	 */
-	void render();
-
 	bool game_running = false;
 
 private:
@@ -107,25 +77,8 @@ private:
 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();
+	std::vector<System> systems;
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index 266758a..51afa70 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -1,11 +1,5 @@
 #pragma once
 
-#include <cassert>
-#include <format>
-#include <memory>
-
-#include "../system/System.h"
-
 #include "LoopManager.h"
 
 namespace crepe {
@@ -15,34 +9,4 @@ 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/CMakeLists.txt b/src/crepe/manager/CMakeLists.txt
index 480c8ee..459bbfa 100644
--- a/src/crepe/manager/CMakeLists.txt
+++ b/src/crepe/manager/CMakeLists.txt
@@ -5,6 +5,7 @@ target_sources(crepe PUBLIC
 	SaveManager.cpp
 	SceneManager.cpp
 	ResourceManager.cpp
+	ReplayManager.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -19,5 +20,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SceneManager.hpp
 	ResourceManager.h
 	ResourceManager.hpp
+	ReplayManager.h
 )
 
diff --git a/src/crepe/manager/ReplayManager.cpp b/src/crepe/manager/ReplayManager.cpp
new file mode 100644
index 0000000..3643a8e
--- /dev/null
+++ b/src/crepe/manager/ReplayManager.cpp
@@ -0,0 +1,8 @@
+#include "ReplayManager.h"
+#include "manager/Manager.h"
+
+using namespace crepe;
+
+ReplayManager::ReplayManager(Mediator & mediator) : Manager(mediator) {
+}
+
diff --git a/src/crepe/manager/ReplayManager.h b/src/crepe/manager/ReplayManager.h
new file mode 100644
index 0000000..242eae4
--- /dev/null
+++ b/src/crepe/manager/ReplayManager.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "Manager.h"
+
+namespace crepe {
+
+class ReplaySystem;
+class Memento;
+
+typedef size_t recording_t;
+
+class ReplayManager : public Manager {
+public:
+	ReplayManager(Mediator & mediator);
+	friend class ReplaySystem;
+
+protected:
+	void record_frame();
+
+private:
+	bool recording;
+	struct Recording {
+		recording_t id;
+		std::vector<Memento> frames;
+	};
+public:
+	void record_start();
+	recording_t record_end();
+	
+};
+
+} // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 549c35d..8d6d8fa 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -1,5 +1,3 @@
-
-
 #include "../api/Animator.h"
 #include "../manager/ComponentManager.h"
 #include "api/LoopTimer.h"
@@ -8,7 +6,7 @@
 
 using namespace crepe;
 
-void AnimatorSystem::update() {
+void AnimatorSystem::frame_update() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	LoopTimer & timer = this->mediator.timer;
 	RefVector<Animator> animations = mgr.get_components_by_type<Animator>();
diff --git a/src/crepe/system/AnimatorSystem.h b/src/crepe/system/AnimatorSystem.h
index 7d3f565..092e131 100644
--- a/src/crepe/system/AnimatorSystem.h
+++ b/src/crepe/system/AnimatorSystem.h
@@ -22,7 +22,7 @@ public:
 	 * Animator components, moving the animations forward and managing their behavior (e.g.,
 	 * looping).
 	 */
-	void update() override;
+	void frame_update() override;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp
index ddba268..9b86069 100644
--- a/src/crepe/system/AudioSystem.cpp
+++ b/src/crepe/system/AudioSystem.cpp
@@ -7,7 +7,7 @@
 using namespace crepe;
 using namespace std;
 
-void AudioSystem::update() {
+void AudioSystem::fixed_update() {
 	ComponentManager & component_manager = this->mediator.component_manager;
 	ResourceManager & resource_manager = this->mediator.resource_manager;
 	RefVector<AudioSource> components
diff --git a/src/crepe/system/AudioSystem.h b/src/crepe/system/AudioSystem.h
index 2ddc443..56fc98c 100644
--- a/src/crepe/system/AudioSystem.h
+++ b/src/crepe/system/AudioSystem.h
@@ -11,7 +11,7 @@ namespace crepe {
 class AudioSystem : public System {
 public:
 	using System::System;
-	void update() override;
+	void fixed_update() override;
 
 private:
 	/**
diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt
index 6b2e099..1336114 100644
--- a/src/crepe/system/CMakeLists.txt
+++ b/src/crepe/system/CMakeLists.txt
@@ -8,6 +8,8 @@ target_sources(crepe PUBLIC
 	AudioSystem.cpp
 	AnimatorSystem.cpp
 	InputSystem.cpp
+	EventSystem.cpp
+	ReplaySystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
@@ -19,4 +21,5 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	AudioSystem.h
 	AnimatorSystem.h
 	InputSystem.h
+	EventSystem.h
 )
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 44a0431..2db592f 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -23,7 +23,7 @@
 
 using namespace crepe;
 
-void CollisionSystem::update() {
+void CollisionSystem::fixed_update() {
 	std::vector<CollisionInternal> all_colliders;
 	game_object_id_t id = 0;
 	ComponentManager & mgr = this->mediator.component_manager;
diff --git a/src/crepe/system/CollisionSystem.h b/src/crepe/system/CollisionSystem.h
index 5b136c6..48a8f86 100644
--- a/src/crepe/system/CollisionSystem.h
+++ b/src/crepe/system/CollisionSystem.h
@@ -85,7 +85,7 @@ public:
 
 public:
 	//! Updates the collision system by checking for collisions between colliders and handling them.
-	void update() override;
+	void fixed_update() override;
 
 private:
 	/**
diff --git a/src/crepe/system/EventSystem.cpp b/src/crepe/system/EventSystem.cpp
new file mode 100644
index 0000000..bf2b6bc
--- /dev/null
+++ b/src/crepe/system/EventSystem.cpp
@@ -0,0 +1,9 @@
+#include "EventSystem.h"
+
+using namespace crepe;
+
+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
new file mode 100644
index 0000000..a179d00
--- /dev/null
+++ b/src/crepe/system/EventSystem.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "System.h"
+
+namespace crepe {
+
+class EventSystem : public System {
+public:
+	using System::System;
+
+	void fixed_update() override;
+};
+
+}
+
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index aaa8bdf..b31bd34 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -6,7 +6,7 @@
 
 using namespace crepe;
 
-void InputSystem::update() {
+void InputSystem::fixed_update() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	EventManager & event_mgr = this->mediator.event_manager;
 	std::vector<SDLContext::EventData> event_list = SDLContext::get_instance().get_events();
diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h
index 87e86f8..62b0fcd 100644
--- a/src/crepe/system/InputSystem.h
+++ b/src/crepe/system/InputSystem.h
@@ -27,7 +27,7 @@ public:
 	 * \brief Updates the system, processing all input events.
 	 * This method processes all events and triggers corresponding actions.
 	 */
-	void update() override;
+	void fixed_update() override;
 
 private:
 	//! Stores the last position of the mouse when the button was pressed.
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index b14c52f..5ccd128 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -10,7 +10,7 @@
 
 using namespace crepe;
 
-void ParticleSystem::update() {
+void ParticleSystem::frame_update() {
 	// Get all emitters
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<ParticleEmitter> emitters = mgr.get_components_by_type<ParticleEmitter>();
diff --git a/src/crepe/system/ParticleSystem.h b/src/crepe/system/ParticleSystem.h
index 068f01c..6c631ea 100644
--- a/src/crepe/system/ParticleSystem.h
+++ b/src/crepe/system/ParticleSystem.h
@@ -20,7 +20,7 @@ public:
 	 * \brief Updates all particle emitters by emitting particles, updating particle states, and
 	 * checking bounds.
 	 */
-	void update() override;
+	void frame_update() override;
 
 private:
 	/**
diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp
index ebf4439..714e531 100644
--- a/src/crepe/system/PhysicsSystem.cpp
+++ b/src/crepe/system/PhysicsSystem.cpp
@@ -10,7 +10,7 @@
 
 using namespace crepe;
 
-void PhysicsSystem::update() {
+void PhysicsSystem::fixed_update() {
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>();
 	RefVector<Transform> transforms = mgr.get_components_by_type<Transform>();
diff --git a/src/crepe/system/PhysicsSystem.h b/src/crepe/system/PhysicsSystem.h
index 26152a5..5ed624f 100644
--- a/src/crepe/system/PhysicsSystem.h
+++ b/src/crepe/system/PhysicsSystem.h
@@ -18,7 +18,7 @@ public:
 	 *
 	 * It calculates new velocties and changes the postion in the transform.
 	 */
-	void update() override;
+	void fixed_update() override;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 26f2c85..e147b9f 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -61,7 +61,7 @@ RefVector<Sprite> RenderSystem::sort(RefVector<Sprite> & objs) const {
 	return sorted_objs;
 }
 
-void RenderSystem::update() {
+void RenderSystem::frame_update() {
 	this->clear_screen();
 	this->render();
 	this->present_screen();
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index e270a6b..a01923d 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -27,7 +27,7 @@ public:
 	 * \brief Updates the RenderSystem for the current frame.
 	 * This method is called to perform all rendering operations for the current game frame.
 	 */
-	void update() override;
+	void frame_update() override;
 
 private:
 	//! Clears the screen in preparation for rendering.
diff --git a/src/crepe/system/ReplaySystem.cpp b/src/crepe/system/ReplaySystem.cpp
new file mode 100644
index 0000000..3aabb58
--- /dev/null
+++ b/src/crepe/system/ReplaySystem.cpp
@@ -0,0 +1,7 @@
+#include "ReplaySystem.h"
+
+using namespace crepe;
+
+void ReplaySystem::fixed_update() {
+}
+
diff --git a/src/crepe/system/ReplaySystem.h b/src/crepe/system/ReplaySystem.h
new file mode 100644
index 0000000..15ef3fc
--- /dev/null
+++ b/src/crepe/system/ReplaySystem.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "System.h"
+
+namespace crepe {
+
+class ReplaySystem : public System {
+public:
+	using System::System;
+
+	void fixed_update() override;
+};
+
+}
+
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index d6b2ca1..ab79fc3 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 using namespace crepe;
 
-void ScriptSystem::update() {
+void ScriptSystem::fixed_update() {
 	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
diff --git a/src/crepe/system/ScriptSystem.h b/src/crepe/system/ScriptSystem.h
index 3db1b1e..612c2ae 100644
--- a/src/crepe/system/ScriptSystem.h
+++ b/src/crepe/system/ScriptSystem.h
@@ -22,7 +22,7 @@ public:
 	 * method. It also calls Script::init() if this has not been done before on
 	 * the \c BehaviorScript instance.
 	 */
-	void update() override;
+	void fixed_update() override;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/System.h b/src/crepe/system/System.h
index 063dfbf..e2ce7eb 100644
--- a/src/crepe/system/System.h
+++ b/src/crepe/system/System.h
@@ -14,10 +14,12 @@ class ComponentManager;
  */
 class System {
 public:
-	/**
-	 * \brief Process all components this system is responsible for.
-	 */
-	virtual void update() = 0;
+	//! Code that runs in the fixed loop
+	virtual void fixed_update() {};
+	//! Code that runs in the frame loop
+	virtual void frame_update() {};
+	//! Indicates that the update functions of this system should be run
+	bool active = true;
 
 public:
 	System(const Mediator & m);
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 73fc512..7260f35 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -20,3 +20,4 @@ add_example(savemgr)
 add_example(rendering_particle)
 add_example(game)
 add_example(button)
+add_example(replay)
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;
+}
diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 48bba1b..415a12e 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -50,11 +50,11 @@ TEST_F(AudioTest, Default) {
 	EXPECT_CALL(context, stop(_)).Times(0);
 	EXPECT_CALL(context, set_volume(_, _)).Times(0);
 	EXPECT_CALL(context, set_loop(_, _)).Times(0);
-	system.update();
+	system.fixed_update();
 }
 
 TEST_F(AudioTest, Play) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -67,12 +67,12 @@ TEST_F(AudioTest, Play) {
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Stop) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -85,12 +85,12 @@ TEST_F(AudioTest, Stop) {
 		InSequence seq;
 
 		EXPECT_CALL(context, stop(_)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Volume) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -103,12 +103,12 @@ TEST_F(AudioTest, Volume) {
 		InSequence seq;
 
 		EXPECT_CALL(context, set_volume(_, component.volume)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Looping) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -121,33 +121,33 @@ TEST_F(AudioTest, Looping) {
 		InSequence seq;
 
 		EXPECT_CALL(context, set_loop(_, component.loop)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, StopOnDeactivate) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
 
 		EXPECT_CALL(context, stop(_)).Times(1);
 		component.active = false;
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, PlayOnActive) {
 	component.active = false;
 	component.play_on_awake = true;
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
 		component.active = true;
-		system.update();
+		system.fixed_update();
 	}
 }
 
@@ -157,5 +157,5 @@ TEST_F(AudioTest, PlayImmediately) {
 
 	EXPECT_CALL(context, play(_)).Times(1);
 
-	system.update();
+	system.fixed_update();
 }
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index ef7b5c6..a0bb56d 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -20,4 +20,5 @@ target_sources(test_main PUBLIC
 	ScriptSceneTest.cpp
 	Profiling.cpp
 	ScriptECSTest.cpp
+	ReplayManagerTest.cpp
 )
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index dd45eb6..0607128 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -106,7 +106,7 @@ public:
 		ASSERT_NE(script_object2_ref, nullptr);
 
 		// Ensure Script::init() is called on all BehaviorScript instances
-		script_sys.update();
+		script_sys.fixed_update();
 	}
 };
 
@@ -121,7 +121,7 @@ TEST_F(CollisionTest, collision_example) {
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 2);
 	};
 	EXPECT_FALSE(collision_happend);
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_FALSE(collision_happend);
 }
 
@@ -144,7 +144,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_both_no_velocity) {
 	EXPECT_FALSE(collision_happend);
 	Transform & tf = this->mgr.get_components_by_id<Transform>(1).front().get();
 	tf.position = {50, 30};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -169,7 +169,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_x_direction_no_velocity) {
 	EXPECT_FALSE(collision_happend);
 	Transform & tf = this->mgr.get_components_by_id<Transform>(1).front().get();
 	tf.position = {45, 30};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -194,7 +194,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_y_direction_no_velocity) {
 	EXPECT_FALSE(collision_happend);
 	Transform & tf = this->mgr.get_components_by_id<Transform>(1).front().get();
 	tf.position = {50, 25};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -221,7 +221,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_both) {
 	rg1.data.linear_velocity = {10, 10};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.linear_velocity = {10, 10};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -250,7 +250,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_x_direction) {
 	rg1.data.linear_velocity = {10, 10};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.linear_velocity = {10, 10};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -279,7 +279,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_y_direction) {
 	rg1.data.linear_velocity = {10, 10};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.linear_velocity = {10, 10};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -301,7 +301,7 @@ TEST_F(CollisionTest, collision_box_box_static_both) {
 	tf.position = {50, 30};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.body_type = crepe::Rigidbody::BodyType::STATIC;
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -326,7 +326,7 @@ TEST_F(CollisionTest, collision_box_box_static_x_direction) {
 	rg1.data.linear_velocity = {10, 10};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.body_type = crepe::Rigidbody::BodyType::STATIC;
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -351,7 +351,7 @@ TEST_F(CollisionTest, collision_box_box_static_y_direction) {
 	rg1.data.linear_velocity = {10, 10};
 	Rigidbody & rg2 = this->mgr.get_components_by_id<Rigidbody>(2).front().get();
 	rg2.data.body_type = crepe::Rigidbody::BodyType::STATIC;
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
 
@@ -381,10 +381,10 @@ TEST_F(CollisionTest, collision_box_box_static_multiple) { //todo check visually
 	this->game_object1.add_component<BoxCollider>(vec2{-5, 0}, vec2{10, 10});
 	offset_value = 5;
 	resolution = 10;
-	collision_sys.update();
+	collision_sys.fixed_update();
 	offset_value = -5;
 	resolution = 10;
 	tf.position = {55, 30};
-	collision_sys.update();
+	collision_sys.fixed_update();
 	EXPECT_TRUE(collision_happend);
 }
diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp
index 73eaab3..8c42c43 100644
--- a/src/test/InputTest.cpp
+++ b/src/test/InputTest.cpp
@@ -83,7 +83,7 @@ TEST_F(InputTest, MouseDown) {
 	event.button.button = SDL_BUTTON_LEFT;
 	SDL_PushEvent(&event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(mouse_triggered);
 }
@@ -111,7 +111,7 @@ TEST_F(InputTest, MouseUp) {
 	event.button.button = SDL_BUTTON_LEFT;
 	SDL_PushEvent(&event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
 }
@@ -141,7 +141,7 @@ TEST_F(InputTest, MouseMove) {
 	event.motion.yrel = 10;
 	SDL_PushEvent(&event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
 }
@@ -171,7 +171,7 @@ TEST_F(InputTest, KeyDown) {
 	test_event.key.repeat = 1; // Set repeat flag
 	SDL_PushEvent(&test_event);
 
-	input_system.update(); // Process the event
+	input_system.fixed_update(); // Process the event
 	event_manager.dispatch_events(); // Dispatch events to handlers
 
 	EXPECT_TRUE(function_triggered); // Check if the handler was triggered
@@ -196,7 +196,7 @@ TEST_F(InputTest, KeyUp) {
 	event.key.keysym.scancode = SDL_SCANCODE_B;
 	SDL_PushEvent(&event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(function_triggered);
 }
@@ -217,7 +217,7 @@ TEST_F(InputTest, MouseClick) {
 	event_manager.subscribe<MouseClickEvent>(on_mouse_click);
 
 	this->simulate_mouse_click(250, 250, SDL_BUTTON_LEFT);
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(on_click_triggered);
 }
@@ -239,12 +239,12 @@ TEST_F(InputTest, testButtonClick) {
 	button.is_pressed = false;
 	button.is_toggle = false;
 	this->simulate_mouse_click(999, 999, SDL_BUTTON_LEFT);
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button_clicked);
 
 	this->simulate_mouse_click(250, 250, SDL_BUTTON_LEFT);
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button_clicked);
 }
@@ -273,7 +273,7 @@ TEST_F(InputTest, testButtonHover) {
 	event.motion.yrel = 10;
 	SDL_PushEvent(&event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_FALSE(button.hover);
 
@@ -287,7 +287,7 @@ TEST_F(InputTest, testButtonHover) {
 	hover_event.motion.yrel = 10;
 	SDL_PushEvent(&hover_event);
 
-	input_system.update();
+	input_system.fixed_update();
 	event_manager.dispatch_events();
 	EXPECT_TRUE(button.hover);
 }
diff --git a/src/test/ParticleTest.cpp b/src/test/ParticleTest.cpp
index 1409c4f..c2a3c14 100644
--- a/src/test/ParticleTest.cpp
+++ b/src/test/ParticleTest.cpp
@@ -93,18 +93,18 @@ TEST_F(ParticlesTest, spawnParticle) {
 	emitter.data.max_angle = 0.1;
 	emitter.data.max_speed = 10;
 	emitter.data.max_angle = 10;
-	particle_system.update();
+	particle_system.frame_update();
 	//check if nothing happend
 	EXPECT_EQ(emitter.data.particles[0].active, false);
 	emitter.data.emission_rate = 1;
 	//check particle spawnes
-	particle_system.update();
+	particle_system.frame_update();
 	EXPECT_EQ(emitter.data.particles[0].active, true);
-	particle_system.update();
+	particle_system.frame_update();
 	EXPECT_EQ(emitter.data.particles[1].active, true);
-	particle_system.update();
+	particle_system.frame_update();
 	EXPECT_EQ(emitter.data.particles[2].active, true);
-	particle_system.update();
+	particle_system.frame_update();
 	EXPECT_EQ(emitter.data.particles[3].active, true);
 
 	for (auto & particle : emitter.data.particles) {
@@ -138,7 +138,7 @@ TEST_F(ParticlesTest, moveParticleHorizontal) {
 	emitter.data.max_angle = 0;
 	emitter.data.emission_rate = 1;
 	for (int a = 1; a < emitter.data.boundary.width / 2; a++) {
-		particle_system.update();
+		particle_system.frame_update();
 		EXPECT_EQ(emitter.data.particles[0].position.x, a);
 	}
 }
@@ -156,7 +156,7 @@ TEST_F(ParticlesTest, moveParticleVertical) {
 	emitter.data.max_angle = 90;
 	emitter.data.emission_rate = 1;
 	for (int a = 1; a < emitter.data.boundary.width / 2; a++) {
-		particle_system.update();
+		particle_system.frame_update();
 		EXPECT_EQ(emitter.data.particles[0].position.y, a);
 	}
 }
@@ -175,7 +175,7 @@ TEST_F(ParticlesTest, boundaryParticleReset) {
 	emitter.data.max_angle = 90;
 	emitter.data.emission_rate = 1;
 	for (int a = 0; a < emitter.data.boundary.width / 2 + 1; a++) {
-		particle_system.update();
+		particle_system.frame_update();
 	}
 	EXPECT_EQ(emitter.data.particles[0].active, false);
 }
@@ -194,7 +194,7 @@ TEST_F(ParticlesTest, boundaryParticleStop) {
 	emitter.data.max_angle = 90;
 	emitter.data.emission_rate = 1;
 	for (int a = 0; a < emitter.data.boundary.width / 2 + 1; a++) {
-		particle_system.update();
+		particle_system.frame_update();
 	}
 	const double TOLERANCE = 0.01;
 	EXPECT_NEAR(emitter.data.particles[0].velocity.x, 0, TOLERANCE);
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 43d2931..7bd7626 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -54,10 +54,10 @@ TEST_F(PhysicsTest, gravity) {
 	ASSERT_FALSE(transforms.empty());
 	EXPECT_EQ(transform.position.y, 0);
 
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(transform.position.y, 1);
 
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(transform.position.y, 3);
 }
 
@@ -70,14 +70,14 @@ TEST_F(PhysicsTest, max_velocity) {
 
 	rigidbody.add_force_linear({100, 100});
 	rigidbody.add_force_angular(100);
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(rigidbody.data.linear_velocity.y, 10);
 	EXPECT_EQ(rigidbody.data.linear_velocity.x, 10);
 	EXPECT_EQ(rigidbody.data.angular_velocity, 10);
 
 	rigidbody.add_force_linear({-100, -100});
 	rigidbody.add_force_angular(-100);
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(rigidbody.data.linear_velocity.y, -10);
 	EXPECT_EQ(rigidbody.data.linear_velocity.x, -10);
 	EXPECT_EQ(rigidbody.data.angular_velocity, -10);
@@ -95,7 +95,7 @@ TEST_F(PhysicsTest, movement) {
 
 	rigidbody.add_force_linear({1, 1});
 	rigidbody.add_force_angular(1);
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(transform.position.x, 1);
 	EXPECT_EQ(transform.position.y, 1);
 	EXPECT_EQ(transform.rotation, 1);
@@ -108,7 +108,7 @@ TEST_F(PhysicsTest, movement) {
 	rigidbody.data.linear_velocity_coefficient.x = 0.5;
 	rigidbody.data.linear_velocity_coefficient.y = 0.5;
 	rigidbody.data.angular_velocity_coefficient = 0.5;
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(rigidbody.data.linear_velocity.x, 0.5);
 	EXPECT_EQ(rigidbody.data.linear_velocity.y, 0.5);
 	EXPECT_EQ(rigidbody.data.angular_velocity, 0.5);
@@ -117,10 +117,10 @@ TEST_F(PhysicsTest, movement) {
 	rigidbody.data.angular_velocity_coefficient = 0;
 	rigidbody.data.max_angular_velocity = 1000;
 	rigidbody.data.angular_velocity = 360;
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(transform.rotation, 1);
 
 	rigidbody.data.angular_velocity = -360;
-	system.update();
+	system.fixed_update();
 	EXPECT_EQ(transform.rotation, 1);
 }
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index c753bca..3f48ced 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -36,7 +36,7 @@ class TestScript : public Script {
 		subscribe<CollisionEvent>(
 			[this](const CollisionEvent & ev) -> bool { return this->oncollision(ev); });
 	}
-	void update() {
+	void fixed_update() {
 		// Retrieve component from the same GameObject this script is on
 	}
 };
@@ -77,9 +77,9 @@ public:
 										 });
 		// initialize systems here:
 		//calls init
-		script_sys.update();
+		script_sys.fixed_update();
 		//creates window
-		render_sys.update();
+		render_sys.frame_update();
 	}
 
 	// Helper function to time an update call and store its duration
@@ -97,12 +97,12 @@ 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.update(); });
+		total_microseconds += time_function("PhysicsSystem", [&]() { physics_sys.fixed_update(); });
 		total_microseconds
-			+= time_function("CollisionSystem", [&]() { collision_sys.update(); });
+			+= time_function("CollisionSystem", [&]() { collision_sys.fixed_update(); });
 		total_microseconds
-			+= time_function("ParticleSystem", [&]() { particle_sys.update(); });
-		total_microseconds += time_function("RenderSystem", [&]() { render_sys.update(); });
+			+= time_function("ParticleSystem", [&]() { particle_sys.fixed_update(); });
+		total_microseconds += time_function("RenderSystem", [&]() { render_sys.frame_update(); });
 		return total_microseconds;
 	}
 
@@ -227,7 +227,7 @@ TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 				.sprite = test_sprite,
 			});
 		}
-		render_sys.update();
+		render_sys.frame_update();
 		this->game_object_count++;
 
 		this->total_time = 0us;
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index 205f534..b2c54b9 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -99,7 +99,7 @@ TEST_F(RenderSystemTest, expected_throws) {
 	});
 
 	// No camera
-	EXPECT_ANY_THROW({ this->sys.update(); });
+	EXPECT_ANY_THROW({ this->sys.frame_update(); });
 }
 
 TEST_F(RenderSystemTest, make_sprites) {}
@@ -153,7 +153,7 @@ TEST_F(RenderSystemTest, Update) {
 		EXPECT_EQ(sprites[2].get().game_object_id, 2);
 		EXPECT_EQ(sprites[3].get().game_object_id, 3);
 	}
-	this->sys.update();
+	this->sys.frame_update();
 	{
 		vector<reference_wrapper<Sprite>> sprites = this->mgr.get_components_by_type<Sprite>();
 		ASSERT_EQ(sprites.size(), 4);
@@ -192,7 +192,7 @@ TEST_F(RenderSystemTest, Color) {
 	EXPECT_EQ(sprite.data.color.g, Color::GREEN.g);
 	EXPECT_EQ(sprite.data.color.b, Color::GREEN.b);
 	EXPECT_EQ(sprite.data.color.a, Color::GREEN.a);
-	this->sys.update();
+	this->sys.frame_update();
 	EXPECT_EQ(sprite.data.color.r, Color::GREEN.r);
 	EXPECT_EQ(sprite.data.color.g, Color::GREEN.g);
 	EXPECT_EQ(sprite.data.color.b, Color::GREEN.b);
diff --git a/src/test/ReplayManagerTest.cpp b/src/test/ReplayManagerTest.cpp
new file mode 100644
index 0000000..aa5a766
--- /dev/null
+++ b/src/test/ReplayManagerTest.cpp
@@ -0,0 +1,36 @@
+#include <gtest/gtest.h>
+
+#include <crepe/manager/ReplayManager.h>
+#include <crepe/system/ReplaySystem.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/BehaviorScript.h>
+
+using namespace std;
+using namespace crepe;
+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();
+};
+
+TEST_F(ReplayManagerTest, Default) {
+	// replay_manager.record_start();
+
+	// replay_system.fixed_update();
+	// entity_transform.position += {1, 1};
+	// replay_system.fixed_update();
+	// entity_transform.position += {1, 1};
+	// replay_system.fixed_update();
+
+	// recording_t recording = replay_manager.record_end();
+}
+
diff --git a/src/test/ScriptEventTest.cpp b/src/test/ScriptEventTest.cpp
index c1b4028..479e3f5 100644
--- a/src/test/ScriptEventTest.cpp
+++ b/src/test/ScriptEventTest.cpp
@@ -37,7 +37,7 @@ TEST_F(ScriptEventTest, Default) {
 		return true;
 	});
 
-	system.update();
+	system.fixed_update();
 	behaviorscript.active = false;
 	EXPECT_EQ(0, event_count);
 
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index acdae70..ccf5060 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -39,7 +39,7 @@ TEST_F(ScriptTest, UpdateOnce) {
 
 		EXPECT_CALL(script, init()).Times(1);
 		EXPECT_CALL(script, update()).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 
 	{
@@ -47,7 +47,7 @@ TEST_F(ScriptTest, UpdateOnce) {
 
 		EXPECT_CALL(script, init()).Times(0);
 		EXPECT_CALL(script, update()).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
@@ -61,7 +61,7 @@ TEST_F(ScriptTest, UpdateInactive) {
 		EXPECT_CALL(script, init()).Times(0);
 		EXPECT_CALL(script, update()).Times(0);
 		behaviorscript.active = false;
-		system.update();
+		system.fixed_update();
 	}
 
 	{
@@ -70,6 +70,6 @@ TEST_F(ScriptTest, UpdateInactive) {
 		EXPECT_CALL(script, init()).Times(1);
 		EXPECT_CALL(script, update()).Times(1);
 		behaviorscript.active = true;
-		system.update();
+		system.fixed_update();
 	}
 }