From 4ec01101ddc04f4f30d0aa0b4f3f71fa74e0e6f3 Mon Sep 17 00:00:00 2001
From: Max-001 <80035972+Max-001@users.noreply.github.com>
Date: Sat, 5 Oct 2024 12:25:10 +0200
Subject: Added some time testing for comparison

---
 mwe/ecs-homemade/src/main.cpp | 104 ++++++++++--------------------------------
 1 file changed, 25 insertions(+), 79 deletions(-)

(limited to 'mwe/ecs-homemade/src/main.cpp')

diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index 9e230e5..122311a 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -1,108 +1,54 @@
 #include <iostream>
 #include <vector>
 #include <cstdint>
+#include <chrono>
 
 #include "ComponentManager.h"
 #include "GameObjectMax.h"
 #include "Components.h"
 
 int main() {
-	GameObject gameObect0(0, "Name: 0", "Tag: 0", 0);	//Entity 0
-	GameObject gameObect1(1, "Name: 1", "Tag: 1", 1);	//Entity 1
-	GameObject gameObect2(2, "Name: 2", "Tag: 2", 2);	//Entity 2
-	GameObject gameObect3(3, "Name: 3", "Tag: 3", 3);	//Entity 3
-	GameObject gameObect4(4, "Name: 4", "Tag: 4", 4);	//Entity 4
-	GameObject gameObect5(5, "Name: 5", "Tag: 5", 5);	//Entity 5
-	GameObject gameObect6(6, "Name: 6", "Tag: 6", 6);	//Entity 6
-	GameObject gameObect7(7, "Name: 7", "Tag: 7", 7);	//Entity 7
+	auto startAdding = std::chrono::high_resolution_clock::now();
 
-	gameObect0.AddComponent<Sprite>();			//Add a sprite to entity0
-	gameObect0.AddComponent<Rigidbody>(1, 2, 3);	//Also add a rigidbody to entity0
-	gameObect0.AddComponent<Rigidbody>(3, 2, 1);	//Add a second rigidbody to entity0
+	GameObject* gameObject[100000];
 
-	gameObect1.AddComponent<Rigidbody>(4, 5, 6);	//Only add a rigidbody to entity1
+	for(int i = 0; i < 100000; ++i) {
+		gameObject[i] = new GameObject(i, "Name", "Tag", 0);
 
-	gameObect2.AddComponent<Sprite>();	//Add four sprites to entity2
-	gameObect2.AddComponent<Sprite>();
-	gameObect2.AddComponent<Sprite>();
-	gameObect2.AddComponent<Sprite>();
-	gameObect2.AddComponent<Rigidbody>(10, 100, 500);	//Add four rigidbodies to entity2
-	gameObect2.AddComponent<Rigidbody>(10, 100, 501);
-	gameObect2.AddComponent<Rigidbody>(10, 100, 502);
-	gameObect2.AddComponent<Rigidbody>(10, 100, 500);
-	
-	//Add non components to entity3, entity4, entity5 and entity6
-
-	gameObect7.AddComponent<Sprite>();	//Add a sprite to entity 7
-	gameObect7.AddComponent<Colider>(30);	//Add a colder to entity 7
-
-	//The entities are now initialized
-	//Now I will demonstrate some ways of retreiving/getting components
-
-	std::cout << "Finding all sprites of entity 0" << std::endl;
-	std::vector<std::reference_wrapper<Sprite>> spriteOfEntity0 = ComponentManager::GetInstance().GetComponentsByID<Sprite>(gameObect0.mId);
-	for(Sprite& spriteEntity0 : spriteOfEntity0) {
-		std::cout << "Sprite of entity 0: " << spriteEntity0.mActive << std::endl;
-	}
-	std::cout << std::endl;
-
-	std::cout << "Finding all rigidbodies of entity 0" << std::endl;
-	std::vector<std::reference_wrapper<Rigidbody>> rigidbodyOfEntity0 = ComponentManager::GetInstance().GetComponentsByID<Rigidbody>(gameObect0.mId);
-	for(Rigidbody& rigidbodyEntity0 : rigidbodyOfEntity0) {
-		std::cout << "Rigidbody of entity 0: " << rigidbodyEntity0.mMass << " " << rigidbodyEntity0.mGravityScale << " " << rigidbodyEntity0.mBodyType << std::endl;
-
-		rigidbodyEntity0.mMass = 15;
-	}
-	std::cout << std::endl;
-
-	std::cout << "Finding all coliders of entity 0" << std::endl;
-	std::vector<std::reference_wrapper<Colider>> coliderOfEntity0 = ComponentManager::GetInstance().GetComponentsByID<Colider>(gameObect0.mId);
-	for(Colider& coliderEntity0 : coliderOfEntity0) {
-		std::cout << "Colider of entity 0: " << coliderEntity0.mSize << std::endl;
-	}
-	std::cout << std::endl;
-
-	std::cout << "Finding all sprites of entity 3" << std::endl;
-	std::vector<std::reference_wrapper<Sprite>> spriteOfEntity3 = ComponentManager::GetInstance().GetComponentsByID<Sprite>(gameObect3.mId);
-	for(Sprite& spriteEntity3 : spriteOfEntity3) {
-		std::cout << "Sprite of entity 3: " << spriteEntity3.mActive << std::endl;
+		gameObject[i]->AddComponent<Sprite>("C:/Test");
+		gameObject[i]->AddComponent<Rigidbody>(0, 0, i);
+		gameObject[i]->AddComponent<Colider>(i);
 	}
-	std::cout << std::endl;
+	
+	auto stopAdding = std::chrono::high_resolution_clock::now();
 
-	std::cout << "Finding all rigidbodies of entity 3" << std::endl;
-	std::vector<std::reference_wrapper<Rigidbody>> rigidbodyOfEntity3 = ComponentManager::GetInstance().GetComponentsByID<Rigidbody>(gameObect3.mId);
-	for(Rigidbody& rigidbodyEntity3 : rigidbodyOfEntity3) {
-		std::cout << "Rigidbody of entity 3: " << rigidbodyEntity3.mMass << " " << rigidbodyEntity3.mGravityScale << " " << rigidbodyEntity3.mBodyType << std::endl;
-	}
-	std::cout << std::endl;
+	//This is what systems would do:
 
-	std::cout << "Finding all sprites of all entities" << std::endl;
 	std::vector<std::pair<std::reference_wrapper<Sprite>, std::uint32_t>> sprites = ComponentManager::GetInstance().GetComponentsByType<Sprite>();
 	for(auto& [sprite, id] : sprites) {
-		std::cout << "Sprite of id: " << id << ": " << sprite.get().mActive << std::endl;
+		std::cout << sprite.get().mPath << std::endl;
 	}
 	std::cout << std::endl;
 
-	std::cout << "Finding all coliders of all entities" << std::endl;
+	std::vector<std::pair<std::reference_wrapper<Rigidbody>, std::uint32_t>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
+	for(auto& [rigidbody, id] : rigidBodies) {
+		std::cout << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
+	}
+
 	std::vector<std::pair<std::reference_wrapper<Colider>, std::uint32_t>> coliders = ComponentManager::GetInstance().GetComponentsByType<Colider>();
 	for(auto& [colider, id] : coliders) {
-		std::cout << "Colder of id: " << id << ": " << colider.get().mSize << std::endl;
+		std::cout << colider.get().mSize << std::endl;
 	}
 	std::cout << std::endl;
 
-	std::cout << "Finding all rigidbodies of all entities" << std::endl;
-	std::vector<std::pair<std::reference_wrapper<Rigidbody>, std::uint32_t>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
-	for(auto& [rigidbody, id] : rigidBodies) {
-		std::cout << "Rigidbody of id: " << id << ": " << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
+	auto stopLooping = std::chrono::high_resolution_clock::now();
 
-		rigidbody.get().mMass = -1;
+	for (int i = 0; i < 100000; ++i) {
+    	delete gameObject[i];
 	}
-	std::cout << std::endl;
 
-	std::cout << "Finding all rigidbodies of all entities for the second time (after changing mMass to -1)" << std::endl;
-	std::vector<std::pair<std::reference_wrapper<Rigidbody>, std::uint32_t>> rigidBodies2 = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
-	for(auto& [rigidbody2, id2] : rigidBodies2) {
-		std::cout << "Rigidbody of id: " << id2 << ": " << rigidbody2.get().mMass << " " << rigidbody2.get().mGravityScale << " " << rigidbody2.get().mBodyType << std::endl;
-	}
-	std::cout << std::endl;
+	auto Addtime = std::chrono::duration_cast<std::chrono::microseconds>(stopAdding - startAdding);
+	auto LoopTime = std::chrono::duration_cast<std::chrono::microseconds>(stopLooping - stopAdding);
+	std::cout << "AddTime: " << Addtime.count() << " us" << std::endl;
+	std::cout << "LoopTime: " << LoopTime.count() << " us" << std::endl;
 }
-- 
cgit v1.2.3


From a5fa49f39473a8d2dc535145cb34866967ec10ab Mon Sep 17 00:00:00 2001
From: Max-001 <80035972+Max-001@users.noreply.github.com>
Date: Sat, 5 Oct 2024 12:31:50 +0200
Subject: Improved test

---
 mwe/ecs-homemade/src/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mwe/ecs-homemade/src/main.cpp')

diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index 122311a..c78e085 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -26,20 +26,20 @@ int main() {
 
 	std::vector<std::pair<std::reference_wrapper<Sprite>, std::uint32_t>> sprites = ComponentManager::GetInstance().GetComponentsByType<Sprite>();
 	for(auto& [sprite, id] : sprites) {
-		std::cout << sprite.get().mPath << std::endl;
+		//std::cout << sprite.get().mPath << std::endl;
 	}
-	std::cout << std::endl;
+	//std::cout << std::endl;
 
 	std::vector<std::pair<std::reference_wrapper<Rigidbody>, std::uint32_t>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
 	for(auto& [rigidbody, id] : rigidBodies) {
-		std::cout << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
+		//std::cout << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
 	}
-
+	//std::cout << std::endl;
+	
 	std::vector<std::pair<std::reference_wrapper<Colider>, std::uint32_t>> coliders = ComponentManager::GetInstance().GetComponentsByType<Colider>();
 	for(auto& [colider, id] : coliders) {
-		std::cout << colider.get().mSize << std::endl;
+		//std::cout << colider.get().mSize << std::endl;
 	}
-	std::cout << std::endl;
 
 	auto stopLooping = std::chrono::high_resolution_clock::now();
 
-- 
cgit v1.2.3


From 765550bce8a81c6f0c79c0083b14ef68e0c900b2 Mon Sep 17 00:00:00 2001
From: Max-001 <80035972+Max-001@users.noreply.github.com>
Date: Sat, 5 Oct 2024 12:36:26 +0200
Subject: Removed the std::pair to improve test

---
 mwe/ecs-homemade/inc/ComponentManager.h   |  2 +-
 mwe/ecs-homemade/inc/ComponentManager.hpp | 10 +++++-----
 mwe/ecs-homemade/src/main.cpp             | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'mwe/ecs-homemade/src/main.cpp')

diff --git a/mwe/ecs-homemade/inc/ComponentManager.h b/mwe/ecs-homemade/inc/ComponentManager.h
index 893aa56..1a58b01 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.h
+++ b/mwe/ecs-homemade/inc/ComponentManager.h
@@ -29,7 +29,7 @@ public:
 	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
 	template <typename T>
-	std::vector<std::pair<std::reference_wrapper<T>, std::uint32_t>> GetComponentsByType() const;	//Get a vector<> of all components of a specific type
+	std::vector<std::reference_wrapper<T>> GetComponentsByType() const;	//Get a vector<> of all components of a specific type
 
 private:
     static ComponentManager mInstance;	//Singleton
diff --git a/mwe/ecs-homemade/inc/ComponentManager.hpp b/mwe/ecs-homemade/inc/ComponentManager.hpp
index 53dfddd..720ee79 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.hpp
+++ b/mwe/ecs-homemade/inc/ComponentManager.hpp
@@ -61,11 +61,11 @@ std::vector<std::reference_wrapper<T>> ComponentManager::GetComponentsByID(std::
 }
 
 template <typename T>
-std::vector<std::pair<std::reference_wrapper<T>, std::uint32_t>> ComponentManager::GetComponentsByType() const {
+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<>)
 
-    std::vector<std::pair<std::reference_wrapper<T>, std::uint32_t>> componentVector;	//Create an empty vector<>
-	std::uint32_t id = 0;	//Set the id to 0 (the id will also be stored in the returned vector<>)
+    std::vector<std::reference_wrapper<T>> componentVector;	//Create an empty vector<>
+	//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<>)
 
@@ -76,11 +76,11 @@ std::vector<std::pair<std::reference_wrapper<T>, std::uint32_t>> ComponentManage
                 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), id);	//Pair the dereferenced raw pointer and the id and add it to the vector<>
+                    componentVector.emplace_back(std::ref(*castedComponent));	//Pair the dereferenced raw pointer and the id and add it to the vector<>
                 }
             }
 
-			++id;	//Increase the id (the id will also be stored in the returned vector<>)
+			//++id;	//Increase the id (the id will also be stored in the returned vector<>)
         }
     }
 
diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index c78e085..41f7d6d 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -24,20 +24,20 @@ int main() {
 
 	//This is what systems would do:
 
-	std::vector<std::pair<std::reference_wrapper<Sprite>, std::uint32_t>> sprites = ComponentManager::GetInstance().GetComponentsByType<Sprite>();
-	for(auto& [sprite, id] : sprites) {
+	std::vector<std::reference_wrapper<Sprite>> sprites = ComponentManager::GetInstance().GetComponentsByType<Sprite>();
+	for(Sprite& sprite : sprites) {
 		//std::cout << sprite.get().mPath << std::endl;
 	}
 	//std::cout << std::endl;
 
-	std::vector<std::pair<std::reference_wrapper<Rigidbody>, std::uint32_t>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
-	for(auto& [rigidbody, id] : rigidBodies) {
+	std::vector<std::reference_wrapper<Rigidbody>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
+	for(Rigidbody& rigidbody : rigidBodies) {
 		//std::cout << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
 	}
 	//std::cout << std::endl;
-	
-	std::vector<std::pair<std::reference_wrapper<Colider>, std::uint32_t>> coliders = ComponentManager::GetInstance().GetComponentsByType<Colider>();
-	for(auto& [colider, id] : coliders) {
+
+	std::vector<std::reference_wrapper<Colider>> coliders = ComponentManager::GetInstance().GetComponentsByType<Colider>();
+	for(Colider& colider : coliders) {
 		//std::cout << colider.get().mSize << std::endl;
 	}
 
-- 
cgit v1.2.3


From 7c9d3452c99fcb89ea6df55755e90f741b23cf10 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sun, 6 Oct 2024 13:22:10 +0200
Subject: copy homemade ECS to crepe + correct code style

---
 .clang-format                             |   1 +
 contributing.md                           |   5 +
 mwe/ecs-homemade/inc/ComponentManager.h   |  43 +++++----
 mwe/ecs-homemade/inc/ComponentManager.hpp | 154 +++++++++++++++++++-----------
 mwe/ecs-homemade/inc/GameObjectMax.h      |   3 +-
 mwe/ecs-homemade/inc/GameObjectMax.hpp    |   5 +-
 mwe/ecs-homemade/src/ComponentManager.cpp |  20 ++--
 mwe/ecs-homemade/src/Components.cpp       |   3 +-
 mwe/ecs-homemade/src/GameObjectMax.cpp    |   4 +-
 mwe/ecs-homemade/src/main.cpp             |  35 ++++---
 src/crepe/CMakeLists.txt                  |   8 ++
 src/crepe/ComponentManager.cpp            |  25 +++++
 src/crepe/ComponentManager.h              |  55 +++++++++++
 src/crepe/ComponentManager.hpp            | 134 ++++++++++++++++++++++++++
 src/crepe/Components.cpp                  |  13 +++
 src/crepe/Components.h                    |  39 ++++++++
 src/crepe/GameObject.cpp                  |   9 ++
 src/crepe/GameObject.h                    |  22 +++++
 src/crepe/GameObject.hpp                  |  15 +++
 19 files changed, 487 insertions(+), 106 deletions(-)
 create mode 100644 src/crepe/ComponentManager.cpp
 create mode 100644 src/crepe/ComponentManager.h
 create mode 100644 src/crepe/ComponentManager.hpp
 create mode 100644 src/crepe/Components.cpp
 create mode 100644 src/crepe/Components.h
 create mode 100644 src/crepe/GameObject.cpp
 create mode 100644 src/crepe/GameObject.h
 create mode 100644 src/crepe/GameObject.hpp

(limited to 'mwe/ecs-homemade/src/main.cpp')

diff --git a/.clang-format b/.clang-format
index 5d233eb..d2918db 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,6 +22,7 @@ AlignTrailingComments:
 ReflowComments: false
 AlignEscapedNewlines: DontAlign
 BreakBeforeBinaryOperators: All
+BreakTemplateDeclarations: Yes
 ...
 
 # vim: ft=yaml
diff --git a/contributing.md b/contributing.md
index 2ff411a..933f1bf 100644
--- a/contributing.md
+++ b/contributing.md
@@ -17,6 +17,11 @@
 # Code style
 
 - ASCII only
+- Explanatory comments are placed above the line(s) they are explaining
+- Source files should only contain comments that plainly state what the code is
+  supposed to do
+- Explanatory comments in headers may be used to clarify implementation design
+  decisions
 - Formatting nitty-gritty is handled by clang-format/clang-tidy (run `make
   format` in the root folder of this repository to format all sources files)
 - When using libraries of which the header include order is important, make
diff --git a/mwe/ecs-homemade/inc/ComponentManager.h b/mwe/ecs-homemade/inc/ComponentManager.h
index 1a58b01..d368516 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.h
+++ b/mwe/ecs-homemade/inc/ComponentManager.h
@@ -2,39 +2,44 @@
 
 #include "Components.h"
 #include <cstdint>
-#include <unordered_map>
-#include <vector>
-#include <typeindex>
 #include <memory>
+#include <typeindex>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 
 class ComponentManager {
 public:
-	static ComponentManager& GetInstance();	//Singleton
+	static ComponentManager & GetInstance(); //Singleton
 
-	ComponentManager(const ComponentManager&) = delete;	//Singleton
-    ComponentManager(ComponentManager&&) = delete;	//Singleton
-    ComponentManager& operator=(const ComponentManager&) = delete;	//Singleton
-    ComponentManager& operator=(ComponentManager&&) = delete;	//Singleton
+	ComponentManager(const ComponentManager &) = delete; //Singleton
+	ComponentManager(ComponentManager &&) = delete; //Singleton
+	ComponentManager & operator=(const ComponentManager &) = delete; //Singleton
+	ComponentManager & operator=(ComponentManager &&) = delete; //Singleton
 
 	template <typename T, typename... Args>
-	void AddComponent(std::uint32_t id, Args&&... args);	//Add a component of a specific type
+	void AddComponent(std::uint32_t id,
+					  Args &&... args); //Add a component of a specific type
 	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 and id
 	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 type
+	void DeleteAllComponentsOfId(
+		std::uint32_t id); //Deletes all components of a specific id
+	void DeleteAllComponents(); //Deletes all components
 
 	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 at specific type and id
 	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; //Get a vector<> of all components of a specific type
 
 private:
-    static ComponentManager mInstance;	//Singleton
+	static ComponentManager mInstance; //Singleton
 
-    ComponentManager();	//Singleton
+	ComponentManager(); //Singleton
 
 	/*
 	 * The std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> below might seem a bit strange, let me explain this structure:
@@ -42,7 +47,9 @@ private:
 	 * The first std::vector<> stores another vector<>. This first vector<> is to bind the entity's id to a component.
 	 * The second std::vector<> stores unique_ptrs. Each component can be gathered via an unique_ptr. This second vector<> allows multiple components of the same std::type_index for one entity (id).
 	 */
-	std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> mComponents;
+	std::unordered_map<std::type_index,
+					   std::vector<std::vector<std::unique_ptr<Component>>>>
+		mComponents;
 };
 
 #include "ComponentManager.hpp"
diff --git a/mwe/ecs-homemade/inc/ComponentManager.hpp b/mwe/ecs-homemade/inc/ComponentManager.hpp
index 720ee79..161ce71 100644
--- a/mwe/ecs-homemade/inc/ComponentManager.hpp
+++ b/mwe/ecs-homemade/inc/ComponentManager.hpp
@@ -1,88 +1,126 @@
 
 template <typename T, typename... Args>
-void 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>>
-    }
+void 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>>
+	}
 
-    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)
-    }
+	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)
+	}
 
-    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<>
+	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<>
 }
 
 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<>)
-
-	if (mComponents.find(type) != mComponents.end()) {	//Find the type (in the unordered_map<>)
-		std::vector<std::vector<std::unique_ptr<Component>>>& componentArray = mComponents[type];	//Get the correct vector<>
-
-        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
-        }
+	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()) { //Find the type (in the unordered_map<>)
+		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray
+			= mComponents[type]; //Get the correct vector<>
+
+		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
+		}
 	}
 }
 
-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<>)
+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<>)
 
-	if (mComponents.find(type) != mComponents.end()) {	//Find the type (in the unordered_map<>)
-		mComponents[type].clear();	//Clear the whole vector<> of this specific type
+	if (mComponents.find(type)
+		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+		mComponents[type]
+			.clear(); //Clear the whole vector<> of this specific type
 	}
 }
 
 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<>)
-
-	std::vector<std::reference_wrapper<T>> componentVector;	//Create an empty vector<>
-
-    if (mComponents.find(type) != mComponents.end()) {	//Find the type (in the unordered_map<>)
-
-        const std::vector<std::vector<std::unique_ptr<Component>>>& componentArray = mComponents.at(type);	//Get the correct vector<>
-
-        if (id < componentArray.size()) {	//Make sure that the id (that we are looking for) is within the boundaries of the 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<>
-                }
-            }
-        }
-    }
+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<>)
+
+	std::vector<std::reference_wrapper<T>>
+		componentVector; //Create an empty vector<>
+
+	if (mComponents.find(type)
+		!= mComponents.end()) { //Find the type (in the unordered_map<>)
+
+		const std::vector<std::vector<std::unique_ptr<Component>>> &
+			componentArray
+			= mComponents.at(type); //Get the correct vector<>
+
+		if (id
+			< componentArray
+				  .size()) { //Make sure that the id (that we are looking for) is within the boundaries of the 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<>
+				}
+			}
+		}
+	}
 
-    return componentVector; //Return the vector<>
+	return componentVector; //Return the vector<>
 }
 
 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<>)
+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<>)
 
-    std::vector<std::reference_wrapper<T>> componentVector;	//Create an empty vector<>
+	std::vector<std::reference_wrapper<T>>
+		componentVector; //Create an empty vector<>
 	//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<>)
+	if (mComponents.find(type)
+		!= mComponents.end()) { //Find the type (in the unordered_map<>)
 
-        const std::vector<std::vector<std::unique_ptr<Component>>>& componentArray = mComponents.at(type);	//Get the correct vector<>
+		const std::vector<std::vector<std::unique_ptr<Component>>> &
+			componentArray
+			= mComponents.at(type); //Get the correct 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
+		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<>
-                }
-            }
+				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<>
+				}
+			}
 
 			//++id;	//Increase the id (the id will also be stored in the returned vector<>)
-        }
-    }
+		}
+	}
 
-    return componentVector;	//Return the vector<>
+	return componentVector; //Return the vector<>
 }
diff --git a/mwe/ecs-homemade/inc/GameObjectMax.h b/mwe/ecs-homemade/inc/GameObjectMax.h
index f0bcec9..c88a834 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.h
+++ b/mwe/ecs-homemade/inc/GameObjectMax.h
@@ -7,8 +7,7 @@ class GameObject {
 public:
 	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
 
-	template <typename T, typename... Args>
-	void AddComponent(Args&&... args);
+	template <typename T, typename... Args> void 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 1e952ba..91d51ea 100644
--- a/mwe/ecs-homemade/inc/GameObjectMax.hpp
+++ b/mwe/ecs-homemade/inc/GameObjectMax.hpp
@@ -1,6 +1,7 @@
 #include "ComponentManager.h"
 
 template <typename T, typename... Args>
-void GameObject::AddComponent(Args&&... args) {
-	ComponentManager::GetInstance().AddComponent<T>(mId, std::forward<Args>(args)...);
+void GameObject::AddComponent(Args &&... args) {
+	ComponentManager::GetInstance().AddComponent<T>(
+		mId, std::forward<Args>(args)...);
 }
diff --git a/mwe/ecs-homemade/src/ComponentManager.cpp b/mwe/ecs-homemade/src/ComponentManager.cpp
index 16cc2b6..536c152 100644
--- a/mwe/ecs-homemade/src/ComponentManager.cpp
+++ b/mwe/ecs-homemade/src/ComponentManager.cpp
@@ -2,20 +2,22 @@
 
 ComponentManager ComponentManager::mInstance;
 
-ComponentManager& ComponentManager::GetInstance() {
-	return mInstance;
-}
+ComponentManager & ComponentManager::GetInstance() { return mInstance; }
 
 ComponentManager::ComponentManager() {}
 
 void ComponentManager::DeleteAllComponentsOfId(std::uint32_t id) {
-    for(auto& [type, componentArray] : mComponents) {	//Loop through all the types (in the unordered_map<>)
-        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 components at this specific id
-        }
-    }
+	for (auto & [type, componentArray] :
+		 mComponents) { //Loop through all the types (in the unordered_map<>)
+		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 components at this specific id
+		}
+	}
 }
 
 void ComponentManager::DeleteAllComponents() {
-	mComponents.clear();	//Clear the whole unordered_map<>
+	mComponents.clear(); //Clear the whole unordered_map<>
 }
diff --git a/mwe/ecs-homemade/src/Components.cpp b/mwe/ecs-homemade/src/Components.cpp
index 69b5eaa..c8347b3 100644
--- a/mwe/ecs-homemade/src/Components.cpp
+++ b/mwe/ecs-homemade/src/Components.cpp
@@ -5,6 +5,7 @@ Component::Component() : mActive(true) {}
 
 Sprite::Sprite(std::string path) : mPath(path) {}
 
-Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType) : mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
+Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
+	: mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
 
 Colider::Colider(int size) : mSize(size) {}
diff --git a/mwe/ecs-homemade/src/GameObjectMax.cpp b/mwe/ecs-homemade/src/GameObjectMax.cpp
index 62c41de..b0c5af7 100644
--- a/mwe/ecs-homemade/src/GameObjectMax.cpp
+++ b/mwe/ecs-homemade/src/GameObjectMax.cpp
@@ -2,4 +2,6 @@
 
 #include "ComponentManager.h"
 
-GameObject::GameObject(std::uint32_t id, std::string name, std::string tag, int layer) : mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
+GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
+					   int layer)
+	: mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
diff --git a/mwe/ecs-homemade/src/main.cpp b/mwe/ecs-homemade/src/main.cpp
index 41f7d6d..330e154 100644
--- a/mwe/ecs-homemade/src/main.cpp
+++ b/mwe/ecs-homemade/src/main.cpp
@@ -1,54 +1,59 @@
+#include <chrono>
+#include <cstdint>
 #include <iostream>
 #include <vector>
-#include <cstdint>
-#include <chrono>
 
 #include "ComponentManager.h"
-#include "GameObjectMax.h"
 #include "Components.h"
+#include "GameObjectMax.h"
 
 int main() {
 	auto startAdding = std::chrono::high_resolution_clock::now();
 
-	GameObject* gameObject[100000];
+	GameObject * gameObject[100000];
 
-	for(int i = 0; i < 100000; ++i) {
+	for (int i = 0; i < 100000; ++i) {
 		gameObject[i] = new GameObject(i, "Name", "Tag", 0);
 
 		gameObject[i]->AddComponent<Sprite>("C:/Test");
 		gameObject[i]->AddComponent<Rigidbody>(0, 0, i);
 		gameObject[i]->AddComponent<Colider>(i);
 	}
-	
+
 	auto stopAdding = std::chrono::high_resolution_clock::now();
 
 	//This is what systems would do:
 
-	std::vector<std::reference_wrapper<Sprite>> sprites = ComponentManager::GetInstance().GetComponentsByType<Sprite>();
-	for(Sprite& sprite : sprites) {
+	std::vector<std::reference_wrapper<Sprite>> sprites
+		= ComponentManager::GetInstance().GetComponentsByType<Sprite>();
+	for (Sprite & sprite : sprites) {
 		//std::cout << sprite.get().mPath << std::endl;
 	}
 	//std::cout << std::endl;
 
-	std::vector<std::reference_wrapper<Rigidbody>> rigidBodies = ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
-	for(Rigidbody& rigidbody : rigidBodies) {
+	std::vector<std::reference_wrapper<Rigidbody>> rigidBodies
+		= ComponentManager::GetInstance().GetComponentsByType<Rigidbody>();
+	for (Rigidbody & rigidbody : rigidBodies) {
 		//std::cout << rigidbody.get().mMass << " " << rigidbody.get().mGravityScale << " " << rigidbody.get().mBodyType << std::endl;
 	}
 	//std::cout << std::endl;
 
-	std::vector<std::reference_wrapper<Colider>> coliders = ComponentManager::GetInstance().GetComponentsByType<Colider>();
-	for(Colider& colider : coliders) {
+	std::vector<std::reference_wrapper<Colider>> coliders
+		= ComponentManager::GetInstance().GetComponentsByType<Colider>();
+	for (Colider & colider : coliders) {
 		//std::cout << colider.get().mSize << std::endl;
 	}
 
 	auto stopLooping = std::chrono::high_resolution_clock::now();
 
 	for (int i = 0; i < 100000; ++i) {
-    	delete gameObject[i];
+		delete gameObject[i];
 	}
 
-	auto Addtime = std::chrono::duration_cast<std::chrono::microseconds>(stopAdding - startAdding);
-	auto LoopTime = std::chrono::duration_cast<std::chrono::microseconds>(stopLooping - stopAdding);
+	auto Addtime = std::chrono::duration_cast<std::chrono::microseconds>(
+		stopAdding - startAdding);
+	auto LoopTime = std::chrono::duration_cast<std::chrono::microseconds>(
+		stopLooping - stopAdding);
 	std::cout << "AddTime: " << Addtime.count() << " us" << std::endl;
 	std::cout << "LoopTime: " << LoopTime.count() << " us" << std::endl;
 }
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 208ba1f..5840208 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -2,12 +2,20 @@ target_sources(crepe PUBLIC
 	Asset.cpp
 	Sound.cpp
 	SoundContext.cpp
+	ComponentManager.cpp
+	Components.cpp
+	GameObject.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
 	Sound.h
 	SoundContext.h
+	ComponentManager.h
+	ComponentManager.hpp
+	Components.h
+	GameObject.h
+	GameObject.hpp
 )
 
 add_subdirectory(api)
diff --git a/src/crepe/ComponentManager.cpp b/src/crepe/ComponentManager.cpp
new file mode 100644
index 0000000..b7a1bea
--- /dev/null
+++ b/src/crepe/ComponentManager.cpp
@@ -0,0 +1,25 @@
+#include "ComponentManager.h"
+
+using namespace crepe;
+
+ComponentManager & ComponentManager::get_instance() {
+	static ComponentManager instance;
+	return instance;
+}
+
+void ComponentManager::DeleteAllComponentsOfId(std::uint32_t id) {
+	// Loop through all the types (in the unordered_map<>)
+	for (auto & [type, componentArray] : components) {
+		// Make sure that the id (that we are looking for) is within the boundaries of the vector<>
+		if (id < componentArray.size()) {
+			// Clear the components at this specific id
+			componentArray[id].clear();
+		}
+	}
+}
+
+void ComponentManager::DeleteAllComponents() {
+	// Clear the whole unordered_map<>
+	components.clear();
+}
+
diff --git a/src/crepe/ComponentManager.h b/src/crepe/ComponentManager.h
new file mode 100644
index 0000000..003cd0b
--- /dev/null
+++ b/src/crepe/ComponentManager.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <typeindex>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "Components.h"
+
+namespace crepe {
+
+class ComponentManager {
+public:
+	// Singleton
+	static ComponentManager & get_instance();
+	ComponentManager(const ComponentManager &) = delete;
+	ComponentManager(ComponentManager &&) = delete;
+	ComponentManager & operator=(const ComponentManager &) = delete;
+	ComponentManager & operator=(ComponentManager &&) = delete;
+
+public:
+	//! Add a component of a specific type
+	template <typename T, typename... Args> void 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
+	template <typename T> 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 of a specific type
+	template <typename T> std::vector<std::reference_wrapper<T>> GetComponentsByType() const;
+
+private:
+	ComponentManager() = default;
+
+	/*
+	 * The std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> below might seem a bit strange, let me explain this structure:
+	 * The std::unordered_map<> has a key and value. The key is a std::type_index and the value is a std::vector. So, a new std::vector will be created for each new std::type_index.
+	 * The first std::vector<> stores another vector<>. This first vector<> is to bind the entity's id to a component.
+	 * The second std::vector<> stores unique_ptrs. Each component can be gathered via an unique_ptr. This second vector<> allows multiple components of the same std::type_index for one entity (id).
+	 */
+	std::unordered_map<std::type_index, std::vector<std::vector<std::unique_ptr<Component>>>> components;
+};
+
+}
+
+// #include "ComponentManager.hpp"
+
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
new file mode 100644
index 0000000..602490e
--- /dev/null
+++ b/src/crepe/ComponentManager.hpp
@@ -0,0 +1,134 @@
+#pragma once
+
+#include "ComponentManager.h"
+
+namespace crepe {
+
+template <typename T, typename... Args>
+void 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 (components.find(type) == components.end()) {
+		//If not, create a new (empty) vector<> of vector<unique_ptr<Component>>
+		components[type] = std::vector<std::vector<std::unique_ptr<Component>>>();
+	}
+
+	// Resize the vector<> if the id is greater than the current size
+	if (id >= components[type].size()) {
+		// Initialize new slots to nullptr (resize does automatically init to nullptr)
+		components[type].resize(id + 1);
+	}
+
+	// Create a new component of type T using perfect forwarding and store its
+	// unique_ptr in the vector<>
+	components[type][id].push_back(std::make_unique<T>(std::forward<Args>(args)...));
+}
+
+template <typename T>
+void ComponentManager::DeleteComponentsById(std::uint32_t id) {
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	// Find the type (in the unordered_map<>)
+	if (components.find(type) != components.end()) {
+		// Get the correct vector<>
+		std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components[type];
+
+		// 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() {
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	// Find the type (in the unordered_map<>)
+	if (components.find(type) != components.end()) {
+		// Clear the whole vector<> of this specific type
+		components[type].clear();
+	}
+}
+
+template <typename T>
+std::vector<std::reference_wrapper<T>>
+ComponentManager::GetComponentsByID(std::uint32_t id) const {
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	// Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
+
+	// Find the type (in the unordered_map<>)
+	if (components.find(type) != components.end()) {
+		// Get the correct vector<>
+		const std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components.at(type);
+
+		// 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]) {
+				// 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 the vector<>
+	return componentVector;
+}
+
+template <typename T>
+std::vector<std::reference_wrapper<T>>
+ComponentManager::GetComponentsByType() const {
+	// Determine the type of T (this is used as the key of the unordered_map<>)
+	std::type_index type = typeid(T);
+
+	// Create an empty vector<>
+	std::vector<std::reference_wrapper<T>> componentVector;
+	// Set the id to 0 (the id will also be stored in the returned vector<>)
+	// std::uint32_t id = 0;
+
+	// Find the type (in the unordered_map<>)
+	if (components.find(type) != components.end()) {
+
+		// Get the correct vector<>
+		const std::vector<std::vector<std::unique_ptr<Component>>> & componentArray = components.at(type);
+
+		// Loop through the whole vector<>
+		for (const std::vector<std::unique_ptr<Component>> & component : 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));
+				}
+			}
+
+			// Increase the id (the id will also be stored in the returned vector<>)
+			//++id;
+		}
+	}
+
+	// Return the vector<>
+	return componentVector;
+}
+
+}
+
diff --git a/src/crepe/Components.cpp b/src/crepe/Components.cpp
new file mode 100644
index 0000000..9760daa
--- /dev/null
+++ b/src/crepe/Components.cpp
@@ -0,0 +1,13 @@
+#include "Components.h"
+#include <iostream>
+
+using namespace crepe;
+
+Component::Component() : mActive(true) {}
+
+Sprite::Sprite(std::string path) : mPath(path) {}
+
+Rigidbody::Rigidbody(int mass, int gravityScale, int bodyType)
+	: mMass(mass), mGravityScale(gravityScale), mBodyType(bodyType) {}
+
+Colider::Colider(int size) : mSize(size) {}
diff --git a/src/crepe/Components.h b/src/crepe/Components.h
new file mode 100644
index 0000000..7cb6fbb
--- /dev/null
+++ b/src/crepe/Components.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <string>
+
+namespace crepe {
+
+class Component {
+public:
+	Component();
+
+	bool mActive;
+};
+
+// TODO: these should be in separate files
+
+class Sprite : public Component {
+public:
+	Sprite(std::string path);
+
+	std::string mPath;
+};
+
+class Rigidbody : public Component {
+public:
+	Rigidbody(int mass, int gravityScale, int bodyType);
+
+	int mMass;
+	int mGravityScale;
+	int mBodyType;
+};
+
+class Colider : public Component {
+public:
+	Colider(int size);
+
+	int mSize;
+};
+
+}
diff --git a/src/crepe/GameObject.cpp b/src/crepe/GameObject.cpp
new file mode 100644
index 0000000..5ac9d7a
--- /dev/null
+++ b/src/crepe/GameObject.cpp
@@ -0,0 +1,9 @@
+#include "GameObject.h"
+
+#include "ComponentManager.h"
+
+using namespace crepe;
+
+GameObject::GameObject(std::uint32_t id, std::string name, std::string tag,
+					   int layer)
+	: mId(id), mName(name), mTag(tag), mActive(true), mLayer(layer) {}
diff --git a/src/crepe/GameObject.h b/src/crepe/GameObject.h
new file mode 100644
index 0000000..71ef60d
--- /dev/null
+++ b/src/crepe/GameObject.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace crepe {
+
+class GameObject {
+public:
+	GameObject(std::uint32_t id, std::string name, std::string tag, int layer);
+
+	template <typename T, typename... Args> void AddComponent(Args &&... args);
+
+	std::uint32_t mId;
+	std::string mName;
+	std::string mTag;
+	bool mActive;
+	int mLayer;
+};
+
+}
+
diff --git a/src/crepe/GameObject.hpp b/src/crepe/GameObject.hpp
new file mode 100644
index 0000000..5a672cf
--- /dev/null
+++ b/src/crepe/GameObject.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "GameObject.h"
+
+#include "ComponentManager.h"
+
+namespace crepe {
+
+template <typename T, typename... Args>
+void GameObject::AddComponent(Args &&... args) {
+	ComponentManager::get_instance().AddComponent<T>(mId, std::forward<Args>(args)...);
+}
+
+}
+
-- 
cgit v1.2.3