1 files changed, 13 insertions, 25 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"