Merge pull request #7 from hatkirby/es-rewrite

The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.

1 files changed, 81 insertions, 0 deletions

@@ -0,0 +1,81 @@
+#ifndef PONDERING_H_F2530E0E
+#define PONDERING_H_F2530E0E
+
+#include "system.h"
+#include "components/ponderable.h"
+#include "direction.h"
+#include "vector.h"
+
+class PonderingSystem : public System {
+public:
+
+  PonderingSystem(Game& game) : System(game)
+  {
+  }
+
+  void tick(double dt);
+
+  void initializeBody(id_type entity, PonderableComponent::Type type);
+
+  /**
+   * Initializes a ponderable map object from its prototype data.
+   *
+   * @requires entity is ponderable
+   * @requires entity is a map object
+   */
+  void initPrototype(id_type prototype);
+
+  /**
+   * Unferries an entity if it is a passenger of another entity. Use before
+   * moving a ponderable entity outside the PonderingSystem.
+   *
+   * @requires entity is ponderable
+   */
+  void unferry(id_type entity);
+
+private:
+
+  struct CollisionResult
+  {
+    vec2d pos;
+    bool stopProcessing = false;
+    bool touchedWall = false;
+    bool blockedHoriz = false;
+    bool blockedVert = false;
+    bool adjacentlyWarping = false;
+    Direction adjWarpDir;
+    size_t adjWarpMapId;
+    bool grounded = false;
+    id_type groundEntity;
+  };
+
+  void tickBody(
+    id_type entity,
+    double dt);
+
+  CollisionResult moveBody(
+    id_type entity,
+    vec2d newPos);
+
+  CollisionResult detectCollisions(
+    id_type entity,
+    vec2d newPos);
+
+  template <typename Param>
+  void detectCollisionsInDirection(
+    id_type entity,
+    CollisionResult& result);
+
+  void processCollision(
+    id_type entity,
+    id_type collider,
+    Direction dir,
+    PonderableComponent::Collision type,
+    double axis,
+    double lower,
+    double upper,
+    CollisionResult& result);
+
+};
+
+#endif /* end of include guard: PONDERING_H_F2530E0E */