5 files changed, 15 insertions, 20 deletions

@@ -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.
@@ -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;
 
 };
 
@@ -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.
@@ -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
@@ -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 */