Added map object collision

Collision checking in PonderingSystem was rewritten to work as follows: horizontal movement is step first, then vertical. In each step, the closest environmental boundary to the body is found on the axis of movement in the space traversed by the body. Then, if any map objects fall in the region between the body's old position and the environmental boundary (or body new position if no boundary was found), process collision with those bodies in increasing distance order, stopping if a collision stops movement short of where the next collision would take place. After this, process collision with all of the environmental boundaries at the axis distance found earlier, as long as movement hasn't stopped short.

This is not the most optimal implementation, and there is a lot of code repetition, but it is a start and it works.

All map objects currently function as walls.

This fixes the bug where you could, with pixel-perfect precision, jump into the corner of a wall tile.

The top of the hitbox for the spike tile was lowered by one pixel. This fixes a problem where if the player is halfway on a floor tile and halfway over a spike tile, the floor tile would not stop the spike tile from being processed, and the player would die.

2 files changed, 18 insertions, 2 deletions

@@ -7,7 +7,7 @@
 #include <list>
 #include "component.h"
 #include "renderer/texture.h"
-#include "collision.h"
+#include "components/ponderable.h"
 #include "entity_manager.h"
 
 class MappableComponent : public Component {
@@ -46,7 +46,7 @@ public:
   class Boundary {
   public:
 
-    using Type = Collision::Type;
+    using Type = PonderableComponent::Collision;
 
     Boundary(
       double axis,
@@ -21,6 +21,17 @@ public:
   };
 
   /**
+   * List of different types of collidable surfaces.
+   */
+  enum class Collision {
+    wall,
+    platform,
+    adjacency,
+    warp,
+    danger
+  };
+
+  /**
    * Constructor for initializing the body type, which is a constant.
    */
   PonderableComponent(Type type) : type(type)
@@ -67,6 +78,11 @@ public:
   bool collidable = true;
 
   /**
+   * The effect that colliding with this body has.
+   */
+  Collision colliderType = Collision::wall;
+
+  /**
    * If this flag is disabled, the entity will be ignored by the pondering
    * system.
    *