1 files changed, 6 insertions, 7 deletions

@@ -3,11 +3,11 @@
 
 #include "entity.h"
 #include "renderer.h"
+#include "schedule.h"
+#include "grid_cache.h"
 #include <vector>
 #include <deque>
 #include <set>
-#include <unordered_map>
-#include <unordered_set>
 
 class Level;
 
@@ -17,7 +17,7 @@ public:
   using id_type = std::vector<Entity>::size_type;
 
   // Constructor
-  explicit Simulation(const Level& level) : level_(level) {}
+  explicit Simulation(const Level& level);
 
   void tick(
     double dt,
@@ -47,15 +47,12 @@ public:
     return level_;
   }
 
-  void setGridPos(id_type id, vec2s pos);
-
   static vec2s posInDir(vec2s orig, Direction dir);
 
 private:
 
 
 
-  const std::unordered_set<id_type>& getGridEntities(vec2s pos) const;
 
   bool moveEntityOnGrid(
     id_type id,
@@ -63,12 +60,14 @@ private:
     bool validate = false);
 
   const Level& level_;
+  Schedule schedule_ { 120 };
 
   std::vector<Entity> entities_;
   std::deque<id_type> available_;
   std::set<id_type> active_;
 
-  mutable std::unordered_map<size_t, std::unordered_set<id_type>> gridCache_;
+  mutable GridCache<id_type> posCache_ { level_ };
+  mutable GridCache<id_type> moveToCache_ { level_ };
 };
 
 #endif /* end of include guard: SIMULATION_H_7BF6EEA4 */