From 5c82f052c26303318e81ddd76475c1d188cc74f4 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 8 May 2018 21:09:36 -0400
Subject: Simplified positions/sizes with vectors

Positions and sizes are now stored as vectors (of doubles and ints, respectively). This allows for at least minor code simplification in many places, and cleans up the CollisionParams code in PonderingSystem quite a bit.
---
 src/systems/pondering.h | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'src/systems/pondering.h')

diff --git a/src/systems/pondering.h b/src/systems/pondering.h
index abc6db2..273db67 100644
--- a/src/systems/pondering.h
+++ b/src/systems/pondering.h
@@ -4,19 +4,7 @@
 #include "system.h"
 #include "components/ponderable.h"
 #include "direction.h"
-
-struct CollisionResult
-{
-  double newX;
-  double newY;
-  bool stopProcessing = false;
-  bool touchedWall = false;
-  bool adjacentlyWarping = false;
-  Direction adjWarpDir;
-  size_t adjWarpMapId;
-  bool grounded = false;
-  EntityManager::id_type groundEntity;
-};
+#include "vector.h"
 
 class PonderingSystem : public System {
 public:
@@ -47,7 +35,19 @@ public:
 
 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,
@@ -56,13 +56,11 @@ private:
 
   CollisionResult moveBody(
     id_type entity,
-    double x,
-    double y);
+    vec2d newPos);
 
   CollisionResult detectCollisions(
     id_type entity,
-    double x,
-    double y);
+    vec2d newPos);
 
   template <typename Param>
   void detectCollisionsInDirection(
-- 
cgit 1.4.1