6 files changed, 160 insertions, 113 deletions

diff --git a/mwe/ecs-memory-efficient/inc/ComponentManager.h b/mwe/ecs-memory-efficient/inc/ComponentManager.h
index 893aa56..066795a 100644
--- a/mwe/ecs-memory-efficient/inc/ComponentManager.h
+++ b/mwe/ecs-memory-efficient/inc/ComponentManager.h
@@ -1,12 +1,7 @@
 #pragma once
 
 #include "Components.h"
-#include <cstdint>
-#include <unordered_map>
-#include <vector>
-#include <typeindex>
-#include <memory>
-#include <utility>
+#include "ContiguousContainer.h"
 
 class ComponentManager {
 public:
@@ -17,32 +12,25 @@ public:
     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
-	template <typename T>
-	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
+	template<typename... Args>
+    void addSpriteComponent(Args&&... args);
+	template<typename... Args>
+    void addRigidbodyComponent(Args&&... args);
+	template<typename... Args>
+    void addColiderComponent(Args&&... args);
 
-	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<Sprite>> getAllSpriteReferences();
+	std::vector<std::reference_wrapper<Rigidbody>> getAllRigidbodyReferences();
+	std::vector<std::reference_wrapper<Colider>> getAllColiderReferences();
 
 private:
     static ComponentManager mInstance;	//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:
-	 * 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>>>> mComponents;
+	ContiguousContainer<Sprite> mSpriteContainer;
+	ContiguousContainer<Rigidbody> mRigidbodyContainer;
+	ContiguousContainer<Colider> mColiderContainer;
 };
 
 #include "ComponentManager.hpp"
diff --git a/mwe/ecs-memory-efficient/inc/ComponentManager.hpp b/mwe/ecs-memory-efficient/inc/ComponentManager.hpp
index 53dfddd..1607c0c 100644
--- a/mwe/ecs-memory-efficient/inc/ComponentManager.hpp
+++ b/mwe/ecs-memory-efficient/inc/ComponentManager.hpp
@@ -1,88 +1,15 @@
-
-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>>
-    }
-
-    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<>
-}
-
-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
-        }
-	}
-}
-
-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
-	}
+	
+template<typename... Args>
+void ComponentManager::addSpriteComponent(Args&&... args) {
+	mSpriteContainer.pushBack(std::forward<Args>(args)...);
 }
 
-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<>
-                }
-            }
-        }
-    }
-
-    return componentVector; //Return the vector<>
+template<typename... Args>
+void ComponentManager::addRigidbodyComponent(Args&&... args) {
+	mRigidbodyContainer.pushBack(std::forward<Args>(args)...);
 }
 
-template <typename T>
-std::vector<std::pair<std::reference_wrapper<T>, std::uint32_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<>)
-
-    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<>
-
-        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), id);	//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<>
+template<typename... Args>
+void ComponentManager::addColiderComponent(Args&&... args){
+	mColiderContainer.pushBack(std::forward<Args>(args)...);
 }
diff --git a/mwe/ecs-memory-efficient/inc/ContiguousContainer.h b/mwe/ecs-memory-efficient/inc/ContiguousContainer.h
new file mode 100644
index 0000000..dd0321e
--- /dev/null
+++ b/mwe/ecs-memory-efficient/inc/ContiguousContainer.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <cstdlib>   // For malloc and free
+#include <new>       // For placement new
+#include <utility>   // For std::move and std::forward
+#include <stdexcept> // For std::bad_alloc
+#include <vector>    // For returning references
+
+template<typename T>
+class ContiguousContainer {
+public:
+    ContiguousContainer();
+    ~ContiguousContainer();
+
+    // Use perfect forwarding for pushBack
+    template<typename... Args>
+    void pushBack(Args&&... args);
+    
+    void popBack();
+    T& operator[](size_t index);
+    size_t getSize() const;
+
+	// Function to return references to all stored objects
+    std::vector<std::reference_wrapper<T>> getAllReferences();
+
+private:
+    T* mData;
+    size_t mSize;
+    size_t mCapacity;
+
+    void resize(size_t new_capacity);  // Resize function to allocate more space
+};
+
+#include "ContiguousContainer.hpp"
diff --git a/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
new file mode 100644
index 0000000..878a85f
--- /dev/null
+++ b/mwe/ecs-memory-efficient/inc/ContiguousContainer.hpp
@@ -0,0 +1,84 @@
+template<typename T>
+ContiguousContainer<T>::ContiguousContainer()
+    : mSize(0), mCapacity(10) {
+    // Allocate memory for 10 objects initially
+    mData = static_cast<T*>(malloc(mCapacity * sizeof(T)));
+    if (!mData) {
+        throw std::bad_alloc();
+    }
+}
+
+template<typename T>
+ContiguousContainer<T>::~ContiguousContainer() {
+    // Destroy all constructed objects
+    for (size_t i = 0; i < mSize; ++i) {
+        mData[i].~T();
+    }
+    // Free the allocated memory
+    free(mData);
+}
+
+template<typename T>
+template<typename... Args>
+void ContiguousContainer<T>::pushBack(Args&&... args) {
+    if (mSize == mCapacity) {
+        // Double the capacity if the container is full
+        resize(mCapacity * 2);
+    }
+    // Use placement new with perfect forwarding to construct the object in place
+    new (mData + mSize) T(std::forward<Args>(args)...);
+    ++mSize;
+}
+
+template<typename T>
+void ContiguousContainer<T>::popBack() {
+    if (mSize > 0) {
+        --mSize;
+        // Explicitly call the destructor
+        mData[mSize].~T();
+    }
+}
+
+template<typename T>
+T& ContiguousContainer<T>::operator[](size_t index) {
+    if (index >= mSize) {
+        throw std::out_of_range("Index out of range");
+    }
+    return mData[index];
+}
+
+template<typename T>
+size_t ContiguousContainer<T>::getSize() const {
+    return mSize;
+}
+
+// Function that returns a vector of references to all stored objects
+template<typename T>
+std::vector<std::reference_wrapper<T>> ContiguousContainer<T>::getAllReferences() {
+    std::vector<std::reference_wrapper<T>> references;
+    references.reserve(mSize);  // Reserve space to avoid reallocation
+    for (size_t i = 0; i < mSize; ++i) {
+        references.push_back(std::ref(mData[i]));
+    }
+    return references;
+}
+
+template<typename T>
+void ContiguousContainer<T>::resize(size_t new_capacity) {
+    // Allocate new memory block with the updated capacity
+    T* new_data = static_cast<T*>(malloc(new_capacity * sizeof(T)));
+    if (!new_data) {
+        throw std::bad_alloc();
+    }
+
+    // Move or copy existing objects to the new memory block
+    for (size_t i = 0; i < mSize; ++i) {
+        new (new_data + i) T(std::move(mData[i])); // Move the objects
+        mData[i].~T(); // Call the destructor for the old object
+    }
+
+    // Free the old memory block
+    free(mData);
+    mData = new_data;
+    mCapacity = new_capacity;
+}
diff --git a/mwe/ecs-memory-efficient/inc/GameObjectMax.h b/mwe/ecs-memory-efficient/inc/GameObjectMax.h
index f0bcec9..62cd3e6 100644
--- a/mwe/ecs-memory-efficient/inc/GameObjectMax.h
+++ b/mwe/ecs-memory-efficient/inc/GameObjectMax.h
@@ -7,8 +7,12 @@ 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... Args>
+    void addSpriteComponent(Args&&... args);
+	template<typename... Args>
+    void addRigidbodyComponent(Args&&... args);
+	template<typename... Args>
+    void addColiderComponent(Args&&... args);
 
 	std::uint32_t mId;
 	std::string mName;
diff --git a/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp b/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
index 1e952ba..aac9811 100644
--- a/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
+++ b/mwe/ecs-memory-efficient/inc/GameObjectMax.hpp
@@ -1,6 +1,16 @@
 #include "ComponentManager.h"
 
-template <typename T, typename... Args>
-void GameObject::AddComponent(Args&&... args) {
-	ComponentManager::GetInstance().AddComponent<T>(mId, std::forward<Args>(args)...);
+template <typename... Args>
+void GameObject::addSpriteComponent(Args&&... args) {
+	ComponentManager::GetInstance().addSpriteComponent(std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+void GameObject::addRigidbodyComponent(Args&&... args) {
+	ComponentManager::GetInstance().addRigidbodyComponent(std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+void GameObject::addColiderComponent(Args&&... args) {
+	ComponentManager::GetInstance().addColiderComponent(std::forward<Args>(args)...);
 }