From 3e94ecb3dac5003a3d58210ed1a4d1f1cb2083d1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Tue, 12 Nov 2024 22:43:32 +0100
Subject: add script unit tests + major refactoring

---
 src/crepe/system/System.cpp | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 src/crepe/system/System.cpp

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

diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
new file mode 100644
index 0000000..296f1ed
--- /dev/null
+++ b/src/crepe/system/System.cpp
@@ -0,0 +1,6 @@
+#include "System.h"
+
+using namespace crepe;
+
+System::System(ComponentManager & mgr) : component_manager(mgr) {}
+
-- 
cgit v1.2.3


From ec3601fbc17a38a44608a04f53d4e36c1bff8c96 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 13 Nov 2024 12:12:26 +0100
Subject: re-enable loop manager + remove more singletons

---
 src/crepe/api/CMakeLists.txt         |  4 ++--
 src/crepe/api/LoopManager.cpp        | 24 ++++++++++++++++++++---
 src/crepe/api/LoopManager.h          | 29 +++++++++++++++++----------
 src/crepe/api/LoopManager.hpp        | 38 ++++++++++++++++++++++++++++++++++++
 src/crepe/system/AnimatorSystem.cpp  | 12 +-----------
 src/crepe/system/AnimatorSystem.h    | 17 ++--------------
 src/crepe/system/CMakeLists.txt      | 12 ++++++------
 src/crepe/system/CollisionSystem.cpp |  3 +--
 src/crepe/system/CollisionSystem.h   |  8 +++++---
 src/crepe/system/RenderSystem.cpp    | 14 ++-----------
 src/crepe/system/RenderSystem.h      | 13 ++----------
 src/crepe/system/System.cpp          |  6 +++++-
 12 files changed, 104 insertions(+), 76 deletions(-)
 create mode 100644 src/crepe/api/LoopManager.hpp

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

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index ee77947..85696c4 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -18,7 +18,7 @@ target_sources(crepe PUBLIC
 	Vector2.cpp
 	Camera.cpp
 	Animator.cpp
-	# LoopManager.cpp
+	LoopManager.cpp
 	LoopTimer.cpp
 )
 
@@ -44,6 +44,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	SceneManager.hpp
 	Camera.h
 	Animator.h
-	# LoopManager.h
+	LoopManager.h
 	LoopTimer.h
 )
diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp
index 2e9823f..f0788ab 100644
--- a/src/crepe/api/LoopManager.cpp
+++ b/src/crepe/api/LoopManager.cpp
@@ -1,5 +1,9 @@
-
 #include "../facade/SDLContext.h"
+
+#include "../system/AnimatorSystem.h"
+#include "../system/CollisionSystem.h"
+#include "../system/ParticleSystem.h"
+#include "../system/PhysicsSystem.h"
 #include "../system/RenderSystem.h"
 #include "../system/ScriptSystem.h"
 
@@ -7,11 +11,25 @@
 #include "LoopTimer.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>();
+}
+
+ComponentManager & LoopManager::get_component_manager() {
+	return this->component_manager;
+}
 
-LoopManager::LoopManager() {}
 void LoopManager::process_input() {
 	SDLContext::get_instance().handle_events(this->game_running);
 }
+
 void LoopManager::start() {
 	this->setup();
 	this->loop();
@@ -48,7 +66,7 @@ void LoopManager::setup() {
 
 void LoopManager::render() {
 	if (this->game_running) {
-		RenderSystem::get_instance().update();
+		this->get_system<RenderSystem>().update();
 	}
 }
 
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 2f03193..ef1c14f 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,15 +2,9 @@
 
 #include <memory>
 
-class RenderSystem;
-class SDLContext;
-class LoopTimer;
-class ScriptSystem;
-class SoundSystem;
-class ParticleSystem;
-class PhysicsSystem;
-class AnimatorSystem;
-class CollisionSystem;
+#include "../system/System.h"
+#include "../ComponentManager.h"
+
 namespace crepe {
 
 class LoopManager {
@@ -73,7 +67,22 @@ private:
 	void render();
 
 	bool game_running = false;
-	//#TODO add system instances
+
+protected:
+	ComponentManager & get_component_manager();
+	template <class T>
+	T & get_system();
+
+private:
+	ComponentManager component_manager;
+	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
+
+private:
+	template <class T>
+	void load_system();
 };
 
 } // namespace crepe
+
+#include "LoopManager.hpp"
+
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
new file mode 100644
index 0000000..20e8d1c
--- /dev/null
+++ b/src/crepe/api/LoopManager.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <cassert>
+#include <memory>
+
+#include "../system/System.h"
+#include "../Exception.h"
+
+#include "LoopManager.h"
+
+namespace crepe {
+
+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 Exception("LoopManager: %s 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");
+
+	System * system = new T(this->component_manager);
+	this->systems[typeid(T)] = unique_ptr<System>(system);
+}
+
+} // namespace crepe
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index bf45362..9d18873 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -1,27 +1,17 @@
-
 #include <cstdint>
 #include <functional>
 #include <vector>
 
 #include "api/Animator.h"
 #include "facade/SDLContext.h"
-#include "util/log.h"
 
 #include "AnimatorSystem.h"
 #include "ComponentManager.h"
 
 using namespace crepe;
 
-AnimatorSystem::AnimatorSystem() { dbg_trace(); }
-AnimatorSystem::~AnimatorSystem() { dbg_trace(); }
-
-AnimatorSystem & AnimatorSystem::get_instance() {
-	static AnimatorSystem instance;
-	return instance;
-}
-
 void AnimatorSystem::update() {
-	ComponentManager & mgr = ComponentManager::get_instance();
+	ComponentManager & mgr = this->component_manager;
 
 	std::vector<std::reference_wrapper<Animator>> animations
 		= mgr.get_components_by_type<Animator>();
diff --git a/src/crepe/system/AnimatorSystem.h b/src/crepe/system/AnimatorSystem.h
index 969e9d1..aa97084 100644
--- a/src/crepe/system/AnimatorSystem.h
+++ b/src/crepe/system/AnimatorSystem.h
@@ -17,16 +17,7 @@ namespace crepe {
 class AnimatorSystem : public System {
 
 public:
-	/**
-	 * \brief Retrieves the singleton instance of the AnimatorSystem.
-	 *
-	 * \return A reference to the single instance of the AnimatorSystem.
-	 *
-	 * This method ensures that there is only one instance of the AnimatorSystem, following the
-	 * singleton design pattern. It can be used to access the system globally.
-	 */
-	static AnimatorSystem & get_instance();
-
+	using System::System;
 	/**
 	 * \brief Updates the Animator components.
 	 *
@@ -34,11 +25,7 @@ public:
 	 * Animator components, moving the animations forward and managing their behavior (e.g., looping).
 	 */
 	void update() override;
-
-private:
-	// private because singleton
-	AnimatorSystem(); // dbg_trace
-	~AnimatorSystem(); // dbg_trace
+	// FIXME: never say "likely" in the documentation lmao
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/CMakeLists.txt b/src/crepe/system/CMakeLists.txt
index 2fb58dc..d658b25 100644
--- a/src/crepe/system/CMakeLists.txt
+++ b/src/crepe/system/CMakeLists.txt
@@ -3,16 +3,16 @@ target_sources(crepe PUBLIC
 	ParticleSystem.cpp
 	ScriptSystem.cpp
 	PhysicsSystem.cpp
-	# CollisionSystem.cpp
-	# RenderSystem.cpp
-	# AnimatorSystem.cpp
+	CollisionSystem.cpp
+	RenderSystem.cpp
+	AnimatorSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	System.h
 	ScriptSystem.h
 	PhysicsSystem.h
-	# CollisionSystem.h
-	# RenderSystem.h
-	# AnimatorSystem.h
+	CollisionSystem.h
+	RenderSystem.h
+	AnimatorSystem.h
 )
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 55e0fdc..67f535a 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -2,6 +2,5 @@
 
 using namespace crepe;
 
-CollisionSystem::CollisionSystem() {}
-
 void CollisionSystem::update() {}
+
diff --git a/src/crepe/system/CollisionSystem.h b/src/crepe/system/CollisionSystem.h
index 1e9f1aa..c1a70d8 100644
--- a/src/crepe/system/CollisionSystem.h
+++ b/src/crepe/system/CollisionSystem.h
@@ -1,11 +1,13 @@
 #pragma once
 
+#include "System.h"
+
 namespace crepe {
 
-class CollisionSystem {
+class CollisionSystem : public System {
 public:
-	CollisionSystem();
-	void update();
+	using System::System;
+	void update() override;
 };
 
 } // namespace crepe
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 10211a3..3e6360c 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -11,15 +11,6 @@
 
 using namespace crepe;
 
-RenderSystem::RenderSystem() { dbg_trace(); }
-
-RenderSystem::~RenderSystem() { dbg_trace(); }
-
-RenderSystem & RenderSystem::get_instance() {
-	static RenderSystem instance;
-	return instance;
-}
-
 void RenderSystem::clear_screen() const {
 	SDLContext::get_instance().clear_screen();
 }
@@ -28,7 +19,7 @@ void RenderSystem::present_screen() const {
 	SDLContext::get_instance().present_screen();
 }
 void RenderSystem::update_camera() {
-	ComponentManager & mgr = ComponentManager::get_instance();
+	ComponentManager & mgr = this->component_manager;
 
 	std::vector<std::reference_wrapper<Camera>> cameras
 		= mgr.get_components_by_type<Camera>();
@@ -39,8 +30,7 @@ void RenderSystem::update_camera() {
 	}
 }
 void RenderSystem::render_sprites() const {
-
-	ComponentManager & mgr = ComponentManager::get_instance();
+	ComponentManager & mgr = this->component_manager;
 
 	std::vector<std::reference_wrapper<Sprite>> sprites
 		= mgr.get_components_by_type<Sprite>();
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 70db21a..da4e910 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -15,14 +15,8 @@ namespace crepe {
  * rendering services for the application.
  */
 class RenderSystem : public System {
-
 public:
-	/**
-	 * \brief Gets the singleton instance of RenderSystem.
-	 * \return Reference to the RenderSystem instance.
-	 */
-	static RenderSystem & get_instance();
-
+	using System::System;
 	/**
 	 * \brief Updates the RenderSystem for the current frame.
 	 * This method is called to perform all rendering operations for the current game frame.
@@ -30,10 +24,6 @@ public:
 	void update() override;
 
 private:
-	// Private constructor to enforce singleton pattern.
-	RenderSystem();
-	~RenderSystem();
-
 	//! Clears the screen in preparation for rendering.
 	void clear_screen() const;
 
@@ -61,4 +51,5 @@ private:
 	Camera * curr_cam = nullptr;
 	// TODO: needs a better solution
 };
+
 } // namespace crepe
diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
index 296f1ed..31b1337 100644
--- a/src/crepe/system/System.cpp
+++ b/src/crepe/system/System.cpp
@@ -1,6 +1,10 @@
+#include "../util/log.h"
+
 #include "System.h"
 
 using namespace crepe;
 
-System::System(ComponentManager & mgr) : component_manager(mgr) {}
+System::System(ComponentManager & mgr) : component_manager(mgr) {
+	dbg_trace();
+}
 
-- 
cgit v1.2.3


From 87c74782e486647c46f9ca4d2f857094006e563c Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 13 Nov 2024 12:19:56 +0100
Subject: `make format`

---
 src/crepe/Collider.cpp               |  1 -
 src/crepe/Component.cpp              |  1 -
 src/crepe/ComponentManager.cpp       |  9 ++++++---
 src/crepe/ComponentManager.h         |  7 +++++--
 src/crepe/api/Animator.cpp           |  3 ++-
 src/crepe/api/AssetManager.h         |  3 ++-
 src/crepe/api/BehaviorScript.cpp     |  5 +++--
 src/crepe/api/GameObject.cpp         |  9 +++++----
 src/crepe/api/GameObject.h           |  6 ++++--
 src/crepe/api/LoopManager.h          |  5 ++---
 src/crepe/api/LoopManager.hpp        | 10 ++++++----
 src/crepe/api/SceneManager.cpp       | 10 +++++-----
 src/crepe/api/Script.cpp             |  1 -
 src/crepe/api/Script.h               |  1 -
 src/crepe/api/Transform.h            |  2 +-
 src/crepe/api/Vector2.cpp            |  1 -
 src/crepe/facade/SDLContext.cpp      |  2 +-
 src/crepe/facade/Sound.cpp           |  3 +--
 src/crepe/facade/SoundContext.cpp    |  1 -
 src/crepe/facade/SoundContext.h      |  8 ++++----
 src/crepe/system/CollisionSystem.cpp |  1 -
 src/crepe/system/ParticleSystem.cpp  |  1 -
 src/crepe/system/ScriptSystem.cpp    |  1 -
 src/crepe/system/System.cpp          |  5 +----
 src/example/rendering.cpp            |  6 ++++--
 src/example/script.cpp               |  4 ++--
 src/test/PhysicsTest.cpp             | 11 +++++++----
 src/test/ScriptTest.cpp              |  9 ++++-----
 src/test/main.cpp                    |  6 +++---
 29 files changed, 68 insertions(+), 64 deletions(-)

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

diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp
index b408609..113ba61 100644
--- a/src/crepe/Collider.cpp
+++ b/src/crepe/Collider.cpp
@@ -1,4 +1,3 @@
 #include "Collider.h"
 
 using namespace crepe;
-
diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index d11a37e..acfd35c 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -3,4 +3,3 @@
 using namespace crepe;
 
 Component::Component(game_object_id_t id) : game_object_id(id) {}
-
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index f6acc1a..8f8437b 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -25,10 +25,13 @@ void ComponentManager::delete_all_components() {
 ComponentManager::ComponentManager() { dbg_trace(); }
 ComponentManager::~ComponentManager() { dbg_trace(); }
 
-GameObject & ComponentManager::new_object(const string & name, const string & tag, const Vector2 & position, double rotation, double scale) {
-	GameObject * object = new GameObject(*this, this->next_id, name, tag, position, rotation, scale);
+GameObject & ComponentManager::new_object(const string & name,
+										  const string & tag,
+										  const Vector2 & position,
+										  double rotation, double scale) {
+	GameObject * object = new GameObject(*this, this->next_id, name, tag,
+										 position, rotation, scale);
 	this->objects.push_front(unique_ptr<GameObject>(object));
 	this->next_id++;
 	return *object;
 }
-
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index 1d67e69..75606e0 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <forward_list>
 #include <memory>
 #include <typeindex>
 #include <unordered_map>
 #include <vector>
-#include <forward_list>
 
 #include "Component.h"
 #include "api/Vector2.h"
@@ -101,7 +101,10 @@ public:
 	std::vector<std::reference_wrapper<T>> get_components_by_type() const;
 
 	// TODO: doxygen
-	GameObject & new_object(const std::string & name, const std::string & tag = "", const Vector2 & position = { 0, 0 }, double rotation = 0, double scale = 0);
+	GameObject & new_object(const std::string & name,
+							const std::string & tag = "",
+							const Vector2 & position = {0, 0},
+							double rotation = 0, double scale = 0);
 
 private:
 	/**
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index cbf415d..fcc07ef 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -9,7 +9,8 @@
 
 using namespace crepe;
 
-Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_animator)
+Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col,
+				   int col_animator)
 	: Component(id),
 	  spritesheet(ss),
 	  row(row),
diff --git a/src/crepe/api/AssetManager.h b/src/crepe/api/AssetManager.h
index dbfaef3..86a9902 100644
--- a/src/crepe/api/AssetManager.h
+++ b/src/crepe/api/AssetManager.h
@@ -56,7 +56,8 @@ public:
 	 * cache.
 	 */
 	template <typename T>
-	std::shared_ptr<T> cache(const std::string & file_path, bool reload = false);
+	std::shared_ptr<T> cache(const std::string & file_path,
+							 bool reload = false);
 };
 
 } // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 41c144c..c5fecef 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -3,5 +3,6 @@
 
 using namespace crepe;
 
-BehaviorScript::BehaviorScript(game_object_id_t id, ComponentManager & mgr) : Component(id), component_manager(mgr) {}
-
+BehaviorScript::BehaviorScript(game_object_id_t id, ComponentManager & mgr)
+	: Component(id),
+	  component_manager(mgr) {}
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
index dd20b7f..e05cea1 100644
--- a/src/crepe/api/GameObject.cpp
+++ b/src/crepe/api/GameObject.cpp
@@ -1,16 +1,18 @@
 #include "api/Transform.h"
 
+#include "BehaviorScript.h"
 #include "GameObject.h"
 #include "Metadata.h"
-#include "BehaviorScript.h"
 
 using namespace crepe;
 using namespace std;
 
-GameObject::GameObject(ComponentManager & component_manager, game_object_id_t id, const std::string & name,
+GameObject::GameObject(ComponentManager & component_manager,
+					   game_object_id_t id, const std::string & name,
 					   const std::string & tag, const Vector2 & position,
 					   double rotation, double scale)
-	: id(id), component_manager(component_manager) {
+	: id(id),
+	  component_manager(component_manager) {
 
 	// Add Transform and Metadata components
 	ComponentManager & mgr = this->component_manager;
@@ -37,4 +39,3 @@ BehaviorScript & GameObject::add_component<BehaviorScript>() {
 	ComponentManager & mgr = this->component_manager;
 	return mgr.add_component<BehaviorScript>(this->id, mgr);
 }
-
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
index 7751fd0..e4a2539 100644
--- a/src/crepe/api/GameObject.h
+++ b/src/crepe/api/GameObject.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "types.h"
 #include "Vector2.h"
+#include "types.h"
 
 namespace crepe {
 
@@ -31,7 +31,9 @@ private:
 	 * \param rotation The rotation of the GameObject
 	 * \param scale The scale of the GameObject
 	 */
-	GameObject(ComponentManager & component_manager, game_object_id_t id, const std::string & name, const std::string & tag, const Vector2 & position, double rotation, double scale);
+	GameObject(ComponentManager & component_manager, game_object_id_t id,
+			   const std::string & name, const std::string & tag,
+			   const Vector2 & position, double rotation, double scale);
 	//! ComponentManager instances GameObject
 	friend class ComponentManager;
 
diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index ef1c14f..288dca2 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "../system/System.h"
 #include "../ComponentManager.h"
+#include "../system/System.h"
 
 namespace crepe {
 
@@ -74,7 +74,7 @@ protected:
 	T & get_system();
 
 private:
-	ComponentManager component_manager;
+	ComponentManager component_manager{};
 	std::unordered_map<std::type_index, std::unique_ptr<System>> systems;
 
 private:
@@ -85,4 +85,3 @@ private:
 } // namespace crepe
 
 #include "LoopManager.hpp"
-
diff --git a/src/crepe/api/LoopManager.hpp b/src/crepe/api/LoopManager.hpp
index 20e8d1c..8fb9aa3 100644
--- a/src/crepe/api/LoopManager.hpp
+++ b/src/crepe/api/LoopManager.hpp
@@ -3,8 +3,8 @@
 #include <cassert>
 #include <memory>
 
-#include "../system/System.h"
 #include "../Exception.h"
+#include "../system/System.h"
 
 #include "LoopManager.h"
 
@@ -13,8 +13,9 @@ namespace crepe {
 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");
-	
+	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 Exception("LoopManager: %s is not initialized", type.name());
@@ -29,7 +30,8 @@ T & LoopManager::get_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");
+	static_assert(is_base_of<System, T>::value,
+				  "load_system must recieve a derivative class of System");
 
 	System * system = new T(this->component_manager);
 	this->systems[typeid(T)] = unique_ptr<System>(system);
diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
index 814b7d7..4a38787 100644
--- a/src/crepe/api/SceneManager.cpp
+++ b/src/crepe/api/SceneManager.cpp
@@ -16,11 +16,11 @@ void SceneManager::load_next_scene() {
 	// next scene not set
 	if (this->next_scene.empty()) return;
 
-	auto it = find_if(this->scenes.begin(), this->scenes.end(),
-		[&next_scene = this->next_scene](unique_ptr<Scene> & scene) {
-			return scene->name == next_scene;
-		}
-	);
+	auto it
+		= find_if(this->scenes.begin(), this->scenes.end(),
+				  [&next_scene = this->next_scene](unique_ptr<Scene> & scene) {
+					  return scene->name == next_scene;
+				  });
 
 	// next scene not found
 	if (it == this->scenes.end()) return;
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 0423315..390cec7 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,4 +1,3 @@
 #include "Script.h"
 
 using namespace crepe;
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index c5e3cc4..837420f 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -49,4 +49,3 @@ private:
 } // namespace crepe
 
 #include "Script.hpp"
-
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index a1ef406..902dafa 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -15,7 +15,7 @@ namespace crepe {
 class Transform : public Component {
 public:
 	//! Translation (shift)
-	Vector2 position = { 0, 0 };
+	Vector2 position = {0, 0};
 	//! Rotation, in degrees
 	double rotation = 0;
 	//! Multiplication factor
diff --git a/src/crepe/api/Vector2.cpp b/src/crepe/api/Vector2.cpp
index aa391fa..7da202a 100644
--- a/src/crepe/api/Vector2.cpp
+++ b/src/crepe/api/Vector2.cpp
@@ -41,4 +41,3 @@ bool Vector2::operator==(const Vector2 & other) const {
 bool Vector2::operator!=(const Vector2 & other) const {
 	return !(*this == other);
 }
-
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index 46230b4..236bf8c 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -159,7 +159,7 @@ SDLContext::texture_from_path(const std::string & path) {
 
 	SDL_Surface * tmp = IMG_Load(path.c_str());
 	if (tmp == nullptr) {
-		tmp = IMG_Load("../asset/texture/ERROR.png");	
+		tmp = IMG_Load("../asset/texture/ERROR.png");
 	}
 
 	std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>>
diff --git a/src/crepe/facade/Sound.cpp b/src/crepe/facade/Sound.cpp
index 3a6e1e1..b8ea71a 100644
--- a/src/crepe/facade/Sound.cpp
+++ b/src/crepe/facade/Sound.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 
-#include "../util/log.h"
 #include "../Asset.h"
+#include "../util/log.h"
 
 #include "Sound.h"
 #include "SoundContext.h"
@@ -56,4 +56,3 @@ void Sound::set_looping(bool looping) {
 	if (!ctx.engine.isValidVoiceHandle(this->handle)) return;
 	ctx.engine.setLooping(this->handle, this->looping);
 }
-
diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp
index c89fb03..b5f3db3 100644
--- a/src/crepe/facade/SoundContext.cpp
+++ b/src/crepe/facade/SoundContext.cpp
@@ -13,4 +13,3 @@ SoundContext::~SoundContext() {
 	dbg_trace();
 	engine.deinit();
 }
-
diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h
index c360fb8..8d9e396 100644
--- a/src/crepe/facade/SoundContext.h
+++ b/src/crepe/facade/SoundContext.h
@@ -11,10 +11,10 @@ public:
 	SoundContext();
 	virtual ~SoundContext();
 
-  SoundContext(const SoundContext &) = delete;
-  SoundContext(SoundContext &&) = delete;
-  SoundContext & operator=(const SoundContext &) = delete;
-  SoundContext & operator=(SoundContext &&) = delete;
+	SoundContext(const SoundContext &) = delete;
+	SoundContext(SoundContext &&) = delete;
+	SoundContext & operator=(const SoundContext &) = delete;
+	SoundContext & operator=(SoundContext &&) = delete;
 
 private:
 	SoLoud::Soloud engine;
diff --git a/src/crepe/system/CollisionSystem.cpp b/src/crepe/system/CollisionSystem.cpp
index 67f535a..c74ca1d 100644
--- a/src/crepe/system/CollisionSystem.cpp
+++ b/src/crepe/system/CollisionSystem.cpp
@@ -3,4 +3,3 @@
 using namespace crepe;
 
 void CollisionSystem::update() {}
-
diff --git a/src/crepe/system/ParticleSystem.cpp b/src/crepe/system/ParticleSystem.cpp
index 64fee4e..fe02682 100644
--- a/src/crepe/system/ParticleSystem.cpp
+++ b/src/crepe/system/ParticleSystem.cpp
@@ -58,4 +58,3 @@ void ParticleSystem::emit_particle(ParticleEmitter & emitter) {
 		}
 	}
 }
-
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index 0a87fcc..644e96e 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -44,4 +44,3 @@ forward_list<reference_wrapper<Script>> ScriptSystem::get_scripts() {
 
 	return scripts;
 }
-
diff --git a/src/crepe/system/System.cpp b/src/crepe/system/System.cpp
index 31b1337..201b9ad 100644
--- a/src/crepe/system/System.cpp
+++ b/src/crepe/system/System.cpp
@@ -4,7 +4,4 @@
 
 using namespace crepe;
 
-System::System(ComponentManager & mgr) : component_manager(mgr) {
-	dbg_trace();
-}
-
+System::System(ComponentManager & mgr) : component_manager(mgr) { dbg_trace(); }
diff --git a/src/example/rendering.cpp b/src/example/rendering.cpp
index e02f6a3..493169b 100644
--- a/src/example/rendering.cpp
+++ b/src/example/rendering.cpp
@@ -34,7 +34,9 @@ int main() {
 	}
 	{
 		Color color(0, 0, 0, 0);
-		obj1.add_component<Sprite>(make_shared<Texture>("../asset/texture/second.png"), color, FlipSettings{true, true});
+		obj1.add_component<Sprite>(
+			make_shared<Texture>("../asset/texture/second.png"), color,
+			FlipSettings{true, true});
 	}
 
 	/*
@@ -45,7 +47,7 @@ int main() {
 	}
 	*/
 
-	auto & sys = crepe::RenderSystem::get_instance();
+	auto & sys = crepe::AssetManager::get_instance();
 	auto start = std::chrono::steady_clock::now();
 	while (std::chrono::steady_clock::now() - start < std::chrono::seconds(5)) {
 		sys.update();
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 4ba2b4b..69d1ce1 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -35,8 +35,8 @@ class MyScript : public Script {
 };
 
 int main() {
-	ComponentManager component_manager {};
-	ScriptSystem system { component_manager };
+	ComponentManager component_manager{};
+	ScriptSystem system{component_manager};
 
 	// Create game object with Transform and BehaviorScript components
 	auto & obj = component_manager.new_object("name");
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 5399d54..9ac99aa 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -13,7 +13,7 @@ using namespace crepe;
 class PhysicsTest : public ::testing::Test {
 public:
 	ComponentManager component_manager;
-	PhysicsSystem system { component_manager };
+	PhysicsSystem system{component_manager};
 
 	void SetUp() override {
 		ComponentManager & mgr = this->component_manager;
@@ -49,7 +49,8 @@ public:
 TEST_F(PhysicsTest, gravity) {
 	Config::get_instance().physics.gravity = 1;
 	ComponentManager & mgr = this->component_manager;
-	vector<reference_wrapper<Transform>> transforms = mgr.get_components_by_id<Transform>(0);
+	vector<reference_wrapper<Transform>> transforms
+		= mgr.get_components_by_id<Transform>(0);
 	const Transform & transform = transforms.front().get();
 	ASSERT_FALSE(transforms.empty());
 	EXPECT_EQ(transform.position.y, 0);
@@ -87,9 +88,11 @@ TEST_F(PhysicsTest, max_velocity) {
 TEST_F(PhysicsTest, movement) {
 	Config::get_instance().physics.gravity = 0;
 	ComponentManager & mgr = this->component_manager;
-	vector<reference_wrapper<Rigidbody>> rigidbodies = mgr.get_components_by_id<Rigidbody>(0);
+	vector<reference_wrapper<Rigidbody>> rigidbodies
+		= mgr.get_components_by_id<Rigidbody>(0);
 	Rigidbody & rigidbody = rigidbodies.front().get();
-	vector<reference_wrapper<Transform>> transforms = mgr.get_components_by_id<Transform>(0);
+	vector<reference_wrapper<Transform>> transforms
+		= mgr.get_components_by_id<Transform>(0);
 	const Transform & transform = transforms.front().get();
 	ASSERT_FALSE(rigidbodies.empty());
 	ASSERT_FALSE(transforms.empty());
diff --git a/src/test/ScriptTest.cpp b/src/test/ScriptTest.cpp
index ea49a35..bab9e52 100644
--- a/src/test/ScriptTest.cpp
+++ b/src/test/ScriptTest.cpp
@@ -5,11 +5,11 @@
 #define protected public
 
 #include <crepe/ComponentManager.h>
-#include <crepe/system/ScriptSystem.h>
 #include <crepe/api/BehaviorScript.h>
-#include <crepe/api/Script.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/api/Script.h>
 #include <crepe/api/Vector2.h>
+#include <crepe/system/ScriptSystem.h>
 
 using namespace std;
 using namespace crepe;
@@ -17,8 +17,8 @@ using namespace testing;
 
 class ScriptTest : public Test {
 public:
-	ComponentManager component_manager {};
-	ScriptSystem system { component_manager };
+	ComponentManager component_manager{};
+	ScriptSystem system{component_manager};
 
 	class MyScript : public Script {
 		// NOTE: default (private) visibility of init and update shouldn't cause
@@ -70,4 +70,3 @@ TEST_F(ScriptTest, ListScripts) {
 	}
 	ASSERT_EQ(1, script_count);
 }
-
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 6830a01..a54d239 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -5,11 +5,11 @@
 using namespace crepe;
 using namespace testing;
 
-int main(int argc, char **argv) {
-  InitGoogleTest(&argc, argv);
+int main(int argc, char ** argv) {
+	InitGoogleTest(&argc, argv);
 
 	auto & cfg = Config::get_instance();
 	cfg.log.level = LogLevel::ERROR;
 
-  return RUN_ALL_TESTS();
+	return RUN_ALL_TESTS();
 }
-- 
cgit v1.2.3