More ranges stuff! Now with custom views

1 files changed, 16 insertions, 3 deletions

@@ -5,6 +5,7 @@
 #include "renderer.h"
 #include "schedule.h"
 #include "grid_cache.h"
+#include <range/v3/all.hpp>
 #include <vector>
 #include <deque>
 #include <set>
@@ -14,8 +15,6 @@ class Level;
 class Simulation {
 public:
 
-  using id_type = std::vector<Entity>::size_type;
-
   // Constructor
   explicit Simulation(const Level& level);
 
@@ -47,13 +46,27 @@ public:
     return level_;
   }
 
+  auto entityView()
+  {
+    return ranges::view::transform([&] (id_type id) -> Entity& {
+      return entities_.at(id);
+    });
+  }
+
+  auto entityView() const
+  {
+    return ranges::view::transform([&] (id_type id) -> const Entity& {
+      return entities_.at(id);
+    });
+  }
+
 private:
 
 
 
 
   bool moveEntityOnGrid(
-    id_type id,
+    Entity& entity,
     Direction moveDir,
     bool validate = false);