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/components/automatable.h   |  4 ++--
 src/components/playable.h      |  4 ++--
 src/components/ponderable.h    | 10 ++++------
 src/components/realizable.h    |  4 ++--
 src/components/transformable.h | 13 +++++--------
 5 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'src/components')

diff --git a/src/components/automatable.h b/src/components/automatable.h
index b37945f..c1fd1a3 100644
--- a/src/components/automatable.h
+++ b/src/components/automatable.h
@@ -4,6 +4,7 @@
 #include "component.h"
 #include <vector>
 #include <random>
+#include "vector.h"
 
 class AutomatableComponent : public Component {
 public:
@@ -18,8 +19,7 @@ public:
      * The horizontal and vertical speed, in pixels/sec, that the entity should
      * move at.
      */
-    double speedX;
-    double speedY;
+    vec2d speed;
 
     /**
      * The duration of the action in seconds.
diff --git a/src/components/playable.h b/src/components/playable.h
index 94d4326..b8af0f2 100644
--- a/src/components/playable.h
+++ b/src/components/playable.h
@@ -3,6 +3,7 @@
 
 #include "component.h"
 #include "entity_manager.h"
+#include "vector.h"
 
 class PlayableComponent : public Component {
 public:
@@ -24,8 +25,7 @@ public:
    * @managed_by PlayingSystem
    */
   size_t checkpointMapId;
-  double checkpointX;
-  double checkpointY;
+  vec2d checkpointPos;
 
 };
 
diff --git a/src/components/ponderable.h b/src/components/ponderable.h
index eff20e9..c0312b4 100644
--- a/src/components/ponderable.h
+++ b/src/components/ponderable.h
@@ -4,6 +4,7 @@
 #include <set>
 #include "component.h"
 #include "entity_manager.h"
+#include "vector.h"
 
 class PonderableComponent : public Component {
 public:
@@ -45,14 +46,12 @@ public:
   /**
    * The velocity of the body.
    */
-  double velX = 0.0;
-  double velY = 0.0;
+  vec2d vel = { 0.0, 0.0 };
 
   /**
    * The acceleration of the body.
    */
-  double accelX = 0.0;
-  double accelY = 0.0;
+  vec2d accel = { 0.0, 0.0 };
 
   /**
    * The type of physical body that the entity is meant to assume. The body will
@@ -89,8 +88,7 @@ public:
    *
    * @managed_by PonderingSystem
    */
-  double relX;
-  double relY;
+  vec2d rel = { 0.0, 0.0 };
 
   /**
    * The bodies that are being ferried by this body.
diff --git a/src/components/realizable.h b/src/components/realizable.h
index 0858e7a..b749aeb 100644
--- a/src/components/realizable.h
+++ b/src/components/realizable.h
@@ -5,6 +5,7 @@
 #include <set>
 #include <map>
 #include "entity_manager.h"
+#include "vector.h"
 
 class RealizableComponent : public Component {
 public:
@@ -31,8 +32,7 @@ public:
    * @managed_by RealizingSystem
    */
   int startingMapId;
-  int startingX;
-  int startingY;
+  vec2i startingPos;
 
   /**
    * The set of map entities loaded by this entity. It is only intended for
diff --git a/src/components/transformable.h b/src/components/transformable.h
index 6f3c2ef..bb21996 100644
--- a/src/components/transformable.h
+++ b/src/components/transformable.h
@@ -2,6 +2,7 @@
 #define LOCATABLE_H_39E526CA
 
 #include "component.h"
+#include "vector.h"
 
 class TransformableComponent : public Component {
 public:
@@ -15,24 +16,20 @@ public:
    * so, use PonderingSystem::unferry on the body to ensure that it is not
    * ferried.
    */
-  double x;
-  double y;
+  vec2d pos;
 
   /**
    * The size of the entity.
    */
-  int w;
-  int h;
+  vec2i size;
 
   /**
    * For prototypes, the original coordinates and size of the entity.
    *
    * @managed_by RealizingSystem
    */
-  double origX;
-  double origY;
-  int origW;
-  int origH;
+  vec2d origPos;
+  vec2i origSize;
 };
 
 #endif /* end of include guard: LOCATABLE_H_39E526CA */
-- 
cgit 1.4.1