orientation for entities

[orbi.git] / src / world / AABB.h

diff --git a/src/world/AABB.h b/src/world/AABB.h
index 20580caaded42e57f994432de8890820cbcc9b2c..ca7b85729e6609efcbb4e156a1f729de70205b3b 100644 (file)
--- a/src/world/AABB.h
+++ b/src/world/AABB.h
@@ -6,14 +6,16 @@
 
 namespace orbi {
 
+class Collision;
+
 class AABB {
 
 public:
        constexpr AABB() { }
        constexpr AABB(Vector<float> pos, Vector<float> size)
-       : lt(pos), rb(pos + size) { }
+       : size(size), lt(pos), rb(pos + size) { }
        constexpr AABB(float x, float y, float w, float h)
-       : lt(x, y), rb(x + w, y + h) { }
+       : size(w, h), lt(x, y), rb(x + w, y + h) { }
 
 public:
        float Left() const { return lt.x; }
@@ -21,18 +23,24 @@ public:
        float Right() const { return rb.x; }
        float Bottom() const { return rb.y; }
 
-       Vector<float> Position() const { return lt; }
+       Vector<float> LeftTop() const { return lt; }
+       Vector<float> LeftBottom() const { return Vector<float>(lt.x, rb.y); }
+       Vector<float> RightTop() const { return Vector<float>(rb.x, lt.y); }
+       Vector<float> RightBottom() const { return rb; }
+
        Vector<float> Center() const { return lt + HalfSize(); }
        Vector<float> HalfSize() const { return Size() / 2.0f; }
-       Vector<float> Size() const { return rb - lt; }
+       Vector<float> Size() const { return size; }
 
 public:
-       void Move(Vector<float> delta) { lt += delta; rb += delta; }
+       void Move(Vector<float> delta) { lt += delta; rb = lt + size; }
        void Resize(Vector<float> size) { *this = AABB(lt, size); }
 
-       bool Intersects(const AABB &other, Vector<float> &p, Vector<float> &n, Vector<float> &d) const;
+       bool Intersects(const AABB &other) const;
+       bool Intersects(const AABB &other, Collision &) const;
 
 private:
+       Vector<float> size;
        Vector<float> lt;
        Vector<float> rb;