1 files changed, 110 insertions, 98 deletions

@@ -2,14 +2,47 @@
 #define MAPPABLE_H_0B0316FB
 
 #include <map>
+#include <string>
+#include <vector>
+#include <list>
 #include "component.h"
 #include "renderer/texture.h"
 #include "collision.h"
-#include "map.h"
+#include "entity_manager.h"
 
 class MappableComponent : public Component {
 public:
 
+  using id_type = EntityManager::id_type;
+
+  /**
+   * Helper type that stores information about map adjacency.
+   */
+  class Adjacent {
+  public:
+
+    enum class Type {
+      wall,
+      wrap,
+      warp,
+      reverse
+    };
+
+    Adjacent(
+      Type type = Type::wall,
+      size_t mapId = 0) :
+        type(type),
+        mapId(mapId)
+    {
+    }
+
+    Type type;
+    size_t mapId;
+  };
+
+  /**
+   * Helper type that stores information about collision boundaries.
+   */
   class Boundary {
   public:
 
@@ -20,121 +53,100 @@ public:
       double lower,
       double upper,
       Type type) :
-        axis_(axis),
-        lower_(lower),
-        upper_(upper),
-        type_(type)
-    {
-    }
-
-    inline double getAxis() const
-    {
-      return axis_;
-    }
-
-    inline double getLower() const
-    {
-      return lower_;
-    }
-
-    inline double getUpper() const
-    {
-      return upper_;
-    }
-
-    inline Type getType() const
+        axis(axis),
+        lower(lower),
+        upper(upper),
+        type(type)
     {
-      return type_;
     }
 
-  private:
-
-    double axis_;
-    double lower_;
-    double upper_;
-    Type type_;
+    double axis;
+    double lower;
+    double upper;
+    Type type;
   };
 
-  MappableComponent(
-    Texture tileset,
-    Texture font) :
-      tileset_(std::move(tileset)),
-      font_(std::move(font))
-  {
-  }
-
+  /**
+   * Helper types for efficient storage and lookup of collision boundaries.
+   */
   using asc_boundaries_type =
     std::multimap<
       double,
-      Boundary,
+      const Boundary,
       std::less<double>>;
 
   using desc_boundaries_type =
     std::multimap<
       double,
-      Boundary,
+      const Boundary,
       std::greater<double>>;
 
-  inline size_t getMapId() const
-  {
-    return mapId_;
-  }
-
-  inline void setMapId(size_t v)
-  {
-    mapId_ = v;
-  }
-
-  inline desc_boundaries_type& getLeftBoundaries()
-  {
-    return leftBoundaries_;
-  }
-
-  inline asc_boundaries_type& getRightBoundaries()
-  {
-    return rightBoundaries_;
-  }
-
-  inline desc_boundaries_type& getUpBoundaries()
-  {
-    return upBoundaries_;
-  }
-
-  inline asc_boundaries_type& getDownBoundaries()
-  {
-    return downBoundaries_;
-  }
-
-  inline const Texture& getTileset() const
-  {
-    return tileset_;
-  }
-
-  inline void setTileset(Texture v)
-  {
-    tileset_ = std::move(v);
-  }
-
-  inline const Texture& getFont() const
-  {
-    return font_;
-  }
-
-  inline void setFont(Texture v)
+  /**
+   * Constructor for initializing the tileset and font attributes, as they are
+   * not default constructible.
+   */
+  MappableComponent(
+    Texture tileset,
+    Texture font) :
+      tileset(std::move(tileset)),
+      font(std::move(font))
   {
-    font_ = std::move(v);
   }
 
-private:
-
-  size_t mapId_ = -1;
-
-  desc_boundaries_type leftBoundaries_;
-  asc_boundaries_type rightBoundaries_;
-  desc_boundaries_type upBoundaries_;
-  asc_boundaries_type downBoundaries_;
-  Texture tileset_;
-  Texture font_;
+  /**
+   * The ID of the map in the world definition that this entity represents.
+   *
+   * @managed_by RealizingSystem
+   */
+  size_t mapId;
+
+  /**
+   * The title of the map, which is displayed at the bottom of the screen.
+   */
+  std::string title;
+
+  /**
+   * The map data.
+   *
+   * @managed_by RealizingSystem
+   */
+  std::vector<int> tiles;
+
+  /**
+   * These objects describe the behavior of the four edges of the map.
+   *
+   * @managed_by RealizingSystem
+   */
+  Adjacent leftAdjacent;
+  Adjacent rightAdjacent;
+  Adjacent upAdjacent;
+  Adjacent downAdjacent;
+
+  /**
+   * Collision boundaries, for detecting when a ponderable entity is colliding
+   * with the environment.
+   *
+   * @managed_by MappingSystem
+   */
+  desc_boundaries_type leftBoundaries;
+  asc_boundaries_type rightBoundaries;
+  desc_boundaries_type upBoundaries;
+  asc_boundaries_type downBoundaries;
+
+  /**
+   * The list of entities representing the objects owned by the map.
+   *
+   * @managed_by RealizingSystem
+   */
+  std::list<id_type> objects;
+
+  /**
+   * The tilesets for the map and the map name.
+   *
+   * TODO: These probably do not belong here.
+   */
+  Texture tileset;
+  Texture font;
 };
 
 #endif /* end of include guard: MAPPABLE_H_0B0316FB */