Changeset 856 for cpp/common

Timestamp:

03/28/19 22:13:25 (6 years ago)

Author:

Maciej Komosinski

Message:

Support for more operations in 2D

File:

• cpp/common/2d.h (modified) (4 diffs)

cpp/common/2d.h

@@ -27 +27 @@
         template <typename Q> XY operator*=(Q q) { x *= q; y *= q; return *this; }
         template <typename Q> XY operator/=(Q q) { x /= q; y /= q; return *this; }
-        template <typename Q> XY operator/(Q q) { return XY(x / q, y / q); }
+        template <typename Q> XY operator/(Q q) const { return XY(x / q, y / q); }
         template <typename Q> XY operator*(Q q) const { return XY(q*x, q*y); }
         void set(T _x, T _y) { x = _x; y = _y; }
@@ -88 +88 @@
         template <typename Q> const XYRect& operator=(const Q& other) { p = other.p; size = other.size; return *this; }
 
+        T right() const {return p.x+size.x;}
+        T bottom() const {return p.y+size.y;}
+        T top() const {return p.y;}
+        T left() const {return p.x;}
+        XY<T> center() const {return p+size/2;}
+        const XY<T>& topLeft() const {return p;}
+        XY<T> bottomRight() const {return p+size;}
+        XY<T> topRight() const {return XY<T>(p.x+size.x,p.y);}
+        XY<T> bottomLeft() const {return XY<T>(p.x,p.y+size.y);}
+        
+        T area() const { return size.x*size.y; }
+
         bool intersects(const XYRect& r) const
         {
@@ -106 +118 @@
         }
 
+        bool contains(const XYRect& r) const
+        {
+                return contains(r.p) && contains(r.p+r.size);
+        }
+        
         void add(const XY<T>& n)
         {
@@ -165 +182 @@
         }
 
+        T distanceTo(const XYRect<T>& r) const
+        {
+        bool r_above = (r.bottom() <= top());
+        bool r_below = (r.top() >= bottom());
+        bool r_left = (r.right() <= left());
+        bool r_right = (r.left() >= right());
+
+        if (r_above)
+                {
+                if (r_left) return r.bottomRight().distanceTo(topLeft());
+                else if (r_right) return r.bottomLeft().distanceTo(topRight());
+                else return top()-r.bottom();
+                }
+        else if (r_below)
+                {
+                if (r_left) return r.topRight().distanceTo(bottomLeft());
+                else if (r_right) return r.topLeft().distanceTo(bottomRight());
+                else return r.top()-bottom();
+                }
+        else if (r_left)
+                {
+                return left()-r.right();
+                }
+        else if (r_right)
+                {
+                return r.left()-right();
+                }
+        else
+                return 0; //intersection
+        }
+
         static const XYRect& zero() { static XYRect t(0, 0, 0, 0); return t; }
         static const XYRect& one() { static XYRect t(0, 0, 1, 1); return t; }