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/vector.h | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 src/vector.h

(limited to 'src/vector.h')

diff --git a/src/vector.h b/src/vector.h
new file mode 100644
index 0000000..3abd98a
--- /dev/null
+++ b/src/vector.h
@@ -0,0 +1,111 @@
+#ifndef COORDINATES_H_A45D34FB
+#define COORDINATES_H_A45D34FB
+
+template <typename T>
+class vec2 {
+public:
+
+  T coords[2];
+
+  vec2() = default;
+
+  vec2(double x, double y) : coords{x, y}
+  {
+  }
+
+  inline T& x()
+  {
+    return coords[0];
+  }
+
+  inline const T& x() const
+  {
+    return coords[0];
+  }
+
+  inline T& w()
+  {
+    return coords[0];
+  }
+
+  inline const T& w() const
+  {
+    return coords[0];
+  }
+
+  inline T& y()
+  {
+    return coords[1];
+  }
+
+  inline const T& y() const
+  {
+    return coords[1];
+  }
+
+  inline T& h()
+  {
+    return coords[1];
+  }
+
+  inline const T& h() const
+  {
+    return coords[1];
+  }
+
+  template <typename R>
+  operator vec2<R>() const
+  {
+    return vec2<R>(x(), y());
+  }
+
+  vec2 operator+(const vec2& other) const
+  {
+    return vec2(x() + other.x(), y() + other.y());
+  }
+
+  vec2& operator+=(const vec2& other)
+  {
+    x() += other.x();
+    y() += other.y();
+
+    return *this;
+  }
+
+  vec2 operator-(const vec2& other) const
+  {
+    return vec2(x() - other.x(), y() - other.y());
+  }
+
+  vec2 operator-=(const vec2& other)
+  {
+    x() -= other.x();
+    y() -= other.y();
+
+    return *this;
+  }
+
+  vec2 operator-() const
+  {
+    return vec2(-x(), -y());
+  }
+
+  vec2 operator*(double s) const
+  {
+    return vec2(x() * s, y() * s);
+  }
+
+  vec2& operator*=(double s)
+  {
+    x() *= s;
+    y() *= s;
+
+    return *this;
+  }
+
+};
+
+using vec2d = vec2<double>;
+using vec2i = vec2<int>;
+
+#endif /* end of include guard: COORDINATES_H_A45D34FB */
-- 
cgit 1.4.1