Changed EntityManager to dense vector

This should improve speed, because entity lookup will be O(1) instead of O(log n). Deletion is also O(1). Insert stays at potentially O(n), but still should be overall faster than the previous method.

Also replaced some asserts with exceptions.

Also made Component polymorphic so that deletion actually works properly.

1 files changed, 25 insertions, 18 deletions

@@ -5,33 +5,40 @@
 #include <memory>
 #include <map>
 #include <typeindex>
+#include <stdexcept>
 #include "system.h"
 
 class SystemManager {
-  private:
-    std::list<std::unique_ptr<System>> loop;
-    std::map<std::type_index, System*> systems;
+private:
 
-  public:
-    template <class T, class... Args>
-    void emplaceSystem(Game& game, Args&&... args)
-    {
-      std::unique_ptr<T> ptr = std::unique_ptr<T>(new T(game, std::forward<Args>(args)...));
-      std::type_index systemType = typeid(T);
+  std::list<std::unique_ptr<System>> loop;
+  std::map<std::type_index, System*> systems;
 
-      systems[systemType] = ptr.get();
-      loop.push_back(std::move(ptr));
-    }
+public:
 
-    template <class T>
-    T& getSystem()
-    {
-      std::type_index systemType = typeid(T);
+  template <class T, class... Args>
+  void emplaceSystem(Game& game, Args&&... args)
+  {
+    std::unique_ptr<T> ptr(new T(game, std::forward<Args>(args)...));
+    std::type_index systemType = typeid(T);
+
+    systems[systemType] = ptr.get();
+    loop.push_back(std::move(ptr));
+  }
 
-      assert(systems.count(systemType) == 1);
+  template <class T>
+  T& getSystem()
+  {
+    std::type_index systemType = typeid(T);
 
-      return *((T*)systems[systemType]);
+    if (!systems.count(systemType))
+    {
+      throw std::invalid_argument("Cannot get non-existent system");
     }
+
+    return *dynamic_cast<T*>(systems[systemType]);
+  }
+
 };
 
 #endif /* end of include guard: SYSTEM_MANAGER_H_544E6056 */