From f9aa198eef7b85eeba3bac4c4fe2d4578b836bbf Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 13 Oct 2024 20:52:08 +0200
Subject: WIP behavior script (problems)

---
 src/example/script.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/src/example/script.cpp b/src/example/script.cpp
index 28605c7..b8b3c8d 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -11,9 +11,10 @@
 #include <crepe/api/BehaviorScript.h>
 
 using namespace crepe;
+using namespace crepe::api;
 using namespace std;
 
-class MyScript : public api::BehaviorScript {
+class MyScript : public BehaviorScript {
 	void update() {
 		dbg_trace();
 	}
-- 
cgit v1.2.3


From d21afe5b33b4cb3f5cf1917f4d15f402de41a032 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 16 Oct 2024 17:05:46 +0200
Subject: Make format

---
 mwe/ecs-homemade/inc/ComponentManager.h   |  27 +++---
 mwe/ecs-homemade/inc/ComponentManager.hpp | 144 ++++++++++++++++--------------
 mwe/ecs-homemade/inc/Components.h         |   6 +-
 mwe/ecs-homemade/inc/Components.hpp       |  10 +--
 mwe/ecs-homemade/inc/GameObjectMax.h      |   2 +-
 mwe/ecs-homemade/inc/GameObjectMax.hpp    |   2 +-
 mwe/ecs-homemade/src/Components.cpp       |   4 +-
 mwe/ecs-homemade/src/main.cpp             |  11 +--
 src/crepe/ComponentManager.hpp            |   3 +-
 src/crepe/Script.cpp                      |   5 +-
 src/crepe/Script.h                        |   3 +-
 src/crepe/ScriptSystem.cpp                |  13 +--
 src/crepe/ScriptSystem.h                  |   3 +-
 src/crepe/System.h                        |   7 +-
 src/crepe/api/BehaviorScript.cpp          |   5 +-
 src/crepe/api/BehaviorScript.h            |   5 +-
 src/example/script.cpp                    |   9 +-
 17 files changed, 124 insertions(+), 135 deletions(-)

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

diff --git a/mwe/ecs-homemade/inc/ComponentManager.h b/mwe/ecs-homemade/inc/ComponentManager.h
index 2cdbb66..0ba358e 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.h
+++ b/mwe/ecs-homemade/inc/ComponentManager.h
@@ -17,24 +17,27 @@ public:
 	ComponentManager & operator=(const ComponentManager &) = delete; //Singleton
 	ComponentManager & operator=(ComponentManager &&) = delete; //Singleton
 
+	//Add a component of a specific type
 	template <typename T, typename... Args>
-	T& AddComponent(std::uint32_t id,
-					  Args &&... args); //Add a component of a specific type
+	T & AddComponent(std::uint32_t id, Args &&... args);
+	//Deletes all components of a specific type and id
 	template <typename T>
-	void DeleteComponentsById(
-		std::uint32_t id); //Deletes all components of a specific type and id
+	void DeleteComponentsById(std::uint32_t id);
+	//Deletes all components of a specific type
 	template <typename T>
-	void DeleteComponents(); //Deletes all components of a specific type
-	void DeleteAllComponentsOfId(
-		std::uint32_t id); //Deletes all components of a specific id
-	void DeleteAllComponents(); //Deletes all components
+	void DeleteComponents();
+	//Deletes all components of a specific id
+	void DeleteAllComponentsOfId(std::uint32_t id);
+	//Deletes all components
+	void DeleteAllComponents();
 
+	//Get a vector<> of all components at specific type and id
 	template <typename T>
-	std::vector<std::reference_wrapper<T>> GetComponentsByID(std::uint32_t id)
-		const; //Get a vector<> of all components at specific type and id
+	std::vector<std::reference_wrapper<T>>
+	GetComponentsByID(std::uint32_t id) const;
+	//Get a vector<> of all components of a specific type
 	template <typename T>
-	std::vector<std::reference_wrapper<T>> GetComponentsByType()
-		const; //Get a vector<> of all components of a specific type
+	std::vector<std::reference_wrapper<T>> GetComponentsByType() const;
 
 private:
 	static ComponentManager mInstance; //Singleton
diff --git a/mwe/ecs-homemade/inc/ComponentManager.hpp b/mwe/ecs-homemade/inc/ComponentManager.hpp
index a120ab1..92db1d4 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.hpp
+++ b/mwe/ecs-homemade/inc/ComponentManager.hpp
@@ -1,123 +1,128 @@
 
 template <typename T, typename... Args>
-T& ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
-
-	if (mComponents.find(type)
-		== mComponents
-			   .end()) { //Check if this component type is already in the unordered_map<>
-		mComponents[type] = std::vector<std::vector<std::unique_ptr<
-			Component>>>(); //If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+T & ComponentManager::AddComponent(std::uint32_t id, Args &&... args) {
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	//Check if this component type is already in the unordered_map<>
+	if (mComponents.find(type) == mComponents.end()) {
+		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+		mComponents[type]
+			= std::vector<std::vector<std::unique_ptr<Component>>>();
 	}
 
-	if (id
-		>= mComponents[type]
-			   .size()) { //Resize the vector<> if the id is greater than the current size
-		mComponents[type].resize(
-			id
-			+ 1); //Initialize new slots to nullptr (resize does automatically init to nullptr)
+	//Resize the vector<> if the id is greater than the current size
+	if (id >= mComponents[type].size()) {
+		//Initialize new slots to nullptr (resize does automatically init to nullptr)
+		mComponents[type].resize(id + 1);
 	}
 
-	mComponents[type][id].push_back(std::make_unique<T>(std::forward<Args>(
-		args)...)); //Create a new component of type T using perfect forwarding and store its unique_ptr in the vector<>
+	//Create a new component of type T using perfect forwarding and store its unique_ptr in the vector<>
+	mComponents[type][id].push_back(
+		std::make_unique<T>(std::forward<Args>(args)...));
 
-	return static_cast<T&>(*mComponents[type][id].back().get());
+	return static_cast<T &>(*mComponents[type][id].back().get());
 }
 
 template <typename T>
 void ComponentManager::DeleteComponentsById(std::uint32_t id) {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
+		//Get the correct vector<>
 		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray
-			= mComponents[type]; //Get the correct vector<>
+			= mComponents[type];
 
-		if (id
-			< componentArray
-				  .size()) { //Make sure that the id (that we are looking for) is within the boundaries of the vector<>
-			componentArray[id]
-				.clear(); //Clear the whole vector<> of this specific type and id
+		//Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < componentArray.size()) {
+			//Clear the whole vector<> of this specific type and id
+			componentArray[id].clear();
 		}
 	}
 }
 
 template <typename T>
 void ComponentManager::DeleteComponents() {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
-		mComponents[type]
-			.clear(); //Clear the whole vector<> of this specific type
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
+		//Clear the whole vector<> of this specific type
+		mComponents[type].clear();
 	}
 }
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
 ComponentManager::GetComponentsByID(std::uint32_t id) const {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	std::vector<std::reference_wrapper<T>>
-		componentVector; //Create an empty vector<>
+	//Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
 
+		//Get the correct vector<>
 		const std::vector<std::vector<std::unique_ptr<Component>>> &
 			componentArray
-			= mComponents.at(type); //Get the correct vector<>
+			= mComponents.at(type);
 
-		if (id
-			< componentArray
-				  .size()) { //Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		//Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < componentArray.size()) {
+			//Loop trough the whole vector<>
 			for (const std::unique_ptr<Component> & componentPtr :
-				 componentArray[id]) { //Loop trough the whole vector<>
-				T * castedComponent = static_cast<T *>(
-					componentPtr.get()); //Cast the unique_ptr to a raw pointer
-
-				if (castedComponent) { //Ensure that the cast was successful
-					componentVector.push_back(
-						*castedComponent); //Add the dereferenced raw pointer to the vector<>
+				 componentArray[id]) {
+				//Cast the unique_ptr to a raw pointer
+				T * castedComponent = static_cast<T *>(componentPtr.get());
+
+				//Ensure that the cast was successful
+				if (castedComponent) {
+					//Add the dereferenced raw pointer to the vector<>
+					componentVector.push_back(*castedComponent);
 				}
 			}
 		}
 	}
 
-	return componentVector; //Return the vector<>
+	//Return the vector<>
+	return componentVector;
 }
 
 template <typename T>
 std::vector<std::reference_wrapper<T>>
 ComponentManager::GetComponentsByType() const {
-	std::type_index type = typeid(
-		T); //Determine the type of T (this is used as the key of the unordered_map<>)
+	//Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
 
-	std::vector<std::reference_wrapper<T>>
-		componentVector; //Create an empty vector<>
+	//Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
 	//std::uint32_t id = 0;	//Set the id to 0 (the id will also be stored in the returned vector<>)
 
-	if (mComponents.find(type)
-		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+	//Find the type (in the unordered_map<>)
+	if (mComponents.find(type) != mComponents.end()) {
 
+		//Get the correct vector<>
 		const std::vector<std::vector<std::unique_ptr<Component>>> &
 			componentArray
-			= mComponents.at(type); //Get the correct vector<>
+			= mComponents.at(type);
 
+		//Loop through the whole vector<>
 		for (const std::vector<std::unique_ptr<Component>> & component :
-			 componentArray) { //Loop through the whole vector<>
-			for (const std::unique_ptr<Component> & componentPtr :
-				 component) { //Loop trough the whole vector<>
-				T * castedComponent = static_cast<T *>(
-					componentPtr.get()); //Cast the unique_ptr to a raw pointer
-
-				if (castedComponent) { //Ensure that the cast was successful
-					componentVector.emplace_back(std::ref(
-						*castedComponent)); //Pair the dereferenced raw pointer and the id and add it to the vector<>
+			 componentArray) {
+			//Loop trough the whole vector<>
+			for (const std::unique_ptr<Component> & componentPtr : component) {
+				//Cast the unique_ptr to a raw pointer
+				T * castedComponent = static_cast<T *>(componentPtr.get());
+
+				//Ensure that the cast was successful
+				if (castedComponent) {
+					//Pair the dereferenced raw pointer and the id and add it to the vector<>
+					componentVector.emplace_back(std::ref(*castedComponent));
 				}
 			}
 
@@ -125,5 +130,6 @@ ComponentManager::GetComponentsByType() const {
 		}
 	}
 
-	return componentVector; //Return the vector<>
+	//Return the vector<>
+	return componentVector;
 }
diff --git a/mwe/ecs-homemade/inc/Components.h b/mwe/ecs-homemade/inc/Components.h
index b392fd0..ad491e7 100644
--- a/mwe/ecs-homemade/inc/Components.h
+++ b/mwe/ecs-homemade/inc/Components.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <memory>
+#include <string>
 
 class Component {
 public:
@@ -40,7 +40,7 @@ public:
 	virtual void onUpdate() = 0;
 };
 
-template<typename T>
+template <typename T>
 class BehaviourWrapper : public IBehaviour {
 public:
 	BehaviourWrapper();
@@ -53,7 +53,7 @@ private:
 
 class BehaviourScript : public Component {
 public:
-	template<typename T>
+	template <typename T>
 	void addScript();
 
 	void onStart();
diff --git a/mwe/ecs-homemade/inc/Components.hpp b/mwe/ecs-homemade/inc/Components.hpp
index 85da5a5..436a28c 100644
--- a/mwe/ecs-homemade/inc/Components.hpp
+++ b/mwe/ecs-homemade/inc/Components.hpp
@@ -1,20 +1,20 @@
 #include "Components.h"
 #include <iostream>
 
-template<typename T>
-BehaviourWrapper<T>::BehaviourWrapper()  : instance() {}
+template <typename T>
+BehaviourWrapper<T>::BehaviourWrapper() : instance() {}
 
-template<typename T>
+template <typename T>
 void BehaviourWrapper<T>::onStart() {
 	instance.onStart();
 }
 
-template<typename T>
+template <typename T>
 void BehaviourWrapper<T>::onUpdate() {
 	instance.onUpdate();
 }
 
-template<typename T>
+template <typename T>
 void BehaviourScript::addScript() {
 	behaviour = std::make_unique<BehaviourWrapper<T>>();
 }
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.h b/mwe/ecs-homemade/inc/GameObjectMax.h
index c6af50a..5fab44a 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.h
+++ b/mwe/ecs-homemade/inc/GameObjectMax.h
@@ -8,7 +8,7 @@ public:
 	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
 
 	template <typename T, typename... Args>
-	T& AddComponent(Args &&... args);
+	T & AddComponent(Args &&... args);
 
 	std::uint32_t mId;
 	std::string mName;
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.hpp b/mwe/ecs-homemade/inc/GameObjectMax.hpp
index 4104589..2f433bb 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.hpp
+++ b/mwe/ecs-homemade/inc/GameObjectMax.hpp
@@ -1,7 +1,7 @@
 #include "ComponentManager.h"
 
 template <typename T, typename... Args>
-T& GameObject::AddComponent(Args &&... args) {
+T & GameObject::AddComponent(Args &&... args) {
 	return ComponentManager::GetInstance().AddComponent<T>(
 		mId, std::forward<Args>(args)...);
 }
diff --git a/mwe/ecs-homemade/src/Components.cpp b/mwe/ecs-homemade/src/Components.cpp
index e6a4673..de8753e 100644
--- a/mwe/ecs-homemade/src/Components.cpp
+++ b/mwe/ecs-homemade/src/Components.cpp
@@ -11,13 +11,13 @@ Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
 Colider::Colider(int size) : mSize(size) {}
 
 void BehaviourScript::onStart() {
-	if(behaviour) {
+	if (behaviour) {
 		behaviour->onStart();
 	}
 }
 
 void BehaviourScript::onUpdate() {
-	if(behaviour) {
+	if (behaviour) {
 		behaviour->onUpdate();
 	}
 }
diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index e4a8bda..70c5d2c 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -9,13 +9,9 @@
 
 class myScript {
 public:
-	void onStart() {
-		std::cout << "In onStart" << std::endl;
-	}
+	void onStart() { std::cout << "In onStart" << std::endl; }
 
-	void onUpdate() {
-		std::cout << "In onUpdate" << std::endl;
-	}
+	void onUpdate() { std::cout << "In onUpdate" << std::endl; }
 };
 
 int main() {
@@ -57,7 +53,8 @@ int main() {
 	}
 
 	std::vector<std::reference_wrapper<BehaviourScript>> scripts
-		= ComponentManager::GetInstance().GetComponentsByType<BehaviourScript>();
+		= ComponentManager::GetInstance()
+			  .GetComponentsByType<BehaviourScript>();
 	for (BehaviourScript & script : scripts) {
 		//script.onStart();
 		//script.onUpdate();
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 084cd33..2ea0c70 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -10,7 +10,8 @@ template <class T, typename... Args>
 void ComponentManager::add_component(uint32_t id, Args &&... args) {
 	using namespace std;
 
-	static_assert(is_base_of<Component, T>::value, "add_component must recieve a derivative class of Component");
+	static_assert(is_base_of<Component, T>::value,
+				  "add_component must recieve a derivative class of Component");
 
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	type_index type = typeid(T);
diff --git a/src/crepe/Script.cpp b/src/crepe/Script.cpp
index 42e3666..3b83b7c 100644
--- a/src/crepe/Script.cpp
+++ b/src/crepe/Script.cpp
@@ -2,6 +2,5 @@
 
 using namespace crepe;
 
-void Script::init() { }
-void Script::update() { }
-
+void Script::init() {}
+void Script::update() {}
diff --git a/src/crepe/Script.h b/src/crepe/Script.h
index ba4073a..cdd6814 100644
--- a/src/crepe/Script.h
+++ b/src/crepe/Script.h
@@ -12,5 +12,4 @@ protected:
 	// added event.
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e301c71..988bb71 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -4,19 +4,12 @@
 
 using namespace crepe;
 
-ScriptSystem::ScriptSystem() {
-	dbg_trace();
-}
-ScriptSystem::~ScriptSystem() {
-	dbg_trace();
-}
+ScriptSystem::ScriptSystem() { dbg_trace(); }
+ScriptSystem::~ScriptSystem() { dbg_trace(); }
 
 ScriptSystem & ScriptSystem::get_instance() {
 	static ScriptSystem instance;
 	return instance;
 }
 
-void ScriptSystem::update() {
-	dbg_trace();
-}
-
+void ScriptSystem::update() { dbg_trace(); }
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e1ed290..72e360b 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -14,5 +14,4 @@ private:
 	~ScriptSystem();
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/System.h b/src/crepe/System.h
index 3fe3d66..8744920 100644
--- a/src/crepe/System.h
+++ b/src/crepe/System.h
@@ -8,8 +8,8 @@ public:
 	virtual void update() = 0;
 
 protected:
-	System() { };
-	virtual ~System() { };
+	System(){};
+	virtual ~System(){};
 
 private:
 	// singleton
@@ -19,5 +19,4 @@ private:
 	System & operator=(System &&) = delete;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 2dd933e..84bfd4c 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -4,7 +4,4 @@
 
 using namespace crepe::api;
 
-BehaviorScript::BehaviorScript() {
-	dbg_trace();
-}
-
+BehaviorScript::BehaviorScript() { dbg_trace(); }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index e9542c1..1d05a75 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../Script.h"
 #include "../Component.h"
+#include "../Script.h"
 
 namespace crepe::api {
 
@@ -13,5 +13,4 @@ protected:
 	BehaviorScript();
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 28605c7..a610b83 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -3,10 +3,10 @@
  * Standalone example for usage of the script component and system
  */
 
-#include <crepe/util/log.h>
-#include <crepe/ScriptSystem.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/GameObject.h>
+#include <crepe/ScriptSystem.h>
+#include <crepe/util/log.h>
 
 #include <crepe/api/BehaviorScript.h>
 
@@ -14,9 +14,7 @@ using namespace crepe;
 using namespace std;
 
 class MyScript : public api::BehaviorScript {
-	void update() {
-		dbg_trace();
-	}
+	void update() { dbg_trace(); }
 };
 
 int main() {
@@ -30,4 +28,3 @@ int main() {
 
 	return 0;
 }
-
-- 
cgit v1.2.3


From 1f82ffa4d3ee8355215d43bf43edf8cecaca0d1d Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 16 Oct 2024 17:21:04 +0200
Subject: fix user script implementation

---
 src/crepe/CMakeLists.txt         |  1 -
 src/crepe/ComponentManager.h     |  2 +-
 src/crepe/ComponentManager.hpp   |  5 +++--
 src/crepe/GameObject.h           |  2 +-
 src/crepe/GameObject.hpp         |  4 ++--
 src/crepe/Script.cpp             |  7 -------
 src/crepe/Script.h               | 16 ----------------
 src/crepe/ScriptSystem.cpp       | 27 ++++++++++++++++++++++-----
 src/crepe/ScriptSystem.h         | 12 +++++++++++-
 src/crepe/api/BehaviorScript.h   | 24 ++++++++++++++++++------
 src/crepe/api/BehaviorScript.hpp | 18 ++++++++++++++++++
 src/crepe/api/CMakeLists.txt     |  2 ++
 src/crepe/api/Script.cpp         |  5 +++++
 src/crepe/api/Script.h           | 21 +++++++++++++++++++++
 src/example/script.cpp           |  7 ++++---
 15 files changed, 108 insertions(+), 45 deletions(-)
 delete mode 100644 src/crepe/Script.cpp
 delete mode 100644 src/crepe/Script.h
 create mode 100644 src/crepe/api/BehaviorScript.hpp
 create mode 100644 src/crepe/api/Script.cpp
 create mode 100644 src/crepe/api/Script.h

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

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index d85aef0..8323490 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -9,7 +9,6 @@ target_sources(crepe PUBLIC
 	Rigidbody.cpp
 	Sprite.cpp
 	ScriptSystem.cpp
-	Script.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
index eab9b45..38f32e4 100644
--- a/src/crepe/ComponentManager.h
+++ b/src/crepe/ComponentManager.h
@@ -23,7 +23,7 @@ public:
 public:
 	//! Add a component of a specific type
 	template <typename T, typename... Args>
-	void add_component(uint32_t id, Args &&... args);
+	T & add_component(uint32_t id, Args &&... args);
 	//! Deletes all components of a specific type and id
 	template <typename T>
 	void delete_components_by_id(uint32_t id);
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index c872594..e0242a2 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -3,12 +3,11 @@
 #include <type_traits>
 
 #include "ComponentManager.h"
-#include "api/BehaviorScript.h"
 
 namespace crepe {
 
 template <class T, typename... Args>
-void ComponentManager::add_component(uint32_t id, Args &&... args) {
+T & ComponentManager::add_component(uint32_t id, Args &&... args) {
 	using namespace std;
 
 	static_assert(is_base_of<Component, T>::value, "add_component must recieve a derivative class of Component");
@@ -33,6 +32,8 @@ void ComponentManager::add_component(uint32_t id, Args &&... args) {
 	T * instance = new T(forward<Args>(args)...);
 	// store its unique_ptr in the vector<>
 	components[type][id].push_back(unique_ptr<T>(instance));
+
+	return *instance;
 }
 
 template <typename T>
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
index 3588d9a..b5d6399 100644
--- a/src/crepe/GameObject.h
+++ b/src/crepe/GameObject.h
@@ -10,7 +10,7 @@ public:
 	GameObject(uint32_t id, std::string name, std::string tag, int layer);
 
 	template <typename T, typename... Args>
-	void add_component(Args &&... args);
+	T & add_component(Args &&... args);
 
 	uint32_t id;
 	std::string name;
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
index 5966fbf..8cd1abe 100644
--- a/src/crepe/GameObject.hpp
+++ b/src/crepe/GameObject.hpp
@@ -7,9 +7,9 @@
 namespace crepe {
 
 template <typename T, typename... Args>
-void GameObject::add_component(Args &&... args) {
+T & GameObject::add_component(Args &&... args) {
 	auto & mgr = ComponentManager::get_instance();
-	mgr.add_component<T>(id, std::forward<Args>(args)...);
+	return mgr.add_component<T>(id, std::forward<Args>(args)...);
 }
 
 } // namespace crepe
diff --git a/src/crepe/Script.cpp b/src/crepe/Script.cpp
deleted file mode 100644
index 42e3666..0000000
--- a/src/crepe/Script.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Script.h"
-
-using namespace crepe;
-
-void Script::init() { }
-void Script::update() { }
-
diff --git a/src/crepe/Script.h b/src/crepe/Script.h
deleted file mode 100644
index ba4073a..0000000
--- a/src/crepe/Script.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-namespace crepe {
-
-class Script {
-protected:
-	virtual void init();
-	virtual void update();
-	// NOTE: additional *events* (like unity's OnDisable and OnEnable) should be
-	// implemented as member methods in derivative user script classes and
-	// registered in init(), otherwise this class will balloon in size with each
-	// added event.
-};
-
-}
-
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e40909e..0537c16 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -1,12 +1,16 @@
+#include <forward_list>
+#include <functional>
 #include <vector>
+
+#include "ScriptSystem.h"
 #include "ComponentManager.h"
 #include "api/BehaviorScript.h"
-#include "util/fmt.h"
+#include "api/Script.h"
 #include "util/log.h"
 
-#include "ScriptSystem.h"
-
+using namespace std;
 using namespace crepe;
+using namespace crepe::api;
 
 ScriptSystem::ScriptSystem() {
 	dbg_trace();
@@ -24,10 +28,23 @@ void ScriptSystem::update() {
 	using namespace std;
 	dbg_trace();
 
+	forward_list<Script *> scripts = this->get_scripts();
+	for (Script * script : scripts)
+		script->update();
+}
+
+forward_list<Script *> ScriptSystem::get_scripts() {
+	forward_list<Script *> scripts = {};
 	ComponentManager & mgr = ComponentManager::get_instance();
-	vector<reference_wrapper<api::BehaviorScript>> scripts = mgr.get_components_by_type<api::BehaviorScript>();
+	vector<reference_wrapper<BehaviorScript>> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
 
-	dbg_logf("script count: %lu", scripts.size());
+	for (auto behavior_script_ref : behavior_scripts) {
+		BehaviorScript & behavior_script = behavior_script_ref.get();
+		Script * script = behavior_script.script;
+		if (script == nullptr) continue;
+		scripts.push_front(script);
+	}
 
+	return scripts;
 }
 
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e1ed290..e0b2a65 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -1,17 +1,27 @@
 #pragma once
 
+#include <forward_list>
+
 #include "System.h"
 
+namespace crepe::api {
+class Script;
+}
+
 namespace crepe {
 
 class ScriptSystem : public System {
 public:
 	static ScriptSystem & get_instance();
-	virtual void update();
+	void update();
 
 private:
 	ScriptSystem();
 	~ScriptSystem();
+
+private:
+	std::forward_list<api::Script *> get_scripts();
+
 };
 
 }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index dd04dc0..052d764 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -1,21 +1,33 @@
 #pragma once
 
-#include "../Script.h"
 #include "../Component.h"
 
+namespace crepe {
+class ScriptSystem;
+class ComponentManager;
+}
+
 namespace crepe::api {
 
-class BehaviorScript : public Script, public Component {
+class Script;
+
+class BehaviorScript : public Component {
 protected:
-	// only allow ComponentManager to instantiate scripts
-	friend class ComponentManager;
+	friend class crepe::ComponentManager;
 	BehaviorScript();
 public:
-	// but allow uniqe_ptr to call the destructor (THIS IS VERY IMPORTANT)
 	virtual ~BehaviorScript() = default;
 
-	static BehaviorScript * component;
+public:
+	template<class T>
+	BehaviorScript & set_script();
+
+protected:
+	friend class crepe::ScriptSystem;
+	Script * script = nullptr;
 };
 
 }
 
+#include "BehaviorScript.hpp"
+
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
new file mode 100644
index 0000000..0401c0d
--- /dev/null
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <type_traits>
+
+#include "../util/log.h"
+#include "BehaviorScript.h"
+
+namespace crepe::api {
+
+template<class T>
+BehaviorScript & BehaviorScript::set_script() {
+	static_assert(std::is_base_of<Script, T>::value);
+	dbg_trace();
+	this->script = new T();
+	return *this;
+}
+
+}
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 86623de..6b337be 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -1,10 +1,12 @@
 target_sources(crepe PUBLIC
 	# AudioSource.cpp
 	BehaviorScript.cpp
+	Script.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
+	Script.h
 )
 
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
new file mode 100644
index 0000000..6259574
--- /dev/null
+++ b/src/crepe/api/Script.cpp
@@ -0,0 +1,5 @@
+#include "Script.h"
+
+using namespace crepe::api;
+
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
new file mode 100644
index 0000000..b1e6a95
--- /dev/null
+++ b/src/crepe/api/Script.h
@@ -0,0 +1,21 @@
+#pragma once
+
+namespace crepe {
+class ScriptSystem;
+}
+
+namespace crepe::api {
+
+class Script {
+	friend class crepe::ScriptSystem;
+protected:
+	virtual void init() {}
+	virtual void update() {}
+	// NOTE: additional *events* (like unity's OnDisable and OnEnable) should be
+	// implemented as member methods in derivative user script classes and
+	// registered in init(), otherwise this class will balloon in size with each
+	// added event.
+};
+
+}
+
diff --git a/src/example/script.cpp b/src/example/script.cpp
index b8b3c8d..95c4950 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -8,15 +8,16 @@
 #include <crepe/ComponentManager.h>
 #include <crepe/GameObject.h>
 
+#include <crepe/api/Script.h>
 #include <crepe/api/BehaviorScript.h>
 
 using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
-class MyScript : public BehaviorScript {
+class MyScript : public Script {
 	void update() {
-		dbg_trace();
+		dbg_log("MY SCRIPT UPDATE");
 	}
 };
 
@@ -24,7 +25,7 @@ int main() {
 	dbg_trace();
 
 	auto obj = GameObject(0, "name", "tag", 0);
-	obj.add_component<MyScript>();
+	obj.add_component<BehaviorScript>().set_script<MyScript>();
 
 	auto & sys = ScriptSystem::get_instance();
 	sys.update(); // -> MyScript::update
-- 
cgit v1.2.3


From a2c719948ff8af9abe267c4d1c9b16cd1e2fb317 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 17 Oct 2024 17:15:53 +0200
Subject: `make format`

---
 src/crepe/Component.cpp          |  1 -
 src/crepe/Component.h            |  1 +
 src/crepe/ComponentManager.cpp   | 11 +++--------
 src/crepe/ComponentManager.hpp   |  9 ++++++---
 src/crepe/ScriptSystem.cpp       | 17 ++++++-----------
 src/crepe/ScriptSystem.h         |  4 +---
 src/crepe/System.h               |  7 +++----
 src/crepe/api/BehaviorScript.cpp |  7 ++-----
 src/crepe/api/BehaviorScript.h   |  8 ++++----
 src/crepe/api/BehaviorScript.hpp |  4 ++--
 src/crepe/api/Script.cpp         |  2 --
 src/crepe/api/Script.h           |  4 ++--
 src/crepe/util/fmt.cpp           |  5 ++---
 src/crepe/util/fmt.h             |  2 +-
 src/crepe/util/log.cpp           |  3 +--
 src/example/script.cpp           | 11 ++++-------
 16 files changed, 38 insertions(+), 58 deletions(-)

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

diff --git a/src/crepe/Component.cpp b/src/crepe/Component.cpp
index 737f30a..bce90f1 100644
--- a/src/crepe/Component.cpp
+++ b/src/crepe/Component.cpp
@@ -1,4 +1,3 @@
 #include "Component.h"
 
 using namespace crepe;
-
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index 00b2164..d9a01ac 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -5,6 +5,7 @@ namespace crepe {
 class Component {
 protected:
 	Component() = default;
+
 public:
 	virtual ~Component() = default;
 	// TODO: shouldn't this constructor be deleted because this class will never
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
index 8aa9d4e..8bde33a 100644
--- a/src/crepe/ComponentManager.cpp
+++ b/src/crepe/ComponentManager.cpp
@@ -1,5 +1,5 @@
-#include "util/log.h"
 #include "ComponentManager.h"
+#include "util/log.h"
 
 using namespace crepe;
 
@@ -24,11 +24,6 @@ void ComponentManager::delete_all_components() {
 	this->components.clear();
 }
 
-ComponentManager::ComponentManager() {
-	dbg_trace();
-}
-
-ComponentManager::~ComponentManager() {
-	dbg_trace();
-}
+ComponentManager::ComponentManager() { dbg_trace(); }
 
+ComponentManager::~ComponentManager() { dbg_trace(); }
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index e0242a2..2377a94 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -10,7 +10,8 @@ template <class T, typename... Args>
 T & ComponentManager::add_component(uint32_t id, Args &&... args) {
 	using namespace std;
 
-	static_assert(is_base_of<Component, T>::value, "add_component must recieve a derivative class of Component");
+	static_assert(is_base_of<Component, T>::value,
+				  "add_component must recieve a derivative class of Component");
 
 	// Determine the type of T (this is used as the key of the unordered_map<>)
 	type_index type = typeid(T);
@@ -81,7 +82,8 @@ ComponentManager::get_components_by_id(uint32_t id) const {
 	if (components.find(type) == components.end()) return component_vector;
 
 	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+	const vector<vector<unique_ptr<Component>>> & component_array
+		= components.at(type);
 
 	// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
 	if (id >= component_array.size()) return component_vector;
@@ -117,7 +119,8 @@ ComponentManager::get_components_by_type() const {
 	if (components.find(type) == components.end()) return component_vector;
 
 	// Get the correct vector<>
-	const vector<vector<unique_ptr<Component>>> & component_array = components.at(type);
+	const vector<vector<unique_ptr<Component>>> & component_array
+		= components.at(type);
 
 	// Loop through the whole vector<>
 	for (const vector<unique_ptr<Component>> & component : component_array) {
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index 1a7bff4..5d882be 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -2,8 +2,8 @@
 #include <functional>
 #include <vector>
 
-#include "ScriptSystem.h"
 #include "ComponentManager.h"
+#include "ScriptSystem.h"
 #include "api/BehaviorScript.h"
 #include "api/Script.h"
 #include "util/log.h"
@@ -12,12 +12,8 @@ using namespace std;
 using namespace crepe;
 using namespace crepe::api;
 
-ScriptSystem::ScriptSystem() {
-	dbg_trace();
-}
-ScriptSystem::~ScriptSystem() {
-	dbg_trace();
-}
+ScriptSystem::ScriptSystem() { dbg_trace(); }
+ScriptSystem::~ScriptSystem() { dbg_trace(); }
 
 ScriptSystem & ScriptSystem::get_instance() {
 	static ScriptSystem instance;
@@ -29,14 +25,14 @@ void ScriptSystem::update() {
 	dbg_trace();
 
 	forward_list<Script *> scripts = this->get_scripts();
-	for (Script * script : scripts)
-		script->update();
+	for (Script * script : scripts) script->update();
 }
 
 forward_list<Script *> ScriptSystem::get_scripts() {
 	forward_list<Script *> scripts = {};
 	ComponentManager & mgr = ComponentManager::get_instance();
-	vector<reference_wrapper<BehaviorScript>> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
+	vector<reference_wrapper<BehaviorScript>> behavior_scripts
+		= mgr.get_components_by_type<BehaviorScript>();
 
 	for (auto behavior_script_ref : behavior_scripts) {
 		BehaviorScript & behavior_script = behavior_script_ref.get();
@@ -47,4 +43,3 @@ forward_list<Script *> ScriptSystem::get_scripts() {
 
 	return scripts;
 }
-
diff --git a/src/crepe/ScriptSystem.h b/src/crepe/ScriptSystem.h
index e0b2a65..1f472a0 100644
--- a/src/crepe/ScriptSystem.h
+++ b/src/crepe/ScriptSystem.h
@@ -21,8 +21,6 @@ private:
 
 private:
 	std::forward_list<api::Script *> get_scripts();
-
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/System.h b/src/crepe/System.h
index 3fe3d66..ecbb7f5 100644
--- a/src/crepe/System.h
+++ b/src/crepe/System.h
@@ -8,8 +8,8 @@ public:
 	virtual void update() = 0;
 
 protected:
-	System() { };
-	virtual ~System() { };
+	System() {};
+	virtual ~System() {};
 
 private:
 	// singleton
@@ -19,5 +19,4 @@ private:
 	System & operator=(System &&) = delete;
 };
 
-}
-
+} // namespace crepe
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 7a93f10..1f236b4 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -1,11 +1,8 @@
 #include "../util/log.h"
 
-#include "Script.h"
 #include "BehaviorScript.h"
+#include "Script.h"
 
 using namespace crepe::api;
 
-BehaviorScript::BehaviorScript() {
-	dbg_trace();
-}
-
+BehaviorScript::BehaviorScript() { dbg_trace(); }
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 756c2ca..b8263ca 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -7,7 +7,7 @@
 namespace crepe {
 class ScriptSystem;
 class ComponentManager;
-}
+} // namespace crepe
 
 namespace crepe::api {
 
@@ -17,11 +17,12 @@ class BehaviorScript : public Component {
 protected:
 	friend class crepe::ComponentManager;
 	BehaviorScript();
+
 public:
 	virtual ~BehaviorScript() = default;
 
 public:
-	template<class T>
+	template <class T>
 	BehaviorScript & set_script();
 
 protected:
@@ -29,7 +30,6 @@ protected:
 	std::unique_ptr<Script> script = nullptr;
 };
 
-}
+} // namespace crepe::api
 
 #include "BehaviorScript.hpp"
-
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 9a1f427..a6bd81c 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -7,7 +7,7 @@
 
 namespace crepe::api {
 
-template<class T>
+template <class T>
 BehaviorScript & BehaviorScript::set_script() {
 	static_assert(std::is_base_of<Script, T>::value);
 	dbg_trace();
@@ -16,4 +16,4 @@ BehaviorScript & BehaviorScript::set_script() {
 	return *this;
 }
 
-}
+} // namespace crepe::api
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 6259574..5016ed0 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,5 +1,3 @@
 #include "Script.h"
 
 using namespace crepe::api;
-
-
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index b1e6a95..0036d1f 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -8,6 +8,7 @@ namespace crepe::api {
 
 class Script {
 	friend class crepe::ScriptSystem;
+
 protected:
 	virtual void init() {}
 	virtual void update() {}
@@ -17,5 +18,4 @@ protected:
 	// added event.
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
index 3a43a6f..8ef1164 100644
--- a/src/crepe/util/fmt.cpp
+++ b/src/crepe/util/fmt.cpp
@@ -1,6 +1,6 @@
-#include <string>
-#include <cstdio>
 #include <cstdarg>
+#include <cstdio>
+#include <string>
 
 #include "fmt.h"
 
@@ -31,4 +31,3 @@ string crepe::util::stringf(const char * fmt, ...) {
 	va_end(args);
 	return out;
 }
-
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
index 5c45703..44c426f 100644
--- a/src/crepe/util/fmt.h
+++ b/src/crepe/util/fmt.h
@@ -7,4 +7,4 @@ namespace crepe::util {
 std::string va_stringf(va_list args, const char * fmt);
 std::string stringf(const char * fmt, ...);
 
-}
+} // namespace crepe::util
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index b46620d..f012c67 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -3,8 +3,8 @@
 #include <cstdlib>
 #include <string>
 
-#include "log.h"
 #include "fmt.h"
+#include "log.h"
 
 using namespace crepe::util;
 
@@ -38,4 +38,3 @@ void crepe::util::logf(log_level level, const char * fmt, ...) {
 	log(level, va_stringf(args, fmt));
 	va_end(args);
 }
-
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 95c4950..cc585db 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -3,22 +3,20 @@
  * Standalone example for usage of the script component and system
  */
 
-#include <crepe/util/log.h>
-#include <crepe/ScriptSystem.h>
 #include <crepe/ComponentManager.h>
 #include <crepe/GameObject.h>
+#include <crepe/ScriptSystem.h>
+#include <crepe/util/log.h>
 
-#include <crepe/api/Script.h>
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/Script.h>
 
 using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
 class MyScript : public Script {
-	void update() {
-		dbg_log("MY SCRIPT UPDATE");
-	}
+	void update() { dbg_log("MY SCRIPT UPDATE"); }
 };
 
 int main() {
@@ -32,4 +30,3 @@ int main() {
 
 	return 0;
 }
-
-- 
cgit v1.2.3


From 58dfdba241b501d4b1b9688b44ee775507ec325b Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 21 Oct 2024 10:39:31 +0200
Subject: add Config + wip rework color

---
 src/crepe/api/CMakeLists.txt  |  1 +
 src/crepe/api/Config.h        | 27 +++++++++++++++
 src/crepe/util/CMakeLists.txt |  1 +
 src/crepe/util/color.cpp      | 49 +++++++++++++++++++++++++++
 src/crepe/util/color.h        | 79 +++++++++++++++++++++++--------------------
 src/crepe/util/log.cpp        |  9 +++--
 src/crepe/util/log.h          | 11 +++---
 src/example/script.cpp        |  4 +++
 8 files changed, 137 insertions(+), 44 deletions(-)
 create mode 100644 src/crepe/api/Config.h
 create mode 100644 src/crepe/util/color.cpp

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

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 86623de..68c4b72 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -6,5 +6,6 @@ target_sources(crepe PUBLIC
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
+	Config.h
 )
 
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
new file mode 100644
index 0000000..d6ee8e8
--- /dev/null
+++ b/src/crepe/api/Config.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "../util/log.h"
+
+namespace crepe::api {
+
+class Config {
+private:
+	Config() = default;
+public:
+	~Config() = default;
+
+public:
+	static Config & get_instance() {
+		static Config instance;
+		return instance;
+	}
+
+public:
+	struct {
+		util::log_level level = util::log_level::INFO;
+		bool color = true;
+	} log;
+};
+
+}
+
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index 100f028..d5dbd9f 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,4 +1,5 @@
 target_sources(crepe PUBLIC
+	color.cpp
 	log.cpp
 )
 
diff --git a/src/crepe/util/color.cpp b/src/crepe/util/color.cpp
new file mode 100644
index 0000000..3fec157
--- /dev/null
+++ b/src/crepe/util/color.cpp
@@ -0,0 +1,49 @@
+#include "color.h"
+#include "../api/Config.h"
+
+using namespace crepe::util;
+using namespace std;
+
+static constexpr const char * RESET_CODE = "\e[0m";
+
+const string LogColor::str(const string & content) {
+	auto & cfg = api::Config::get_instance();
+	string out = content;
+	if (cfg.log.color) out = this->code + out;
+	if (content.size() == 0) return out;
+	if (cfg.log.color) out = out + RESET_CODE;
+	return out;
+}
+
+const char * LogColor::c_str(const char * content) {
+	this->final = this->str(content);
+	return this->final.c_str();
+}
+
+LogColor & LogColor::add_code(unsigned int code) {
+	this->code += stringf("\e[%dm", code);
+	return *this;
+}
+
+LogColor & LogColor::reset() {
+	this->code = RESET_CODE;
+	return *this;
+}
+
+LogColor & LogColor::fg_black(bool bright) { return this->add_code(bright ? 90 : 30); }
+LogColor & LogColor::fg_red(bool bright) { return this->add_code(bright ? 91 : 31); }
+LogColor & LogColor::fg_green(bool bright) { return this->add_code(bright ? 92 : 32); }
+LogColor & LogColor::fg_yellow(bool bright) { return this->add_code(bright ? 93 : 33); }
+LogColor & LogColor::fg_blue(bool bright) { return this->add_code(bright ? 94 : 34); }
+LogColor & LogColor::fg_magenta(bool bright) { return this->add_code(bright ? 95 : 35); }
+LogColor & LogColor::fg_cyan(bool bright) { return this->add_code(bright ? 96 : 36); }
+LogColor & LogColor::fg_white(bool bright) { return this->add_code(bright ? 97 : 37); }
+LogColor & LogColor::bg_black(bool bright) { return this->add_code(bright ? 100 : 40); }
+LogColor & LogColor::bg_red(bool bright) { return this->add_code(bright ? 101 : 41); }
+LogColor & LogColor::bg_green(bool bright) { return this->add_code(bright ? 102 : 42); }
+LogColor & LogColor::bg_yellow(bool bright) { return this->add_code(bright ? 103 : 43); }
+LogColor & LogColor::bg_blue(bool bright) { return this->add_code(bright ? 104 : 44); }
+LogColor & LogColor::bg_magenta(bool bright) { return this->add_code(bright ? 105 : 45); }
+LogColor & LogColor::bg_cyan(bool bright) { return this->add_code(bright ? 106 : 46); }
+LogColor & LogColor::bg_white(bool bright) { return this->add_code(bright ? 107 : 47); }
+
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
index 066c9d3..0b7c1e6 100644
--- a/src/crepe/util/color.h
+++ b/src/crepe/util/color.h
@@ -1,41 +1,46 @@
 #pragma once
 
-namespace crepe::util::color {
-
-constexpr const char * RESET = "\e[0m";
-
-constexpr const char * FG_BLACK = "\e[30m";
-constexpr const char * FG_RED = "\e[31m";
-constexpr const char * FG_GREEN = "\e[32m";
-constexpr const char * FG_YELLOW = "\e[33m";
-constexpr const char * FG_BLUE = "\e[34m";
-constexpr const char * FG_MAGENTA = "\e[35m";
-constexpr const char * FG_CYAN = "\e[36m";
-constexpr const char * FG_WHITE = "\e[37m";
-constexpr const char * BG_BLACK = "\e[40m";
-constexpr const char * BG_RED = "\e[41m";
-constexpr const char * BG_GREEN = "\e[42m";
-constexpr const char * BG_YELLOW = "\e[43m";
-constexpr const char * BG_BLUE = "\e[44m";
-constexpr const char * BG_MAGENTA = "\e[45m";
-constexpr const char * BG_CYAN = "\e[46m";
-constexpr const char * BG_WHITE = "\e[47m";
-
-constexpr const char * FG_BLACK_BRIGHT = "\e[90m";
-constexpr const char * FG_RED_BRIGHT = "\e[91m";
-constexpr const char * FG_GREEN_BRIGHT = "\e[92m";
-constexpr const char * FG_YELLOW_BRIGHT = "\e[93m";
-constexpr const char * FG_BLUE_BRIGHT = "\e[94m";
-constexpr const char * FG_MAGENTA_BRIGHT = "\e[95m";
-constexpr const char * FG_CYAN_BRIGHT = "\e[96m";
-constexpr const char * FG_WHITE_BRIGHT = "\e[97m";
-constexpr const char * BG_BLACK_BRIGHT = "\e[100m";
-constexpr const char * BG_RED_BRIGHT = "\e[101m";
-constexpr const char * BG_GREEN_BRIGHT = "\e[102m";
-constexpr const char * BG_YELLOW_BRIGHT = "\e[103m";
-constexpr const char * BG_BLUE_BRIGHT = "\e[104m";
-constexpr const char * BG_MAGENTA_BRIGHT = "\e[105m";
-constexpr const char * BG_CYAN_BRIGHT = "\e[106m";
-constexpr const char * BG_WHITE_BRIGHT = "\e[107m";
+#include <string>
+
+namespace crepe::util {
+
+class LogColor {
+public:
+	LogColor() = default;
+
+public:
+	const char * c_str(const char * content = NULL);
+	const std::string str(const std::string & content = "");
+
+public:
+	LogColor & reset();
+
+public:
+	LogColor & fg_black(bool bright = false);
+	LogColor & fg_red(bool bright = false);
+	LogColor & fg_green(bool bright = false);
+	LogColor & fg_yellow(bool bright = false);
+	LogColor & fg_blue(bool bright = false);
+	LogColor & fg_magenta(bool bright = false);
+	LogColor & fg_cyan(bool bright = false);
+	LogColor & fg_white(bool bright = false);
+
+public:
+	LogColor & bg_black(bool bright = false);
+	LogColor & bg_red(bool bright = false);
+	LogColor & bg_green(bool bright = false);
+	LogColor & bg_yellow(bool bright = false);
+	LogColor & bg_blue(bool bright = false);
+	LogColor & bg_magenta(bool bright = false);
+	LogColor & bg_cyan(bool bright = false);
+	LogColor & bg_white(bool bright = false);
+
+private:
+	LogColor & add_code(unsigned int code);
+
+private:
+	std::string code = "";
+	std::string final = "";
+};
 
 } // namespace crepe::util::color
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index f91d52c..ba12ba5 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -4,17 +4,22 @@
 #include <string>
 
 #include "log.h"
+#include "../api/Config.h"
 
 using namespace crepe::util;
 
 static const char * const LOG_PREFIX[] = {
-	[log_level::DEBUG] = "[DBG] ",
+	[log_level::TRACE] = "[TRACE] ",
+	[log_level::DEBUG] = "[DEBUG] ",
 	[log_level::INFO] = "[INFO] ",
 	[log_level::WARNING] = "[WARN] ",
-	[log_level::ERROR] = "[ERR] ",
+	[log_level::ERROR] = "[ERROR] ",
 };
 
 static void va_logf(enum log_level level, va_list args, const std::string fmt) {
+	auto & cfg = crepe::api::Config::get_instance();
+	if (level < cfg.log.level) return;
+
 	va_list args_copy;
 	va_copy(args_copy, args);
 
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 2b0fbe1..d5494c7 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -6,17 +6,17 @@
 #include "color.h"
 
 // utility macros
-#define _crepe_logf_here(fmt, ...) \
-	crepe::util::logf(util::log_level::DEBUG, "%s%s (%s:%d)" fmt "\n", \
+#define _crepe_logf_here(lvl, fmt, ...) \
+	crepe::util::logf(lvl, "%s%s (%s:%d)" fmt "\n", \
 					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
 					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
 					  __VA_ARGS__)
 
 // very illegal global function-style macros
 // NOLINTBEGIN
-#define dbg_logf(fmt, ...) _crepe_logf_here(": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(": %s", str)
-#define dbg_trace() _crepe_logf_here("%s", "")
+#define dbg_logf(fmt, ...) _crepe_logf_here(util::log_level::DEBUG, ": " fmt, __VA_ARGS__)
+#define dbg_log(str) _crepe_logf_here(util::log_level::DEBUG, ": %s", str)
+#define dbg_trace() _crepe_logf_here(util::log_level::TRACE, "%s", "")
 // NOLINTEND
 
 #endif
@@ -24,6 +24,7 @@
 namespace crepe::util {
 
 enum log_level {
+	TRACE,
 	DEBUG,
 	INFO,
 	WARNING,
diff --git a/src/example/script.cpp b/src/example/script.cpp
index a610b83..44e2922 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -8,6 +8,7 @@
 #include <crepe/ScriptSystem.h>
 #include <crepe/util/log.h>
 
+#include <crepe/api/Config.h>
 #include <crepe/api/BehaviorScript.h>
 
 using namespace crepe;
@@ -18,6 +19,9 @@ class MyScript : public api::BehaviorScript {
 };
 
 int main() {
+	auto & cfg = api::Config::get_instance();
+	cfg.log.level = util::log_level::TRACE;
+
 	dbg_trace();
 
 	auto obj = GameObject(0, "name", "tag", 0);
-- 
cgit v1.2.3


From e58c98e224afcf4a28078344e0cd5f8c0e10961f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Mon, 21 Oct 2024 11:17:23 +0200
Subject: add logging example + finish log color config integration

---
 src/crepe/api/Config.h     | 13 +++++++++++++
 src/crepe/util/color.cpp   | 13 ++++++++++++-
 src/crepe/util/color.h     |  5 +++++
 src/crepe/util/log.cpp     | 25 ++++++++++++++-----------
 src/crepe/util/log.h       | 12 ++++--------
 src/example/CMakeLists.txt |  1 +
 src/example/log.cpp        | 25 +++++++++++++++++++++++++
 src/example/script.cpp     |  2 --
 8 files changed, 74 insertions(+), 22 deletions(-)
 create mode 100644 src/example/log.cpp

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

diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index d6ee8e8..f47f45b 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -11,14 +11,27 @@ public:
 	~Config() = default;
 
 public:
+	//! Retrieve handle to global Config instance
 	static Config & get_instance() {
 		static Config instance;
 		return instance;
 	}
 
 public:
+	//! Logging-related settings
 	struct {
+		/**
+		 * \brief Log level
+		 *
+		 * Only messages with equal or higher priority than this value will be
+		 * logged.
+		 */
 		util::log_level level = util::log_level::INFO;
+		/**
+		 * \brief Colored log output
+		 *
+		 * Enables log coloring using ANSI escape codes.
+		 */
 		bool color = true;
 	} log;
 };
diff --git a/src/crepe/util/color.cpp b/src/crepe/util/color.cpp
index 3fec157..bdf5809 100644
--- a/src/crepe/util/color.cpp
+++ b/src/crepe/util/color.cpp
@@ -1,4 +1,7 @@
+#include <cstdarg>
+
 #include "color.h"
+#include "fmt.h"
 #include "../api/Config.h"
 
 using namespace crepe::util;
@@ -16,10 +19,18 @@ const string LogColor::str(const string & content) {
 }
 
 const char * LogColor::c_str(const char * content) {
-	this->final = this->str(content);
+	this->final = this->str(content == NULL ? "" : content);
 	return this->final.c_str();
 }
 
+const char * LogColor::fmt(const char * fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	string content = va_stringf(args, fmt);
+	va_end(args);
+	return this->c_str(content.c_str());
+}
+
 LogColor & LogColor::add_code(unsigned int code) {
 	this->code += stringf("\e[%dm", code);
 	return *this;
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
index 0b7c1e6..66f3a28 100644
--- a/src/crepe/util/color.h
+++ b/src/crepe/util/color.h
@@ -9,10 +9,15 @@ public:
 	LogColor() = default;
 
 public:
+	//! get color code as c-style string (or color content string)
 	const char * c_str(const char * content = NULL);
+	//! color printf-style format string
+	const char * fmt(const char * fmt, ...);
+	//! get color code as stl string (or color content string)
 	const std::string str(const std::string & content = "");
 
 public:
+	//! reset color to default foreground and background color
 	LogColor & reset();
 
 public:
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index e3e9f1f..a2672a3 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -8,21 +8,24 @@
 #include "../api/Config.h"
 
 using namespace crepe::util;
+using namespace std;
+
+string log_prefix(log_level level) {
+	switch (level) {
+		case log_level::TRACE: return LogColor().fg_white().str("[TRACE]") + " ";
+		case log_level::DEBUG: return LogColor().fg_magenta().str("[DEBUG]") + " ";
+		case log_level::INFO: return LogColor().fg_blue().str("[INFO]") + " ";
+		case log_level::WARNING: return LogColor().fg_yellow().str("[WARN]") + " ";
+		case log_level::ERROR: return LogColor().fg_red().str("[ERROR]") + " ";
+	}
+	return "";
+}
 
-static const char * const LOG_PREFIX[] = {
-	[log_level::TRACE] = "[TRACE] ",
-	[log_level::DEBUG] = "[DEBUG] ",
-	[log_level::INFO] = "[INFO] ",
-	[log_level::WARNING] = "[WARN] ",
-	[log_level::ERROR] = "[ERROR] ",
-};
-
-static void log(enum log_level level, const std::string msg) {
+static void log(enum log_level level, const string msg) {
 	auto & cfg = crepe::api::Config::get_instance();
 	if (level < cfg.log.level) return;
 
-	using namespace std;
-	string final = string(LOG_PREFIX[level]) + msg;
+	string final = log_prefix(level) + msg;
 	if (!final.ends_with("\n")) final += "\n";
 
 	// TODO: also log to file or smth
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index c5d8665..bcc06a5 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -6,17 +6,13 @@
 #include "color.h"
 
 // utility macros
-#define _crepe_logf_here(lvl, fmt, ...) \
-	crepe::util::logf(lvl, "%s%s (%s:%d)%s" fmt "\n", \
-					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
-					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
-					  __VA_ARGS__)
+#define _crepe_logf_here(level, format, ...) crepe::util::logf(level, "%s" format, crepe::util::LogColor().fg_white(false).fmt("%s (%s:%d)", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__), __VA_ARGS__)
 
 // very illegal global function-style macros
 // NOLINTBEGIN
-#define dbg_logf(fmt, ...) _crepe_logf_here(util::log_level::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(util::log_level::DEBUG, "%s: " str, "")
-#define dbg_trace() _crepe_logf_here(util::log_level::TRACE, "%s", "")
+#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::util::log_level::DEBUG, ": " fmt, __VA_ARGS__)
+#define dbg_log(str) _crepe_logf_here(crepe::util::log_level::DEBUG, "%s: " str, "")
+#define dbg_trace() _crepe_logf_here(crepe::util::log_level::TRACE, "%s", "")
 // NOLINTEND
 
 #endif
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 6df4ce7..4ef1cd1 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -15,4 +15,5 @@ endfunction()
 add_example(audio_internal)
 add_example(components_internal)
 add_example(script)
+add_example(log)
 
diff --git a/src/example/log.cpp b/src/example/log.cpp
new file mode 100644
index 0000000..2d693d1
--- /dev/null
+++ b/src/example/log.cpp
@@ -0,0 +1,25 @@
+/** \file
+ * 
+ * Standalone example for usage of the logging functions
+ */
+
+#include <crepe/util/log.h>
+#include <crepe/api/Config.h>
+
+using namespace crepe;
+using namespace crepe::util;
+
+int main() {
+	auto & cfg = api::Config::get_instance();
+	// make sure all log messages get printed
+	cfg.log.level = util::log_level::TRACE;
+
+	dbg_trace();
+	dbg_logf("cfg.log.color is equal to %d", cfg.log.color);
+	logf(log_level::INFO, "info message!");
+	logf(log_level::WARNING, "very scary warning");
+	logf(log_level::ERROR, "fatal error!!!");
+
+	return 0;
+}
+
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 91e4713..97e99b3 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -24,8 +24,6 @@ int main() {
 	auto & cfg = api::Config::get_instance();
 	cfg.log.level = util::log_level::TRACE;
 
-	dbg_trace();
-
 	auto obj = GameObject(0, "name", "tag", 0);
 	obj.add_component<BehaviorScript>().set_script<MyScript>();
 
-- 
cgit v1.2.3


From 04a040e28ade412ea5b1767bf77eed3956121973 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 23 Oct 2024 13:12:18 +0200
Subject: move user-facing classes to api namespace

---
 src/crepe/CMakeLists.txt            |  9 ---------
 src/crepe/Collider.cpp              |  5 -----
 src/crepe/Collider.h                | 14 --------------
 src/crepe/Component.h               |  3 +--
 src/crepe/GameObject.cpp            |  7 -------
 src/crepe/GameObject.h              | 24 ------------------------
 src/crepe/GameObject.hpp            | 15 ---------------
 src/crepe/Rigidbody.cpp             |  6 ------
 src/crepe/Rigidbody.h               | 16 ----------------
 src/crepe/Sprite.cpp                |  8 --------
 src/crepe/Sprite.h                  | 16 ----------------
 src/crepe/api/AudioSource.cpp       |  3 ++-
 src/crepe/api/AudioSource.h         |  4 ++--
 src/crepe/api/BehaviorScript.cpp    |  1 -
 src/crepe/api/BehaviorScript.h      |  2 +-
 src/crepe/api/CMakeLists.txt        |  9 +++++++++
 src/crepe/api/Collider.cpp          |  5 +++++
 src/crepe/api/Collider.h            | 14 ++++++++++++++
 src/crepe/api/GameObject.cpp        |  7 +++++++
 src/crepe/api/GameObject.h          | 24 ++++++++++++++++++++++++
 src/crepe/api/GameObject.hpp        | 15 +++++++++++++++
 src/crepe/api/Rigidbody.cpp         |  6 ++++++
 src/crepe/api/Rigidbody.h           | 16 ++++++++++++++++
 src/crepe/api/Sprite.cpp            |  8 ++++++++
 src/crepe/api/Sprite.h              | 16 ++++++++++++++++
 src/example/CMakeLists.txt          |  4 ++++
 src/example/components_internal.cpp | 11 +++++++----
 src/example/script.cpp              |  2 +-
 src/readme.md                       |  3 ++-
 29 files changed, 140 insertions(+), 133 deletions(-)
 delete mode 100644 src/crepe/Collider.cpp
 delete mode 100644 src/crepe/Collider.h
 delete mode 100644 src/crepe/GameObject.cpp
 delete mode 100644 src/crepe/GameObject.h
 delete mode 100644 src/crepe/GameObject.hpp
 delete mode 100644 src/crepe/Rigidbody.cpp
 delete mode 100644 src/crepe/Rigidbody.h
 delete mode 100644 src/crepe/Sprite.cpp
 delete mode 100644 src/crepe/Sprite.h
 create mode 100644 src/crepe/api/Collider.cpp
 create mode 100644 src/crepe/api/Collider.h
 create mode 100644 src/crepe/api/GameObject.cpp
 create mode 100644 src/crepe/api/GameObject.h
 create mode 100644 src/crepe/api/GameObject.hpp
 create mode 100644 src/crepe/api/Rigidbody.cpp
 create mode 100644 src/crepe/api/Rigidbody.h
 create mode 100644 src/crepe/api/Sprite.cpp
 create mode 100644 src/crepe/api/Sprite.h

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

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 8323490..cfa51fb 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -4,10 +4,6 @@ target_sources(crepe PUBLIC
 	SoundContext.cpp
 	ComponentManager.cpp
 	Component.cpp
-	GameObject.cpp
-	Collider.cpp
-	Rigidbody.cpp
-	Sprite.cpp
 	ScriptSystem.cpp
 )
 
@@ -18,11 +14,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	ComponentManager.h
 	ComponentManager.hpp
 	Component.h
-	GameObject.h
-	GameObject.hpp
-	Collider.h
-	Rigidbody.h
-	Sprite.h
 	System.h
 	ScriptSystem.h
 )
diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp
deleted file mode 100644
index 3f12afd..0000000
--- a/src/crepe/Collider.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "Collider.h"
-
-using namespace crepe;
-
-Collider::Collider(int size) : size(size) {}
diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h
deleted file mode 100644
index 120da05..0000000
--- a/src/crepe/Collider.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Component.h"
-
-namespace crepe {
-
-class Collider : public Component {
-public:
-	Collider(int size);
-
-	int size;
-};
-
-} // namespace crepe
diff --git a/src/crepe/Component.h b/src/crepe/Component.h
index d9a01ac..9cda177 100644
--- a/src/crepe/Component.h
+++ b/src/crepe/Component.h
@@ -8,9 +8,8 @@ protected:
 
 public:
 	virtual ~Component() = default;
-	// TODO: shouldn't this constructor be deleted because this class will never
-	// directly be instantiated?
 
+public:
 	bool active = true;
 };
 
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
deleted file mode 100644
index de3beb6..0000000
--- a/src/crepe/GameObject.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GameObject.h"
-
-using namespace crepe;
-
-GameObject::GameObject(uint32_t id, std::string name, std::string tag,
-					   int layer)
-	: id(id), name(name), tag(tag), active(true), layer(layer) {}
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
deleted file mode 100644
index b5d6399..0000000
--- a/src/crepe/GameObject.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-namespace crepe {
-
-class GameObject {
-public:
-	GameObject(uint32_t id, std::string name, std::string tag, int layer);
-
-	template <typename T, typename... Args>
-	T & add_component(Args &&... args);
-
-	uint32_t id;
-	std::string name;
-	std::string tag;
-	bool active;
-	int layer;
-};
-
-} // namespace crepe
-
-#include "GameObject.hpp"
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
deleted file mode 100644
index 8cd1abe..0000000
--- a/src/crepe/GameObject.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "GameObject.h"
-
-#include "ComponentManager.h"
-
-namespace crepe {
-
-template <typename T, typename... Args>
-T & GameObject::add_component(Args &&... args) {
-	auto & mgr = ComponentManager::get_instance();
-	return mgr.add_component<T>(id, std::forward<Args>(args)...);
-}
-
-} // namespace crepe
diff --git a/src/crepe/Rigidbody.cpp b/src/crepe/Rigidbody.cpp
deleted file mode 100644
index 495d908..0000000
--- a/src/crepe/Rigidbody.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "Rigidbody.h"
-
-using namespace crepe;
-
-Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
-	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/Rigidbody.h b/src/crepe/Rigidbody.h
deleted file mode 100644
index 63a8877..0000000
--- a/src/crepe/Rigidbody.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "Component.h"
-
-namespace crepe {
-
-class Rigidbody : public Component {
-public:
-	Rigidbody(int mass, int gravityScale, int bodyType);
-
-	int mass;
-	int gravity_scale;
-	int body_type;
-};
-
-} // namespace crepe
diff --git a/src/crepe/Sprite.cpp b/src/crepe/Sprite.cpp
deleted file mode 100644
index a5a5e68..0000000
--- a/src/crepe/Sprite.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <string>
-
-#include "Sprite.h"
-
-using namespace crepe;
-using namespace std;
-
-Sprite::Sprite(string path) : path(path) {}
diff --git a/src/crepe/Sprite.h b/src/crepe/Sprite.h
deleted file mode 100644
index 143e702..0000000
--- a/src/crepe/Sprite.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <string>
-
-#include "Component.h"
-
-namespace crepe {
-
-class Sprite : public Component {
-public:
-	Sprite(std::string path);
-
-	std::string path;
-};
-
-} // namespace crepe
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index b512d27..bb067dc 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -1,7 +1,8 @@
+#include <memory>
+
 #include "AudioSource.h"
 
 #include "../Sound.h"
-#include <memory>
 
 using namespace crepe::api;
 
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 2d26cda..7980212 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "Asset.h"
-#include "Component.h"
+#include "../Asset.h"
+#include "../Component.h"
 
 namespace crepe {
 class Sound;
diff --git a/src/crepe/api/BehaviorScript.cpp b/src/crepe/api/BehaviorScript.cpp
index 1f236b4..84bfd4c 100644
--- a/src/crepe/api/BehaviorScript.cpp
+++ b/src/crepe/api/BehaviorScript.cpp
@@ -1,7 +1,6 @@
 #include "../util/log.h"
 
 #include "BehaviorScript.h"
-#include "Script.h"
 
 using namespace crepe::api;
 
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index 6ce6798..25d3cc5 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "Component.h"
+#include "../Component.h"
 #include "Script.h"
 
 namespace crepe {
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index 6b337be..ae92f3d 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -2,11 +2,20 @@ target_sources(crepe PUBLIC
 	# AudioSource.cpp
 	BehaviorScript.cpp
 	Script.cpp
+	GameObject.cpp
+	Collider.cpp
+	Rigidbody.cpp
+	Sprite.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
 	Script.h
+	GameObject.h
+	GameObject.hpp
+	Collider.h
+	Rigidbody.h
+	Sprite.h
 )
 
diff --git a/src/crepe/api/Collider.cpp b/src/crepe/api/Collider.cpp
new file mode 100644
index 0000000..6370a42
--- /dev/null
+++ b/src/crepe/api/Collider.cpp
@@ -0,0 +1,5 @@
+#include "Collider.h"
+
+using namespace crepe::api;
+
+Collider::Collider(int size) : size(size) {}
diff --git a/src/crepe/api/Collider.h b/src/crepe/api/Collider.h
new file mode 100644
index 0000000..72d8e77
--- /dev/null
+++ b/src/crepe/api/Collider.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Collider : public Component {
+public:
+	Collider(int size);
+
+	int size;
+};
+
+} // namespace crepe::api
diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
new file mode 100644
index 0000000..b167187
--- /dev/null
+++ b/src/crepe/api/GameObject.cpp
@@ -0,0 +1,7 @@
+#include "GameObject.h"
+
+using namespace crepe::api;
+using namespace std;
+
+GameObject::GameObject(uint32_t id, string name, string tag, int layer)
+	: id(id), name(name), tag(tag), active(true), layer(layer) {}
diff --git a/src/crepe/api/GameObject.h b/src/crepe/api/GameObject.h
new file mode 100644
index 0000000..57508c5
--- /dev/null
+++ b/src/crepe/api/GameObject.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace crepe::api {
+
+class GameObject {
+public:
+	GameObject(uint32_t id, std::string name, std::string tag, int layer);
+
+	template <typename T, typename... Args>
+	T & add_component(Args &&... args);
+
+	uint32_t id;
+	std::string name;
+	std::string tag;
+	bool active;
+	int layer;
+};
+
+} // namespace crepe::api
+
+#include "GameObject.hpp"
diff --git a/src/crepe/api/GameObject.hpp b/src/crepe/api/GameObject.hpp
new file mode 100644
index 0000000..8295ea3
--- /dev/null
+++ b/src/crepe/api/GameObject.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "../ComponentManager.h"
+
+#include "GameObject.h"
+
+namespace crepe::api {
+
+template <typename T, typename... Args>
+T & GameObject::add_component(Args &&... args) {
+	auto & mgr = ComponentManager::get_instance();
+	return mgr.add_component<T>(id, std::forward<Args>(args)...);
+}
+
+} // namespace crepe::api
diff --git a/src/crepe/api/Rigidbody.cpp b/src/crepe/api/Rigidbody.cpp
new file mode 100644
index 0000000..98d1d60
--- /dev/null
+++ b/src/crepe/api/Rigidbody.cpp
@@ -0,0 +1,6 @@
+#include "Rigidbody.h"
+
+using namespace crepe::api;
+
+Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
+	: mass(mass), gravity_scale(gravityScale), body_type(bodyType) {}
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
new file mode 100644
index 0000000..6cae579
--- /dev/null
+++ b/src/crepe/api/Rigidbody.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Rigidbody : public Component {
+public:
+	Rigidbody(int mass, int gravityScale, int bodyType);
+
+	int mass;
+	int gravity_scale;
+	int body_type;
+};
+
+} // namespace crepe::api
diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
new file mode 100644
index 0000000..aa7dbb0
--- /dev/null
+++ b/src/crepe/api/Sprite.cpp
@@ -0,0 +1,8 @@
+#include <string>
+
+#include "Sprite.h"
+
+using namespace crepe::api;
+using namespace std;
+
+Sprite::Sprite(string path) : path(path) {}
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
new file mode 100644
index 0000000..580f825
--- /dev/null
+++ b/src/crepe/api/Sprite.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+#include "../Component.h"
+
+namespace crepe::api {
+
+class Sprite : public Component {
+public:
+	Sprite(std::string path);
+
+	std::string path;
+};
+
+} // namespace crepe::api
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 6df4ce7..53f584f 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -1,3 +1,6 @@
+# all examples
+add_custom_target(examples)
+
 # add_example(target_name [SOURCES...])
 function(add_example target_name)
 	# if SOURCES is not specified
@@ -10,6 +13,7 @@ function(add_example target_name)
 
 	add_executable(${target_name} EXCLUDE_FROM_ALL ${sources})
 	target_link_libraries(${target_name} PUBLIC crepe)
+	add_dependencies(examples ${target_name})
 endfunction()
 
 add_example(audio_internal)
diff --git a/src/example/components_internal.cpp b/src/example/components_internal.cpp
index 54ce295..e2169e1 100644
--- a/src/example/components_internal.cpp
+++ b/src/example/components_internal.cpp
@@ -6,14 +6,17 @@
 #include <cassert>
 #include <chrono>
 
-#include <crepe/Collider.h>
 #include <crepe/Component.h>
 #include <crepe/ComponentManager.h>
-#include <crepe/GameObject.h>
-#include <crepe/Rigidbody.h>
-#include <crepe/Sprite.h>
+
+#include <crepe/api/Collider.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
+
 #include <crepe/util/log.h>
 
+using namespace crepe::api;
 using namespace crepe;
 using namespace std;
 
diff --git a/src/example/script.cpp b/src/example/script.cpp
index cc585db..6e5563c 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -4,11 +4,11 @@
  */
 
 #include <crepe/ComponentManager.h>
-#include <crepe/GameObject.h>
 #include <crepe/ScriptSystem.h>
 #include <crepe/util/log.h>
 
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 
 using namespace crepe;
diff --git a/src/readme.md b/src/readme.md
index a4a71e7..a8ffc51 100644
--- a/src/readme.md
+++ b/src/readme.md
@@ -18,7 +18,8 @@ running the build command:
 $ ninja -C build test_main
 ```
 
-Each source file in the example/ folder corresponds to a CMake target as well:
+Each source file in the example/ folder corresponds to a CMake target as well
+(all examples can be built at once by specifying the `examples` target):
 
 ```
 $ ninja -C build audio_internal components_internal
-- 
cgit v1.2.3


From e7377daf2fe3b759fbbf7e57f88c412c3b1cf011 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 24 Oct 2024 10:56:19 +0200
Subject: `make format`

---
 mwe/events/include/event.h          |  82 ++++++------
 mwe/events/include/eventHandler.h   |  50 ++++----
 mwe/events/include/eventManager.h   |  81 ++++++------
 mwe/events/include/keyCodes.h       | 248 ++++++++++++++++++------------------
 mwe/events/include/loopManager.h    |   5 +-
 mwe/events/src/event.cpp            |  48 +++----
 mwe/events/src/eventHandler.cpp     |   5 +-
 mwe/events/src/eventManager.cpp     | 231 +++++++++++++++++++--------------
 mwe/events/src/keyCodes.cpp         | 247 ++++++++++++++++++-----------------
 mwe/events/src/loopManager.cpp      |  45 +++----
 mwe/events/src/main.cpp             |  49 +++----
 mwe/events/src/timer.cpp            |   3 +-
 mwe/events/src/window.cpp           |   3 +-
 mwe/gameloop/include/eventManager.h |   4 +-
 mwe/gameloop/include/loopManager.h  |   2 +-
 src/crepe/api/AssetManager.h        |   4 +-
 src/crepe/api/AssetManager.hpp      |   3 +-
 src/crepe/api/Color.h               |   1 +
 src/crepe/api/Config.h              |   4 +-
 src/crepe/api/Transform.h           |   1 +
 src/crepe/util/color.cpp            |  67 +++++++---
 src/crepe/util/color.h              |   2 +-
 src/crepe/util/log.cpp              |  18 ++-
 src/crepe/util/log.h                |  13 +-
 src/example/log.cpp                 |   3 +-
 src/example/script.cpp              |   2 +-
 src/makefile                        |   4 +-
 27 files changed, 653 insertions(+), 572 deletions(-)

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

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index 802140c..5eef32f 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -1,87 +1,91 @@
 #pragma once
+#include "keyCodes.h"
 #include <cstdint>
 #include <iostream>
 #include <string>
 #include <unordered_map>
 #include <variant>
-#include "keyCodes.h"
 
 class UUIDGenerator {
 public:
-    static std::uint32_t getUniqueID() {
-        static std::uint32_t id = 0;
-        return ++id;
-    }
+	static std::uint32_t getUniqueID() {
+		static std::uint32_t id = 0;
+		return ++id;
+	}
 };
 #define REGISTER_EVENT_TYPE(ClassName) \
+\
 public: \
-    static std::uint32_t getStaticEventType() { \
-        static std::uint32_t typeID = UUIDGenerator::getUniqueID(); \
-        return typeID; \
-    } \
-    virtual std::uint32_t getEventType() const override { \
-        return getStaticEventType(); \
-    }
+	static std::uint32_t getStaticEventType() { \
+		static std::uint32_t typeID = UUIDGenerator::getUniqueID(); \
+		return typeID; \
+	} \
+	virtual std::uint32_t getEventType() const override { \
+		return getStaticEventType(); \
+	}
 class Event {
 public:
-    Event(std::string eventType);
-    virtual ~Event() = default;
-    virtual std::uint32_t getEventType() const = 0;
-    virtual std::string toString() const;
-    void addArgument(const std::string& key, const std::variant<int, std::string, float>& value);
+	Event(std::string eventType);
+	virtual ~Event() = default;
+	virtual std::uint32_t getEventType() const = 0;
+	virtual std::string toString() const;
+	void addArgument(const std::string & key,
+					 const std::variant<int, std::string, float> & value);
 
-    std::variant<int, std::string, float> getArgument(const std::string& key) const;
+	std::variant<int, std::string, float>
+	getArgument(const std::string & key) const;
 
-    std::string getType() const;
-    bool getHandled() const;
-    void markHandled();
+	std::string getType() const;
+	bool getHandled() const;
+	void markHandled();
 
 private:
-    std::unordered_map<std::string, std::variant<int, std::string, float>> eventData;
-    bool isHandled = false;
+	std::unordered_map<std::string, std::variant<int, std::string, float>>
+		eventData;
+	bool isHandled = false;
 };
 
 // KeyPressedEvent class
 class KeyPressedEvent : public Event {
 public:
-    KeyPressedEvent(int keyCode);
+	KeyPressedEvent(int keyCode);
 
-    REGISTER_EVENT_TYPE("KeyPressedEvent");
+	REGISTER_EVENT_TYPE("KeyPressedEvent");
 
-    Keycode getKeyCode() const;
-    int getRepeatCount() const;
+	Keycode getKeyCode() const;
+	int getRepeatCount() const;
 
 private:
-    Keycode keycode;
+	Keycode keycode;
 
 public:
-    Keycode key = 0;
-    int repeatCount = 0;
+	Keycode key = 0;
+	int repeatCount = 0;
 };
 
 // KeyReleasedEvent class
 class KeyReleasedEvent : public Event {
 public:
-    KeyReleasedEvent(int keyCode);
+	KeyReleasedEvent(int keyCode);
 
-    REGISTER_EVENT_TYPE(KeyReleasedEvent);
+	REGISTER_EVENT_TYPE(KeyReleasedEvent);
 
-    Keycode getKeyCode() const;
+	Keycode getKeyCode() const;
 
 private:
-    Keycode key = 0;
+	Keycode key = 0;
 };
 
 // MousePressedEvent class
 class MousePressedEvent : public Event {
 public:
-    MousePressedEvent(int mouseX, int mouseY);
+	MousePressedEvent(int mouseX, int mouseY);
 
-    REGISTER_EVENT_TYPE(MousePressedEvent)
+	REGISTER_EVENT_TYPE(MousePressedEvent)
 
-    std::pair<int, int> getMousePosition() const;
+	std::pair<int, int> getMousePosition() const;
 
 private:
-    int mouseX = 0;
-    int mouseY = 0;
+	int mouseX = 0;
+	int mouseY = 0;
 };
diff --git a/mwe/events/include/eventHandler.h b/mwe/events/include/eventHandler.h
index e5b99d6..7414801 100644
--- a/mwe/events/include/eventHandler.h
+++ b/mwe/events/include/eventHandler.h
@@ -4,45 +4,43 @@
 
 #include <functional>
 #include <iostream>
-template<typename EventType>
-using EventHandler = std::function<void(const EventType& e)>;
+template <typename EventType>
+using EventHandler = std::function<void(const EventType & e)>;
 
 class IEventHandlerWrapper {
 public:
-    virtual ~IEventHandlerWrapper() = default;
+	virtual ~IEventHandlerWrapper() = default;
 
-    void exec(const Event& e);
+	void exec(const Event & e);
 
-    virtual std::string getType() const = 0;
-    virtual bool isDestroyOnSuccess() const = 0;
+	virtual std::string getType() const = 0;
+	virtual bool isDestroyOnSuccess() const = 0;
 
 private:
-    virtual void call(const Event& e) = 0;
+	virtual void call(const Event & e) = 0;
 };
 
-template<typename EventType>
+template <typename EventType>
 class EventHandlerWrapper : public IEventHandlerWrapper {
 public:
-    explicit EventHandlerWrapper(const EventHandler<EventType>& handler, const bool destroyOnSuccess = false)
-        : m_handler(handler)
-        , m_handlerType(m_handler.target_type().name())
-        , m_destroyOnSuccess(destroyOnSuccess)
-    { 
+	explicit EventHandlerWrapper(const EventHandler<EventType> & handler,
+								 const bool destroyOnSuccess = false)
+		: m_handler(handler), m_handlerType(m_handler.target_type().name()),
+		  m_destroyOnSuccess(destroyOnSuccess) {
 		// std::cout << m_handlerType << std::endl;
 	}
 
 private:
-    void call(const Event& e) override
-    {
-        if (e.getEventType() == EventType::getStaticEventType()) {
-            m_handler(static_cast<const EventType&>(e));
-        }
-    }
-
-    std::string getType() const override { return m_handlerType; }
-    bool isDestroyOnSuccess() const { return m_destroyOnSuccess; }
-
-    EventHandler<EventType> m_handler;
-    const std::string m_handlerType;
-    bool m_destroyOnSuccess { false };
+	void call(const Event & e) override {
+		if (e.getEventType() == EventType::getStaticEventType()) {
+			m_handler(static_cast<const EventType &>(e));
+		}
+	}
+
+	std::string getType() const override { return m_handlerType; }
+	bool isDestroyOnSuccess() const { return m_destroyOnSuccess; }
+
+	EventHandler<EventType> m_handler;
+	const std::string m_handlerType;
+	bool m_destroyOnSuccess{false};
 };
diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h
index 709796a..af41b82 100644
--- a/mwe/events/include/eventManager.h
+++ b/mwe/events/include/eventManager.h
@@ -1,57 +1,66 @@
 #pragma once
-#include <unordered_map>
-#include <memory>
 #include "event.h"
-#include "keyCodes.h"
 #include "eventHandler.h"
+#include "keyCodes.h"
+#include <memory>
+#include <unordered_map>
 #include <vector>
 // using EventType = std::uint32_t;
 // using EventId = std::uint64_t;
 
 class EventManager {
 public:
-    EventManager(const EventManager&) = delete;
-    const EventManager& operator=(const EventManager&) = delete;
-    static EventManager& getInstance() {
-        static EventManager instance;
-        return instance;
-    }
+	EventManager(const EventManager &) = delete;
+	const EventManager & operator=(const EventManager &) = delete;
+	static EventManager & getInstance() {
+		static EventManager instance;
+		return instance;
+	}
 
-    void shutdown();
-    void subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper>&& handler, int eventId);
-    void unsubscribe(int eventType, const std::string& handlerName, int eventId);
-    void triggerEvent(const Event& event_, int eventId);
-    void queueEvent(std::unique_ptr<Event>&& event_, int eventId);
-    void dispatchEvents();
+	void shutdown();
+	void subscribe(int eventType,
+				   std::unique_ptr<IEventHandlerWrapper> && handler,
+				   int eventId);
+	void unsubscribe(int eventType, const std::string & handlerName,
+					 int eventId);
+	void triggerEvent(const Event & event_, int eventId);
+	void queueEvent(std::unique_ptr<Event> && event_, int eventId);
+	void dispatchEvents();
 
 private:
-    EventManager() = default;
-    std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue;
-    std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> m_subscribers;
-    std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>> m_subscribersByEventId;
+	EventManager() = default;
+	std::vector<std::pair<std::unique_ptr<Event>, int>> m_eventsQueue;
+	std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>
+		m_subscribers;
+	std::unordered_map<
+		int, std::unordered_map<
+				 int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>
+		m_subscribersByEventId;
 };
 
-
-template<typename EventType>
-inline void subscribe(const EventHandler<EventType>& callback, int eventId = 0, const bool unsubscribeOnSuccess = false)
-{
-    std::unique_ptr<IEventHandlerWrapper> handler = std::make_unique<EventHandlerWrapper<EventType>>(callback, unsubscribeOnSuccess);
-    EventManager::getInstance().subscribe(EventType::getStaticEventType(), std::move(handler), eventId);
+template <typename EventType>
+inline void subscribe(const EventHandler<EventType> & callback, int eventId = 0,
+					  const bool unsubscribeOnSuccess = false) {
+	std::unique_ptr<IEventHandlerWrapper> handler
+		= std::make_unique<EventHandlerWrapper<EventType>>(
+			callback, unsubscribeOnSuccess);
+	EventManager::getInstance().subscribe(EventType::getStaticEventType(),
+										  std::move(handler), eventId);
 }
 
-template<typename EventType>
-inline void unsubscribe(const EventHandler<EventType>& callback, int eventId = 0)
-{
-    const std::string handlerName = callback.target_type().name();
-    EventManager::getInstance().unsubscribe(EventType::getStaticEventType(), handlerName, eventId);
+template <typename EventType>
+inline void unsubscribe(const EventHandler<EventType> & callback,
+						int eventId = 0) {
+	const std::string handlerName = callback.target_type().name();
+	EventManager::getInstance().unsubscribe(EventType::getStaticEventType(),
+											handlerName, eventId);
 }
 
-inline void triggerEvent(const Event& triggeredEvent, int eventId = 0)
-{
-    EventManager::getInstance().triggerEvent(triggeredEvent, eventId);
+inline void triggerEvent(const Event & triggeredEvent, int eventId = 0) {
+	EventManager::getInstance().triggerEvent(triggeredEvent, eventId);
 }
 
-inline void queueEvent(std::unique_ptr<Event>&& queuedEvent, int eventId = 0)
-{
-    EventManager::getInstance().queueEvent(std::forward<std::unique_ptr<Event>>(queuedEvent), eventId);
+inline void queueEvent(std::unique_ptr<Event> && queuedEvent, int eventId = 0) {
+	EventManager::getInstance().queueEvent(
+		std::forward<std::unique_ptr<Event>>(queuedEvent), eventId);
 }
diff --git a/mwe/events/include/keyCodes.h b/mwe/events/include/keyCodes.h
index c3a7826..0879efc 100644
--- a/mwe/events/include/keyCodes.h
+++ b/mwe/events/include/keyCodes.h
@@ -1,140 +1,140 @@
 #pragma once
+#include <SDL2/SDL.h>
 #include <cstdint>
 #include <unordered_map>
-#include <SDL2/SDL.h>
 using Keycode = uint16_t;
 enum : Keycode {
-    // From glfw3.h
-    Space = 32,
-    Apostrophe = 39, /* ' */
-    Comma = 44,      /* , */
-    Minus = 45,      /* - */
-    Period = 46,     /* . */
-    Slash = 47,      /* / */
+	// From glfw3.h
+	Space = 32,
+	Apostrophe = 39, /* ' */
+	Comma = 44, /* , */
+	Minus = 45, /* - */
+	Period = 46, /* . */
+	Slash = 47, /* / */
 
-    D0 = 48, /* 0 */
-    D1 = 49, /* 1 */
-    D2 = 50, /* 2 */
-    D3 = 51, /* 3 */
-    D4 = 52, /* 4 */
-    D5 = 53, /* 5 */
-    D6 = 54, /* 6 */
-    D7 = 55, /* 7 */
-    D8 = 56, /* 8 */
-    D9 = 57, /* 9 */
+	D0 = 48, /* 0 */
+	D1 = 49, /* 1 */
+	D2 = 50, /* 2 */
+	D3 = 51, /* 3 */
+	D4 = 52, /* 4 */
+	D5 = 53, /* 5 */
+	D6 = 54, /* 6 */
+	D7 = 55, /* 7 */
+	D8 = 56, /* 8 */
+	D9 = 57, /* 9 */
 
-    Semicolon = 59, /* ; */
-    Equal = 61,     /* = */
+	Semicolon = 59, /* ; */
+	Equal = 61, /* = */
 
-    A = 65,
-    B = 66,
-    C = 67,
-    D = 68,
-    E = 69,
-    F = 70,
-    G = 71,
-    H = 72,
-    I = 73,
-    J = 74,
-    K = 75,
-    L = 76,
-    M = 77,
-    N = 78,
-    O = 79,
-    P = 80,
-    Q = 81,
-    R = 82,
-    S = 83,
-    T = 84,
-    U = 85,
-    V = 86,
-    W = 87,
-    X = 88,
-    Y = 89,
-    Z = 90,
+	A = 65,
+	B = 66,
+	C = 67,
+	D = 68,
+	E = 69,
+	F = 70,
+	G = 71,
+	H = 72,
+	I = 73,
+	J = 74,
+	K = 75,
+	L = 76,
+	M = 77,
+	N = 78,
+	O = 79,
+	P = 80,
+	Q = 81,
+	R = 82,
+	S = 83,
+	T = 84,
+	U = 85,
+	V = 86,
+	W = 87,
+	X = 88,
+	Y = 89,
+	Z = 90,
 
-    LeftBracket = 91,  /* [ */
-    Backslash = 92,    /* \ */
-    RightBracket = 93, /* ] */
-    GraveAccent = 96,  /* ` */
+	LeftBracket = 91, /* [ */
+	Backslash = 92, /* \ */
+	RightBracket = 93, /* ] */
+	GraveAccent = 96, /* ` */
 
-    World1 = 161, /* non-US #1 */
-    World2 = 162, /* non-US #2 */
+	World1 = 161, /* non-US #1 */
+	World2 = 162, /* non-US #2 */
 
-    /* Function keys */
-    Escape = 256,
-    Enter = 257,
-    Tab = 258,
-    Backspace = 259,
-    Insert = 260,
-    Delete = 261,
-    Right = 262,
-    Left = 263,
-    Down = 264,
-    Up = 265,
-    PageUp = 266,
-    PageDown = 267,
-    Home = 268,
-    End = 269,
-    CapsLock = 280,
-    ScrollLock = 281,
-    NumLock = 282,
-    PrintScreen = 283,
-    Pause = 284,
-    F1 = 290,
-    F2 = 291,
-    F3 = 292,
-    F4 = 293,
-    F5 = 294,
-    F6 = 295,
-    F7 = 296,
-    F8 = 297,
-    F9 = 298,
-    F10 = 299,
-    F11 = 300,
-    F12 = 301,
-    F13 = 302,
-    F14 = 303,
-    F15 = 304,
-    F16 = 305,
-    F17 = 306,
-    F18 = 307,
-    F19 = 308,
-    F20 = 309,
-    F21 = 310,
-    F22 = 311,
-    F23 = 312,
-    F24 = 313,
-    F25 = 314,
+	/* Function keys */
+	Escape = 256,
+	Enter = 257,
+	Tab = 258,
+	Backspace = 259,
+	Insert = 260,
+	Delete = 261,
+	Right = 262,
+	Left = 263,
+	Down = 264,
+	Up = 265,
+	PageUp = 266,
+	PageDown = 267,
+	Home = 268,
+	End = 269,
+	CapsLock = 280,
+	ScrollLock = 281,
+	NumLock = 282,
+	PrintScreen = 283,
+	Pause = 284,
+	F1 = 290,
+	F2 = 291,
+	F3 = 292,
+	F4 = 293,
+	F5 = 294,
+	F6 = 295,
+	F7 = 296,
+	F8 = 297,
+	F9 = 298,
+	F10 = 299,
+	F11 = 300,
+	F12 = 301,
+	F13 = 302,
+	F14 = 303,
+	F15 = 304,
+	F16 = 305,
+	F17 = 306,
+	F18 = 307,
+	F19 = 308,
+	F20 = 309,
+	F21 = 310,
+	F22 = 311,
+	F23 = 312,
+	F24 = 313,
+	F25 = 314,
 
-    /* Keypad */
-    KP0 = 320,
-    KP1 = 321,
-    KP2 = 322,
-    KP3 = 323,
-    KP4 = 324,
-    KP5 = 325,
-    KP6 = 326,
-    KP7 = 327,
-    KP8 = 328,
-    KP9 = 329,
-    KPDecimal = 330,
-    KPDivide = 331,
-    KPMultiply = 332,
-    KPSubtract = 333,
-    KPAdd = 334,
-    KPEnter = 335,
-    KPEqual = 336,
+	/* Keypad */
+	KP0 = 320,
+	KP1 = 321,
+	KP2 = 322,
+	KP3 = 323,
+	KP4 = 324,
+	KP5 = 325,
+	KP6 = 326,
+	KP7 = 327,
+	KP8 = 328,
+	KP9 = 329,
+	KPDecimal = 330,
+	KPDivide = 331,
+	KPMultiply = 332,
+	KPSubtract = 333,
+	KPAdd = 334,
+	KPEnter = 335,
+	KPEqual = 336,
 
-    LeftShift = 340,
-    LeftControl = 341,
-    LeftAlt = 342,
-    LeftSuper = 343,
-    RightShift = 344,
-    RightControl = 345,
-    RightAlt = 346,
-    RightSuper = 347,
-    Menu = 348
+	LeftShift = 340,
+	LeftControl = 341,
+	LeftAlt = 342,
+	LeftSuper = 343,
+	RightShift = 344,
+	RightControl = 345,
+	RightAlt = 346,
+	RightSuper = 347,
+	Menu = 348
 };
 // Define the mapping
 extern const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom;
diff --git a/mwe/events/include/loopManager.h b/mwe/events/include/loopManager.h
index 5c519d9..baffb94 100644
--- a/mwe/events/include/loopManager.h
+++ b/mwe/events/include/loopManager.h
@@ -1,17 +1,18 @@
 #pragma once
+#include "timer.h"
 #include "window.h"
 #include <SDL2/SDL.h>
-#include "timer.h"
 //#include "combinedEvent.h"
+#include "eventHandler.h"
 #include "eventManager.h"
 #include "loopManager.h"
-#include "eventHandler.h"
 class LoopManager {
 public:
 	LoopManager();
 	void setup();
 	void loop();
 	void setRunning(bool running);
+
 private:
 	void processInput();
 	void update();
diff --git a/mwe/events/src/event.cpp b/mwe/events/src/event.cpp
index fecae76..c0ae9ed 100644
--- a/mwe/events/src/event.cpp
+++ b/mwe/events/src/event.cpp
@@ -1,56 +1,44 @@
 #include "event.h"
 #include "keyCodes.h"
 // Event class methods
-Event::Event(std::string eventType) {
-    eventData["eventType"] = eventType;
-}
+Event::Event(std::string eventType) { eventData["eventType"] = eventType; }
 
-void Event::addArgument(const std::string& key, const std::variant<int, std::string, float>& value) {
-    eventData[key] = value;
+void Event::addArgument(const std::string & key,
+						const std::variant<int, std::string, float> & value) {
+	eventData[key] = value;
 }
 
-std::variant<int, std::string, float> Event::getArgument(const std::string& key) const {
-    return eventData.at(key);
+std::variant<int, std::string, float>
+Event::getArgument(const std::string & key) const {
+	return eventData.at(key);
 }
 
 std::string Event::getType() const {
-    return std::get<std::string>(eventData.at("eventType"));
-}
-std::string Event::toString() const {
-    return std::to_string(getEventType());
-}
-bool Event::getHandled() const {
-    return isHandled;
+	return std::get<std::string>(eventData.at("eventType"));
 }
+std::string Event::toString() const { return std::to_string(getEventType()); }
+bool Event::getHandled() const { return isHandled; }
 
-void Event::markHandled() {
-    isHandled = true;
-}
+void Event::markHandled() { isHandled = true; }
 
 // KeyPressedEvent class methods
 KeyPressedEvent::KeyPressedEvent(int keycode)
-    : Event("KeyPressedEvent"), key(keycode), repeatCount(0) {}
+	: Event("KeyPressedEvent"), key(keycode), repeatCount(0) {}
 
-Keycode KeyPressedEvent::getKeyCode() const {
-    return key;
-}
+Keycode KeyPressedEvent::getKeyCode() const { return key; }
 
-int KeyPressedEvent::getRepeatCount() const {
-    return repeatCount;
-}
+int KeyPressedEvent::getRepeatCount() const { return repeatCount; }
 
 // KeyReleasedEvent class methods
 KeyReleasedEvent::KeyReleasedEvent(int keycode)
-    : Event("KeyReleasedEvent"), key(keycode) {}
+	: Event("KeyReleasedEvent"), key(keycode) {}
 
-Keycode KeyReleasedEvent::getKeyCode() const {
-    return key;
-}
+Keycode KeyReleasedEvent::getKeyCode() const { return key; }
 
 // MousePressedEvent class methods
 MousePressedEvent::MousePressedEvent(int mouseX, int mouseY)
-    : Event("MousePressedEvent"), mouseX(mouseX), mouseY(mouseY) {}
+	: Event("MousePressedEvent"), mouseX(mouseX), mouseY(mouseY) {}
 
 std::pair<int, int> MousePressedEvent::getMousePosition() const {
-    return {mouseX, mouseY};
+	return {mouseX, mouseY};
 }
diff --git a/mwe/events/src/eventHandler.cpp b/mwe/events/src/eventHandler.cpp
index 7040d8d..7fb8d70 100644
--- a/mwe/events/src/eventHandler.cpp
+++ b/mwe/events/src/eventHandler.cpp
@@ -1,5 +1,2 @@
 #include "eventHandler.h"
-void  IEventHandlerWrapper::exec(const Event& e)
-    {
-        call(e);
-    }
+void IEventHandlerWrapper::exec(const Event & e) { call(e); }
diff --git a/mwe/events/src/eventManager.cpp b/mwe/events/src/eventManager.cpp
index ce8e940..2aef89d 100644
--- a/mwe/events/src/eventManager.cpp
+++ b/mwe/events/src/eventManager.cpp
@@ -1,109 +1,152 @@
 #include "eventManager.h"
 
-void EventManager::shutdown()
-{
-    m_subscribers.clear();
-}
+void EventManager::shutdown() { m_subscribers.clear(); }
 
-void EventManager::subscribe(int eventType, std::unique_ptr<IEventHandlerWrapper>&& handler, int eventId)
-{
-    if (eventId) {
-        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
+void EventManager::subscribe(int eventType,
+							 std::unique_ptr<IEventHandlerWrapper> && handler,
+							 int eventId) {
+	if (eventId) {
+		std::unordered_map<
+			int, std::unordered_map<
+					 int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::
+			iterator subscribers
+			= m_subscribersByEventId.find(eventType);
 
-        if (subscribers != m_subscribersByEventId.end()) {
-            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
-            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
-            if (handlers != handlersMap.end()) {
-                handlers->second.emplace_back(std::move(handler));
-                return;
-            }
-        }
-        m_subscribersByEventId[eventType][eventId].emplace_back(std::move(handler));
+		if (subscribers != m_subscribersByEventId.end()) {
+			std::unordered_map<
+				int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> &
+				handlersMap
+				= subscribers->second;
+			std::unordered_map<
+				int,
+				std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+				handlers
+				= handlersMap.find(eventId);
+			if (handlers != handlersMap.end()) {
+				handlers->second.emplace_back(std::move(handler));
+				return;
+			}
+		}
+		m_subscribersByEventId[eventType][eventId].emplace_back(
+			std::move(handler));
 
-    } else {
-        std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator subscribers = m_subscribers.find(eventType);
-        if (subscribers != m_subscribers.end()) {
-            std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = subscribers->second;
-            for (std::unique_ptr<IEventHandlerWrapper>& it : handlers) {
-                if (it->getType() == handler->getType()) {
-                    // log for double register
-                    return;
-                }
-            }
-            handlers.emplace_back(std::move(handler));
-        } else {
-            m_subscribers[eventType].emplace_back(std::move(handler));
-        }
-    }
+	} else {
+		std::unordered_map<
+			int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+			subscribers
+			= m_subscribers.find(eventType);
+		if (subscribers != m_subscribers.end()) {
+			std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+				= subscribers->second;
+			for (std::unique_ptr<IEventHandlerWrapper> & it : handlers) {
+				if (it->getType() == handler->getType()) {
+					// log for double register
+					return;
+				}
+			}
+			handlers.emplace_back(std::move(handler));
+		} else {
+			m_subscribers[eventType].emplace_back(std::move(handler));
+		}
+	}
 }
 
-void EventManager::unsubscribe(int eventType, const std::string& handlerName, int eventId)
-{
-    if (eventId) {
-        std::unordered_map<int, std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::iterator subscribers = m_subscribersByEventId.find(eventType);
-        if (subscribers != m_subscribersByEventId.end()) {
-            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = subscribers->second;
-            std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlers = handlersMap.find(eventId);
-            if (handlers != handlersMap.end()) {
-                std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlers->second;
-                for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = callbacks.begin(); it != callbacks.end(); ++it) {
-                    if (it->get()->getType() == handlerName) {
-                        it = callbacks.erase(it);
-                        return;
-                    }
-                }
-            }
-        }
-    } else {
-        std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = m_subscribers.find(eventType);
-        if (handlersIt != m_subscribers.end()) {
-            std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = handlersIt->second;
-            for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = handlers.begin(); it != handlers.end(); ++it) {
-                if (it->get()->getType() == handlerName) {
-                    it = handlers.erase(it);
-                    return;
-                }
-            }
-        }
-    }
+void EventManager::unsubscribe(int eventType, const std::string & handlerName,
+							   int eventId) {
+	if (eventId) {
+		std::unordered_map<
+			int, std::unordered_map<
+					 int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>>::
+			iterator subscribers
+			= m_subscribersByEventId.find(eventType);
+		if (subscribers != m_subscribersByEventId.end()) {
+			std::unordered_map<
+				int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> &
+				handlersMap
+				= subscribers->second;
+			std::unordered_map<
+				int,
+				std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+				handlers
+				= handlersMap.find(eventId);
+			if (handlers != handlersMap.end()) {
+				std::vector<std::unique_ptr<IEventHandlerWrapper>> & callbacks
+					= handlers->second;
+				for (std::vector<
+						 std::unique_ptr<IEventHandlerWrapper>>::iterator it
+					 = callbacks.begin();
+					 it != callbacks.end(); ++it) {
+					if (it->get()->getType() == handlerName) {
+						it = callbacks.erase(it);
+						return;
+					}
+				}
+			}
+		}
+	} else {
+		std::unordered_map<
+			int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+			handlersIt
+			= m_subscribers.find(eventType);
+		if (handlersIt != m_subscribers.end()) {
+			std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+				= handlersIt->second;
+			for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it
+				 = handlers.begin();
+				 it != handlers.end(); ++it) {
+				if (it->get()->getType() == handlerName) {
+					it = handlers.erase(it);
+					return;
+				}
+			}
+		}
+	}
 }
 
-void EventManager::triggerEvent(const Event& event_, int eventId)
-{
-    std::vector<std::unique_ptr<IEventHandlerWrapper>>& handlers = m_subscribers[event_.getEventType()];
-    for (std::unique_ptr<IEventHandlerWrapper>& handler : handlers) {
-        handler->exec(event_);
-    }
+void EventManager::triggerEvent(const Event & event_, int eventId) {
+	std::vector<std::unique_ptr<IEventHandlerWrapper>> & handlers
+		= m_subscribers[event_.getEventType()];
+	for (std::unique_ptr<IEventHandlerWrapper> & handler : handlers) {
+		handler->exec(event_);
+	}
 
-    std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>& handlersMap = m_subscribersByEventId[event_.getEventType()];
-    std::unordered_map<int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator handlersIt = handlersMap.find(eventId);
-    if (handlersIt != handlersMap.end()) {
-        std::vector<std::unique_ptr<IEventHandlerWrapper>>& callbacks = handlersIt->second;
-        for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it = callbacks.begin(); it != callbacks.end();) {
-            std::unique_ptr<IEventHandlerWrapper>& handler = *it;
-            handler->exec(event_);
-            if (handler->isDestroyOnSuccess()) {
-                it = callbacks.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
+	std::unordered_map<
+		int, std::vector<std::unique_ptr<IEventHandlerWrapper>>> & handlersMap
+		= m_subscribersByEventId[event_.getEventType()];
+	std::unordered_map<
+		int, std::vector<std::unique_ptr<IEventHandlerWrapper>>>::iterator
+		handlersIt
+		= handlersMap.find(eventId);
+	if (handlersIt != handlersMap.end()) {
+		std::vector<std::unique_ptr<IEventHandlerWrapper>> & callbacks
+			= handlersIt->second;
+		for (std::vector<std::unique_ptr<IEventHandlerWrapper>>::iterator it
+			 = callbacks.begin();
+			 it != callbacks.end();) {
+			std::unique_ptr<IEventHandlerWrapper> & handler = *it;
+			handler->exec(event_);
+			if (handler->isDestroyOnSuccess()) {
+				it = callbacks.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
 }
 
-void EventManager::queueEvent(std::unique_ptr<Event>&& event_, int eventId)
-{
-    m_eventsQueue.emplace_back(std::move(event_), eventId);
+void EventManager::queueEvent(std::unique_ptr<Event> && event_, int eventId) {
+	m_eventsQueue.emplace_back(std::move(event_), eventId);
 }
 
-void EventManager::dispatchEvents()
-{
-    for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt = m_eventsQueue.begin(); eventIt != m_eventsQueue.end();) {
-        if (!eventIt->first.get()->getHandled()) {
-            triggerEvent(*eventIt->first.get(), eventIt->second);
-            eventIt = m_eventsQueue.erase(eventIt);
-        } else {
-            ++eventIt;
-        }
-    }
+void EventManager::dispatchEvents() {
+	for (std::vector<std::pair<std::unique_ptr<Event>, int>>::iterator eventIt
+		 = m_eventsQueue.begin();
+		 eventIt != m_eventsQueue.end();) {
+		if (!eventIt->first.get()->getHandled()) {
+			triggerEvent(*eventIt->first.get(), eventIt->second);
+			eventIt = m_eventsQueue.erase(eventIt);
+		} else {
+			++eventIt;
+		}
+	}
 }
diff --git a/mwe/events/src/keyCodes.cpp b/mwe/events/src/keyCodes.cpp
index 6f35d11..5f3aa96 100644
--- a/mwe/events/src/keyCodes.cpp
+++ b/mwe/events/src/keyCodes.cpp
@@ -1,140 +1,139 @@
 #include "keyCodes.h"
 
-const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom = {
-    { SDLK_SPACE, Space },
-    { SDLK_QUOTE, Apostrophe },
-    { SDLK_COMMA, Comma },
-    { SDLK_MINUS, Minus },
-    { SDLK_PERIOD, Period },
-    { SDLK_SLASH, Slash },
+const std::unordered_map<SDL_Keycode, Keycode> sdlToCustom
+	= {{SDLK_SPACE, Space},
+	   {SDLK_QUOTE, Apostrophe},
+	   {SDLK_COMMA, Comma},
+	   {SDLK_MINUS, Minus},
+	   {SDLK_PERIOD, Period},
+	   {SDLK_SLASH, Slash},
 
-    { SDLK_0, D0 },
-    { SDLK_1, D1 },
-    { SDLK_2, D2 },
-    { SDLK_3, D3 },
-    { SDLK_4, D4 },
-    { SDLK_5, D5 },
-    { SDLK_6, D6 },
-    { SDLK_7, D7 },
-    { SDLK_8, D8 },
-    { SDLK_9, D9 },
+	   {SDLK_0, D0},
+	   {SDLK_1, D1},
+	   {SDLK_2, D2},
+	   {SDLK_3, D3},
+	   {SDLK_4, D4},
+	   {SDLK_5, D5},
+	   {SDLK_6, D6},
+	   {SDLK_7, D7},
+	   {SDLK_8, D8},
+	   {SDLK_9, D9},
 
-    { SDLK_SEMICOLON, Semicolon },
-    { SDLK_EQUALS, Equal },
+	   {SDLK_SEMICOLON, Semicolon},
+	   {SDLK_EQUALS, Equal},
 
-    { SDLK_a, A },
-    { SDLK_b, B },
-    { SDLK_c, C },
-    { SDLK_d, D },
-    { SDLK_e, E },
-    { SDLK_f, F },
-    { SDLK_g, G },
-    { SDLK_h, H },
-    { SDLK_i, I },
-    { SDLK_j, J },
-    { SDLK_k, K },
-    { SDLK_l, L },
-    { SDLK_m, M },
-    { SDLK_n, N },
-    { SDLK_o, O },
-    { SDLK_p, P },
-    { SDLK_q, Q },
-    { SDLK_r, R },
-    { SDLK_s, S },
-    { SDLK_t, T },
-    { SDLK_u, U },
-    { SDLK_v, V },
-    { SDLK_w, W },
-    { SDLK_x, X },
-    { SDLK_y, Y },
-    { SDLK_z, Z },
+	   {SDLK_a, A},
+	   {SDLK_b, B},
+	   {SDLK_c, C},
+	   {SDLK_d, D},
+	   {SDLK_e, E},
+	   {SDLK_f, F},
+	   {SDLK_g, G},
+	   {SDLK_h, H},
+	   {SDLK_i, I},
+	   {SDLK_j, J},
+	   {SDLK_k, K},
+	   {SDLK_l, L},
+	   {SDLK_m, M},
+	   {SDLK_n, N},
+	   {SDLK_o, O},
+	   {SDLK_p, P},
+	   {SDLK_q, Q},
+	   {SDLK_r, R},
+	   {SDLK_s, S},
+	   {SDLK_t, T},
+	   {SDLK_u, U},
+	   {SDLK_v, V},
+	   {SDLK_w, W},
+	   {SDLK_x, X},
+	   {SDLK_y, Y},
+	   {SDLK_z, Z},
 
-    { SDLK_LEFTBRACKET, LeftBracket },
-    { SDLK_BACKSLASH, Backslash },
-    { SDLK_RIGHTBRACKET, RightBracket },
-    { SDLK_BACKQUOTE, GraveAccent },
+	   {SDLK_LEFTBRACKET, LeftBracket},
+	   {SDLK_BACKSLASH, Backslash},
+	   {SDLK_RIGHTBRACKET, RightBracket},
+	   {SDLK_BACKQUOTE, GraveAccent},
 
-    { SDLK_ESCAPE, Escape },
-    { SDLK_RETURN, Enter },
-    { SDLK_TAB, Tab },
-    { SDLK_BACKSPACE, Backspace },
-    { SDLK_INSERT, Insert },
-    { SDLK_DELETE, Delete },
-    { SDLK_RIGHT, Right },
-    { SDLK_LEFT, Left },
-    { SDLK_DOWN, Down },
-    { SDLK_UP, Up },
-    { SDLK_PAGEUP, PageUp },
-    { SDLK_PAGEDOWN, PageDown },
-    { SDLK_HOME, Home },
-    { SDLK_END, End },
+	   {SDLK_ESCAPE, Escape},
+	   {SDLK_RETURN, Enter},
+	   {SDLK_TAB, Tab},
+	   {SDLK_BACKSPACE, Backspace},
+	   {SDLK_INSERT, Insert},
+	   {SDLK_DELETE, Delete},
+	   {SDLK_RIGHT, Right},
+	   {SDLK_LEFT, Left},
+	   {SDLK_DOWN, Down},
+	   {SDLK_UP, Up},
+	   {SDLK_PAGEUP, PageUp},
+	   {SDLK_PAGEDOWN, PageDown},
+	   {SDLK_HOME, Home},
+	   {SDLK_END, End},
 
-    { SDLK_CAPSLOCK, CapsLock },
-    { SDLK_SCROLLLOCK, ScrollLock },
-    { SDLK_NUMLOCKCLEAR, NumLock },
-    { SDLK_PRINTSCREEN, PrintScreen },
-    { SDLK_PAUSE, Pause },
+	   {SDLK_CAPSLOCK, CapsLock},
+	   {SDLK_SCROLLLOCK, ScrollLock},
+	   {SDLK_NUMLOCKCLEAR, NumLock},
+	   {SDLK_PRINTSCREEN, PrintScreen},
+	   {SDLK_PAUSE, Pause},
 
-    { SDLK_F1, F1 },
-    { SDLK_F2, F2 },
-    { SDLK_F3, F3 },
-    { SDLK_F4, F4 },
-    { SDLK_F5, F5 },
-    { SDLK_F6, F6 },
-    { SDLK_F7, F7 },
-    { SDLK_F8, F8 },
-    { SDLK_F9, F9 },
-    { SDLK_F10, F10 },
-    { SDLK_F11, F11 },
-    { SDLK_F12, F12 },
-    { SDLK_F13, F13 },
-    { SDLK_F14, F14 },
-    { SDLK_F15, F15 },
-    { SDLK_F16, F16 },
-    { SDLK_F17, F17 },
-    { SDLK_F18, F18 },
-    { SDLK_F19, F19 },
-    { SDLK_F20, F20 },
-    { SDLK_F21, F21 },
-    { SDLK_F22, F22 },
-    { SDLK_F23, F23 },
-    { SDLK_F24, F24 },
+	   {SDLK_F1, F1},
+	   {SDLK_F2, F2},
+	   {SDLK_F3, F3},
+	   {SDLK_F4, F4},
+	   {SDLK_F5, F5},
+	   {SDLK_F6, F6},
+	   {SDLK_F7, F7},
+	   {SDLK_F8, F8},
+	   {SDLK_F9, F9},
+	   {SDLK_F10, F10},
+	   {SDLK_F11, F11},
+	   {SDLK_F12, F12},
+	   {SDLK_F13, F13},
+	   {SDLK_F14, F14},
+	   {SDLK_F15, F15},
+	   {SDLK_F16, F16},
+	   {SDLK_F17, F17},
+	   {SDLK_F18, F18},
+	   {SDLK_F19, F19},
+	   {SDLK_F20, F20},
+	   {SDLK_F21, F21},
+	   {SDLK_F22, F22},
+	   {SDLK_F23, F23},
+	   {SDLK_F24, F24},
 
-    { SDLK_KP_0, KP0 },
-    { SDLK_KP_1, KP1 },
-    { SDLK_KP_2, KP2 },
-    { SDLK_KP_3, KP3 },
-    { SDLK_KP_4, KP4 },
-    { SDLK_KP_5, KP5 },
-    { SDLK_KP_6, KP6 },
-    { SDLK_KP_7, KP7 },
-    { SDLK_KP_8, KP8 },
-    { SDLK_KP_9, KP9 },
+	   {SDLK_KP_0, KP0},
+	   {SDLK_KP_1, KP1},
+	   {SDLK_KP_2, KP2},
+	   {SDLK_KP_3, KP3},
+	   {SDLK_KP_4, KP4},
+	   {SDLK_KP_5, KP5},
+	   {SDLK_KP_6, KP6},
+	   {SDLK_KP_7, KP7},
+	   {SDLK_KP_8, KP8},
+	   {SDLK_KP_9, KP9},
 
-    { SDLK_KP_DECIMAL, KPDecimal },
-    { SDLK_KP_DIVIDE, KPDivide },
-    { SDLK_KP_MULTIPLY, KPMultiply },
-    { SDLK_KP_MINUS, KPSubtract },
-    { SDLK_KP_PLUS, KPAdd },
-    { SDLK_KP_ENTER, KPEnter },
-    { SDLK_KP_EQUALS, KPEqual },
+	   {SDLK_KP_DECIMAL, KPDecimal},
+	   {SDLK_KP_DIVIDE, KPDivide},
+	   {SDLK_KP_MULTIPLY, KPMultiply},
+	   {SDLK_KP_MINUS, KPSubtract},
+	   {SDLK_KP_PLUS, KPAdd},
+	   {SDLK_KP_ENTER, KPEnter},
+	   {SDLK_KP_EQUALS, KPEqual},
 
-    { SDLK_LSHIFT, LeftShift },
-    { SDLK_LCTRL, LeftControl },
-    { SDLK_LALT, LeftAlt },
-    { SDLK_LGUI, LeftSuper },
+	   {SDLK_LSHIFT, LeftShift},
+	   {SDLK_LCTRL, LeftControl},
+	   {SDLK_LALT, LeftAlt},
+	   {SDLK_LGUI, LeftSuper},
 
-    { SDLK_RSHIFT, RightShift },
-    { SDLK_RCTRL, RightControl },
-    { SDLK_RALT, RightAlt },
-    { SDLK_RGUI, RightSuper },
+	   {SDLK_RSHIFT, RightShift},
+	   {SDLK_RCTRL, RightControl},
+	   {SDLK_RALT, RightAlt},
+	   {SDLK_RGUI, RightSuper},
 
-    { SDLK_MENU, Menu }
-};
+	   {SDLK_MENU, Menu}};
 Keycode getCustomKey(SDL_Keycode sdlKey) {
-    auto it = sdlToCustom.find(sdlKey);
-    if (it != sdlToCustom.end()) {
-        return it->second;
-    }
-    return 0;
+	auto it = sdlToCustom.find(sdlKey);
+	if (it != sdlToCustom.end()) {
+		return it->second;
+	}
+	return 0;
 }
diff --git a/mwe/events/src/loopManager.cpp b/mwe/events/src/loopManager.cpp
index 6defda0..8ecb932 100644
--- a/mwe/events/src/loopManager.cpp
+++ b/mwe/events/src/loopManager.cpp
@@ -12,17 +12,15 @@ void LoopManager::processInput() {
 			triggerEvent(KeyPressedEvent(getCustomKey(event.key.keysym.sym)));
 			break;
 		case SDL_MOUSEBUTTONDOWN:
-            int x, y;
-            SDL_GetMouseState(&x, &y); 
-            triggerEvent(MousePressedEvent(x, y)); 
-            break;
+			int x, y;
+			SDL_GetMouseState(&x, &y);
+			triggerEvent(MousePressedEvent(x, y));
+			break;
 	}
 }
-void LoopManager::setRunning(bool running){
-	this->gameRunning = running;
-}
-void LoopManager::fixedUpdate() { 
-	//fprintf(stderr, "fixed update\n"); 
+void LoopManager::setRunning(bool running) { this->gameRunning = running; }
+void LoopManager::fixedUpdate() {
+	//fprintf(stderr, "fixed update\n");
 }
 void LoopManager::loop() {
 	LoopTimer & timer = LoopTimer::getInstance();
@@ -45,30 +43,29 @@ void LoopManager::loop() {
 
 	window.destroyWindow();
 }
-void onKey(const KeyPressedEvent& e)
-{
-   	int keyCode = e.getKeyCode();
+void onKey(const KeyPressedEvent & e) {
+	int keyCode = e.getKeyCode();
 	std::cout << "keycode pressed: " << keyCode << std::endl;
-
 }
-void onMouse(const MousePressedEvent& e){
-		fprintf(stderr, "mouse Position X: %d Y: %d\n", e.getMousePosition().first, e.getMousePosition().second);
+void onMouse(const MousePressedEvent & e) {
+	fprintf(stderr, "mouse Position X: %d Y: %d\n", e.getMousePosition().first,
+			e.getMousePosition().second);
 }
 void LoopManager::setup() {
 	gameRunning = window.initWindow();
 	LoopTimer::getInstance().start();
 	LoopTimer::getInstance().setFPS(50);
 	EventHandler<KeyPressedEvent> callback = onKey;
-    subscribe<KeyPressedEvent>(callback,false);
+	subscribe<KeyPressedEvent>(callback, false);
 	EventHandler<MousePressedEvent> mouseCallback = onMouse;
-    subscribe<MousePressedEvent>(mouseCallback ,false);
-	EventHandler<KeyPressedEvent> closeWindowCallback = [this](const KeyPressedEvent& e) {
-		if(e.getKeyCode() == Escape){
-			this->setRunning(false);
-		}
-    };
-    subscribe<KeyPressedEvent>(closeWindowCallback,false);
-
+	subscribe<MousePressedEvent>(mouseCallback, false);
+	EventHandler<KeyPressedEvent> closeWindowCallback
+		= [this](const KeyPressedEvent & e) {
+			  if (e.getKeyCode() == Escape) {
+				  this->setRunning(false);
+			  }
+		  };
+	subscribe<KeyPressedEvent>(closeWindowCallback, false);
 }
 void LoopManager::render() {
 	//fprintf(stderr, "**********render********** \n");
diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp
index 3940c60..55c562f 100644
--- a/mwe/events/src/main.cpp
+++ b/mwe/events/src/main.cpp
@@ -1,50 +1,51 @@
+#include "event.h"
+#include "loopManager.h"
 #include <SDL2/SDL.h>
 #include <iostream>
 #include <memory>
-#include "loopManager.h"
-#include "event.h"
 
 class PlayerDamagedEvent : public Event {
 public:
-    PlayerDamagedEvent(int damage, int playerID)
-        : Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
+	PlayerDamagedEvent(int damage, int playerID)
+		: Event("PlayerDamaged"), damage(damage), playerID(playerID) {}
 
-    REGISTER_EVENT_TYPE(PlayerDamagedEvent);
+	REGISTER_EVENT_TYPE(PlayerDamagedEvent);
 
-    int getDamage() const { return damage; }
-    int getPlayerID() const { return playerID; }
+	int getDamage() const { return damage; }
+	int getPlayerID() const { return playerID; }
 
 private:
-    int damage;
-    int playerID;
+	int damage;
+	int playerID;
 };
-void onPlayerDamaged(const PlayerDamagedEvent& e) {
-    std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage() << " damage." << std::endl;
+void onPlayerDamaged(const PlayerDamagedEvent & e) {
+	std::cout << "Player " << e.getPlayerID() << " took " << e.getDamage()
+			  << " damage." << std::endl;
 }
 
-void onKeyPressed(const KeyPressedEvent& e)
-{
-   const int keyCode = e.getKeyCode();
-	fprintf(stderr,"KeyCode %d\n",keyCode);
+void onKeyPressed(const KeyPressedEvent & e) {
+	const int keyCode = e.getKeyCode();
+	fprintf(stderr, "KeyCode %d\n", keyCode);
 }
-int main(int argc, char* args[]) {
+int main(int argc, char * args[]) {
 	LoopManager gameLoop;
 	// Create an event handler for KeyPressedEvent
-    // EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
-    //     onKeyPressed(e);
-    // };
+	// EventHandler<KeyPressedEvent> callback = [](const KeyPressedEvent& e) {
+	//     onKeyPressed(e);
+	// };
 	// custom event class poc
 	EventHandler<PlayerDamagedEvent> playerDamagedHandler = onPlayerDamaged;
 	subscribe<PlayerDamagedEvent>(playerDamagedHandler);
 
 	triggerEvent(PlayerDamagedEvent(50, 1));
 	//EventHandler<KeyPressedEvent> callback = onKeyPressed;
-    //subscribe<KeyPressedEvent>(callback,false);
-	std::unique_ptr<Event> anotherKeyPressEvent = std::make_unique<KeyPressedEvent>(65);
-    queueEvent(std::move(anotherKeyPressEvent));
-    triggerEvent(KeyPressedEvent(42));
+	//subscribe<KeyPressedEvent>(callback,false);
+	std::unique_ptr<Event> anotherKeyPressEvent
+		= std::make_unique<KeyPressedEvent>(65);
+	queueEvent(std::move(anotherKeyPressEvent));
+	triggerEvent(KeyPressedEvent(42));
 	EventManager::getInstance().dispatchEvents();
 	gameLoop.setup();
 	gameLoop.loop();
-    return 0;
+	return 0;
 }
diff --git a/mwe/events/src/timer.cpp b/mwe/events/src/timer.cpp
index f4fee23..0b89bf5 100644
--- a/mwe/events/src/timer.cpp
+++ b/mwe/events/src/timer.cpp
@@ -16,8 +16,7 @@ void LoopTimer::start() {
 // Update the timer, calculate deltaTime
 void LoopTimer::update() {
 	uint64_t currentFrameTime = SDL_GetTicks64();
-	deltaTime
-		= (currentFrameTime - lastFrameTime) / 1000.0;
+	deltaTime = (currentFrameTime - lastFrameTime) / 1000.0;
 
 	if (deltaTime > maximumDeltaTime) {
 		deltaTime = maximumDeltaTime;
diff --git a/mwe/events/src/window.cpp b/mwe/events/src/window.cpp
index 9cafd57..41eb85f 100644
--- a/mwe/events/src/window.cpp
+++ b/mwe/events/src/window.cpp
@@ -1,6 +1,5 @@
 #include "window.h"
-WindowManager::WindowManager() {
-}
+WindowManager::WindowManager() {}
 WindowManager::~WindowManager() { destroyWindow(); }
 SDL_Renderer * WindowManager::getRenderer() { return renderer; }
 
diff --git a/mwe/gameloop/include/eventManager.h b/mwe/gameloop/include/eventManager.h
index ba1ca32..a1b9f92 100644
--- a/mwe/gameloop/include/eventManager.h
+++ b/mwe/gameloop/include/eventManager.h
@@ -1,5 +1,5 @@
 #pragma once
 class EventManager {
-	public:
-		EventManager();
+public:
+	EventManager();
 };
diff --git a/mwe/gameloop/include/loopManager.h b/mwe/gameloop/include/loopManager.h
index dcbfedc..1befb69 100644
--- a/mwe/gameloop/include/loopManager.h
+++ b/mwe/gameloop/include/loopManager.h
@@ -1,8 +1,8 @@
 #pragma once
+#include "event.h"
 #include "gameObject.h"
 #include "window.h"
 #include <SDL2/SDL.h>
-#include "event.h"
 class LoopManager {
 public:
 	LoopManager();
diff --git a/src/crepe/api/AssetManager.h b/src/crepe/api/AssetManager.h
index a53ace5..3e72a49 100644
--- a/src/crepe/api/AssetManager.h
+++ b/src/crepe/api/AssetManager.h
@@ -26,10 +26,10 @@ public:
 
 public:
 	template <typename asset>
-	std::shared_ptr<asset> cache(const std::string & file_path, bool reload = false);
+	std::shared_ptr<asset> cache(const std::string & file_path,
+								 bool reload = false);
 };
 
 } // namespace crepe::api
 
 #include "AssetManager.hpp"
-
diff --git a/src/crepe/api/AssetManager.hpp b/src/crepe/api/AssetManager.hpp
index 083fd9d..468724c 100644
--- a/src/crepe/api/AssetManager.hpp
+++ b/src/crepe/api/AssetManager.hpp
@@ -5,7 +5,8 @@
 namespace crepe::api {
 
 template <typename asset>
-std::shared_ptr<asset> AssetManager::cache(const std::string & file_path, bool reload) {
+std::shared_ptr<asset> AssetManager::cache(const std::string & file_path,
+										   bool reload) {
 	auto it = asset_cache.find(file_path);
 
 	if (!reload && it != asset_cache.end()) {
diff --git a/src/crepe/api/Color.h b/src/crepe/api/Color.h
index 36d91ef..e818de4 100644
--- a/src/crepe/api/Color.h
+++ b/src/crepe/api/Color.h
@@ -6,6 +6,7 @@ class Color {
 
 	// FIXME: can't these colors be defined as a `static constexpr const Color`
 	// instead?
+
 public:
 	Color(double red, double green, double blue, double alpha);
 	static const Color & get_white();
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index 24b5529..8a7f268 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -7,6 +7,7 @@ namespace crepe::api {
 class Config {
 private:
 	Config() = default;
+
 public:
 	~Config() = default;
 
@@ -36,5 +37,4 @@ public:
 	} log;
 };
 
-}
-
+} // namespace crepe::api
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index c17ae34..c69ec61 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -12,6 +12,7 @@ class Transform : public Component {
 	// FIXME: What's the difference between the `Point` and `Position`
 	// classes/structs? How about we replace both with a universal `Vec2` that
 	// works similar (or the same) as those found in GLSL?
+
 public:
 	Transform(uint32_t id, Point &, double, double);
 	~Transform();
diff --git a/src/crepe/util/color.cpp b/src/crepe/util/color.cpp
index bdf5809..a7bbc81 100644
--- a/src/crepe/util/color.cpp
+++ b/src/crepe/util/color.cpp
@@ -1,8 +1,8 @@
 #include <cstdarg>
 
+#include "../api/Config.h"
 #include "color.h"
 #include "fmt.h"
-#include "../api/Config.h"
 
 using namespace crepe::util;
 using namespace std;
@@ -41,20 +41,51 @@ LogColor & LogColor::reset() {
 	return *this;
 }
 
-LogColor & LogColor::fg_black(bool bright) { return this->add_code(bright ? 90 : 30); }
-LogColor & LogColor::fg_red(bool bright) { return this->add_code(bright ? 91 : 31); }
-LogColor & LogColor::fg_green(bool bright) { return this->add_code(bright ? 92 : 32); }
-LogColor & LogColor::fg_yellow(bool bright) { return this->add_code(bright ? 93 : 33); }
-LogColor & LogColor::fg_blue(bool bright) { return this->add_code(bright ? 94 : 34); }
-LogColor & LogColor::fg_magenta(bool bright) { return this->add_code(bright ? 95 : 35); }
-LogColor & LogColor::fg_cyan(bool bright) { return this->add_code(bright ? 96 : 36); }
-LogColor & LogColor::fg_white(bool bright) { return this->add_code(bright ? 97 : 37); }
-LogColor & LogColor::bg_black(bool bright) { return this->add_code(bright ? 100 : 40); }
-LogColor & LogColor::bg_red(bool bright) { return this->add_code(bright ? 101 : 41); }
-LogColor & LogColor::bg_green(bool bright) { return this->add_code(bright ? 102 : 42); }
-LogColor & LogColor::bg_yellow(bool bright) { return this->add_code(bright ? 103 : 43); }
-LogColor & LogColor::bg_blue(bool bright) { return this->add_code(bright ? 104 : 44); }
-LogColor & LogColor::bg_magenta(bool bright) { return this->add_code(bright ? 105 : 45); }
-LogColor & LogColor::bg_cyan(bool bright) { return this->add_code(bright ? 106 : 46); }
-LogColor & LogColor::bg_white(bool bright) { return this->add_code(bright ? 107 : 47); }
-
+LogColor & LogColor::fg_black(bool bright) {
+	return this->add_code(bright ? 90 : 30);
+}
+LogColor & LogColor::fg_red(bool bright) {
+	return this->add_code(bright ? 91 : 31);
+}
+LogColor & LogColor::fg_green(bool bright) {
+	return this->add_code(bright ? 92 : 32);
+}
+LogColor & LogColor::fg_yellow(bool bright) {
+	return this->add_code(bright ? 93 : 33);
+}
+LogColor & LogColor::fg_blue(bool bright) {
+	return this->add_code(bright ? 94 : 34);
+}
+LogColor & LogColor::fg_magenta(bool bright) {
+	return this->add_code(bright ? 95 : 35);
+}
+LogColor & LogColor::fg_cyan(bool bright) {
+	return this->add_code(bright ? 96 : 36);
+}
+LogColor & LogColor::fg_white(bool bright) {
+	return this->add_code(bright ? 97 : 37);
+}
+LogColor & LogColor::bg_black(bool bright) {
+	return this->add_code(bright ? 100 : 40);
+}
+LogColor & LogColor::bg_red(bool bright) {
+	return this->add_code(bright ? 101 : 41);
+}
+LogColor & LogColor::bg_green(bool bright) {
+	return this->add_code(bright ? 102 : 42);
+}
+LogColor & LogColor::bg_yellow(bool bright) {
+	return this->add_code(bright ? 103 : 43);
+}
+LogColor & LogColor::bg_blue(bool bright) {
+	return this->add_code(bright ? 104 : 44);
+}
+LogColor & LogColor::bg_magenta(bool bright) {
+	return this->add_code(bright ? 105 : 45);
+}
+LogColor & LogColor::bg_cyan(bool bright) {
+	return this->add_code(bright ? 106 : 46);
+}
+LogColor & LogColor::bg_white(bool bright) {
+	return this->add_code(bright ? 107 : 47);
+}
diff --git a/src/crepe/util/color.h b/src/crepe/util/color.h
index 66f3a28..91e1abe 100644
--- a/src/crepe/util/color.h
+++ b/src/crepe/util/color.h
@@ -48,4 +48,4 @@ private:
 	std::string final = "";
 };
 
-} // namespace crepe::util::color
+} // namespace crepe::util
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index 5ff2ad4..6bcc4ae 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -3,20 +3,25 @@
 #include <cstdlib>
 #include <string>
 
+#include "../api/Config.h"
 #include "fmt.h"
 #include "log.h"
-#include "../api/Config.h"
 
 using namespace crepe::util;
 using namespace std;
 
 string log_prefix(LogLevel level) {
 	switch (level) {
-		case LogLevel::TRACE: return LogColor().fg_white().str("[TRACE]") + " ";
-		case LogLevel::DEBUG: return LogColor().fg_magenta().str("[DEBUG]") + " ";
-		case LogLevel::INFO: return LogColor().fg_blue().str("[INFO]") + " ";
-		case LogLevel::WARNING: return LogColor().fg_yellow().str("[WARN]") + " ";
-		case LogLevel::ERROR: return LogColor().fg_red().str("[ERROR]") + " ";
+		case LogLevel::TRACE:
+			return LogColor().fg_white().str("[TRACE]") + " ";
+		case LogLevel::DEBUG:
+			return LogColor().fg_magenta().str("[DEBUG]") + " ";
+		case LogLevel::INFO:
+			return LogColor().fg_blue().str("[INFO]") + " ";
+		case LogLevel::WARNING:
+			return LogColor().fg_yellow().str("[WARN]") + " ";
+		case LogLevel::ERROR:
+			return LogColor().fg_red().str("[ERROR]") + " ";
 	}
 	return "";
 }
@@ -46,4 +51,3 @@ void crepe::util::logf(LogLevel level, const char * fmt, ...) {
 	log(level, va_stringf(args, fmt));
 	va_end(args);
 }
-
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index 5ee67eb..308ba96 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -6,12 +6,19 @@
 #include "color.h"
 
 // utility macros
-#define _crepe_logf_here(level, format, ...) crepe::util::logf(level, "%s" format, crepe::util::LogColor().fg_white(false).fmt("%s (%s:%d)", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__), __VA_ARGS__)
+#define _crepe_logf_here(level, format, ...) \
+	crepe::util::logf( \
+		level, "%s" format, \
+		crepe::util::LogColor().fg_white(false).fmt( \
+			"%s (%s:%d)", __PRETTY_FUNCTION__, __FILE_NAME__, __LINE__), \
+		__VA_ARGS__)
 
 // very illegal global function-style macros
 // NOLINTBEGIN
-#define dbg_logf(fmt, ...) _crepe_logf_here(crepe::util::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(crepe::util::LogLevel::DEBUG, "%s: " str, "")
+#define dbg_logf(fmt, ...) \
+	_crepe_logf_here(crepe::util::LogLevel::DEBUG, ": " fmt, __VA_ARGS__)
+#define dbg_log(str) \
+	_crepe_logf_here(crepe::util::LogLevel::DEBUG, "%s: " str, "")
 #define dbg_trace() _crepe_logf_here(crepe::util::LogLevel::TRACE, "%s", "")
 // NOLINTEND
 
diff --git a/src/example/log.cpp b/src/example/log.cpp
index 86ef193..3bc6d80 100644
--- a/src/example/log.cpp
+++ b/src/example/log.cpp
@@ -3,8 +3,8 @@
  * Standalone example for usage of the logging functions
  */
 
-#include <crepe/util/log.h>
 #include <crepe/api/Config.h>
+#include <crepe/util/log.h>
 
 using namespace crepe;
 using namespace crepe::util;
@@ -22,4 +22,3 @@ int main() {
 
 	return 0;
 }
-
diff --git a/src/example/script.cpp b/src/example/script.cpp
index f737a90..d0cc121 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -7,8 +7,8 @@
 #include <crepe/ScriptSystem.h>
 #include <crepe/util/log.h>
 
-#include <crepe/api/Config.h>
 #include <crepe/api/BehaviorScript.h>
+#include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
 
diff --git a/src/makefile b/src/makefile
index c1ef601..3f74a2a 100644
--- a/src/makefile
+++ b/src/makefile
@@ -2,5 +2,7 @@
 
 FMT += $(shell git ls-files '*.c' '*.cpp' '*.h' '*.hpp')
 format: FORCE
-	clang-tidy -p build/compile_commands.json --fix-errors $(FMT)
+	# clang-tidy -p build/compile_commands.json --fix-errors $(FMT)
+
+# TODO: re-enable linter after 2024-11-10
 
-- 
cgit v1.2.3


From 195f7770c42aa1ed1052725dde26699d2ecc689f Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Fri, 25 Oct 2024 20:46:32 +0200
Subject: implement get_component for scripts

---
 src/crepe/api/BehaviorScript.h   |  1 -
 src/crepe/api/BehaviorScript.hpp |  2 ++
 src/crepe/api/CMakeLists.txt     |  1 +
 src/crepe/api/Script.cpp         |  1 +
 src/crepe/api/Script.h           | 18 ++++++++++++++++++
 src/crepe/api/Script.hpp         | 26 ++++++++++++++++++++++++++
 src/example/script.cpp           | 11 ++++++++++-
 7 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/crepe/api/Script.hpp

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

diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index cb37a78..6133cc8 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -3,7 +3,6 @@
 #include <memory>
 
 #include "../Component.h"
-#include "Script.h"
 
 namespace crepe {
 class ScriptSystem;
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 6fdf605..2a3502f 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -5,6 +5,7 @@
 #include "../util/log.h"
 
 #include "BehaviorScript.h"
+#include "Script.h"
 
 namespace crepe::api {
 
@@ -13,6 +14,7 @@ BehaviorScript & BehaviorScript::set_script() {
 	static_assert(std::is_base_of<Script, T>::value);
 	dbg_trace();
 	Script * s = new T();
+	s->parent = this;
 	this->script = std::unique_ptr<Script>(s);
 	return *this;
 }
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index f262019..0bb1263 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -18,6 +18,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	BehaviorScript.h
 	Config.h
 	Script.h
+	Script.hpp
 	GameObject.h
 	GameObject.hpp
 	Rigidbody.h
diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 5016ed0..0dfdd6f 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -1,3 +1,4 @@
 #include "Script.h"
 
 using namespace crepe::api;
+
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 0036d1f..4950b5c 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -1,11 +1,15 @@
 #pragma once
 
+#include <vector>
+
 namespace crepe {
 class ScriptSystem;
 }
 
 namespace crepe::api {
 
+class BehaviorScript;
+
 class Script {
 	friend class crepe::ScriptSystem;
 
@@ -16,6 +20,20 @@ protected:
 	// implemented as member methods in derivative user script classes and
 	// registered in init(), otherwise this class will balloon in size with each
 	// added event.
+
+protected:
+	template<typename T>
+	T & get_component();
+
+	template<typename T>
+	std::vector<std::reference_wrapper<T>> get_components();
+
+private:
+	friend class crepe::api::BehaviorScript;
+	BehaviorScript * parent = nullptr;
 };
 
 } // namespace crepe::api
+
+#include "Script.hpp"
+
diff --git a/src/crepe/api/Script.hpp b/src/crepe/api/Script.hpp
new file mode 100644
index 0000000..8ddd344
--- /dev/null
+++ b/src/crepe/api/Script.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../ComponentManager.h"
+
+#include "Script.h"
+#include "BehaviorScript.h"
+
+namespace crepe::api {
+
+template<typename T>
+T & Script::get_component() {
+	std::vector<std::reference_wrapper<T>> all_components = this->get_components<T>();
+	if (all_components.size() < 1)
+		throw nullptr; // TODO
+	
+	return all_components.back().get();
+}
+
+template<typename T>
+std::vector<std::reference_wrapper<T>> Script::get_components() {
+	ComponentManager & mgr = ComponentManager::get_instance();
+	return mgr.get_components_by_id<T>(this->parent->game_object_id);
+}
+
+}
+
diff --git a/src/example/script.cpp b/src/example/script.cpp
index d0cc121..43f1c22 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -11,13 +11,17 @@
 #include <crepe/api/Config.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Script.h>
+#include <crepe/api/Transform.h>
 
 using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
 class MyScript : public Script {
-	void update() { dbg_log("MY SCRIPT UPDATE"); }
+	void update() {
+		Transform & test = get_component<Transform>();
+		dbg_logf("Transform(%.2f, %.2f)", test.position.x, test.position.y);
+	}
 };
 
 int main() {
@@ -25,6 +29,11 @@ int main() {
 	cfg.log.level = util::LogLevel::TRACE;
 
 	auto obj = GameObject(0, "name", "tag", 0);
+	Point point = {
+		.x = 1.2,
+		.y = 3.4,
+	};
+	obj.add_component<Transform>(point, 0, 0);
 	obj.add_component<BehaviorScript>().set_script<MyScript>();
 
 	auto & sys = ScriptSystem::get_instance();
-- 
cgit v1.2.3


From 35ef3ba91ce9e00466508f2388f4c1dd2321b505 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 31 Oct 2024 18:40:45 +0100
Subject: minor script system fixes

---
 src/crepe/ScriptSystem.cpp  |  1 +
 src/crepe/api/Transform.cpp |  2 +-
 src/crepe/api/Transform.h   |  2 +-
 src/example/script.cpp      | 31 +++++++++++++++++++++----------
 4 files changed, 24 insertions(+), 12 deletions(-)

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

diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index d00d474..171b490 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -37,6 +37,7 @@ forward_list<Script *> ScriptSystem::get_scripts() {
 
 	for (auto behavior_script_ref : behavior_scripts) {
 		BehaviorScript & behavior_script = behavior_script_ref.get();
+		if (!behavior_script.active) continue;
 		Script * script = behavior_script.script.get();
 		if (script == nullptr) continue;
 		scripts.push_front(script);
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 626cd67..3b218bc 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -8,7 +8,7 @@
 
 using namespace crepe::api;
 
-Transform::Transform(uint32_t game_id, Point & point, double rot, double scale)
+Transform::Transform(uint32_t game_id, const Point & point, double rot, double scale)
 	: Component(game_id), position(point), rotation(rot), scale(scale) {
 	dbg_trace();
 }
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index c69ec61..c451c16 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -14,7 +14,7 @@ class Transform : public Component {
 	// works similar (or the same) as those found in GLSL?
 
 public:
-	Transform(uint32_t id, Point &, double, double);
+	Transform(uint32_t id, const Point &, double, double);
 	~Transform();
 	//! Translation (shift)
 	Point position;
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 43f1c22..cda9591 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -17,27 +17,38 @@ using namespace crepe;
 using namespace crepe::api;
 using namespace std;
 
+// Unrelated stuff that is not part of this POC
+int _ = [] () {
+	// Show dbg_trace() output
+	auto & cfg = api::Config::get_instance();
+	cfg.log.level = util::LogLevel::TRACE;
+
+	return 0; // satisfy compiler
+}();
+
+
+
+// User-defined script:
 class MyScript : public Script {
 	void update() {
+		// Retrieve component from the same GameObject this script is on
 		Transform & test = get_component<Transform>();
 		dbg_logf("Transform(%.2f, %.2f)", test.position.x, test.position.y);
 	}
 };
 
 int main() {
-	auto & cfg = api::Config::get_instance();
-	cfg.log.level = util::LogLevel::TRACE;
-
+	// Create game object with Transform and BehaviorScript components
 	auto obj = GameObject(0, "name", "tag", 0);
-	Point point = {
-		.x = 1.2,
-		.y = 3.4,
-	};
-	obj.add_component<Transform>(point, 0, 0);
+	obj.add_component<Transform>(Point { .x = 1.2, .y = 3.4, }, 0, 0);
 	obj.add_component<BehaviorScript>().set_script<MyScript>();
 
+	// Get ScriptSystem singleton instance (this would normally be done from the
+	// game loop)
 	auto & sys = ScriptSystem::get_instance();
-	sys.update(); // -> MyScript::update
+	// Update all scripts. This should result in MyScript::update being called
+	sys.update();
 
-	return 0;
+	return EXIT_SUCCESS;
 }
+
-- 
cgit v1.2.3