Changeset 866

Timestamp:

04/07/19 03:16:14 (6 years ago)

Author:

Maciej Komosinski

Message:

XY and XYRect for floating point values

File:

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

cpp/common/2d.h

@@ -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 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; }
 
@@ -120 +120 @@
         bool contains(const XYRect& r) const
         {
-                return contains(r.p) && contains(r.p+r.size);
-        }
-        
+                return contains(r.p) && contains(r.p + r.size);
+        }
+
         void add(const XY<T>& n)
         {
@@ -184 +184 @@
         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
+                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
         }
 
@@ -220 +220 @@
 typedef XYRect<int> IntRect;
 
+typedef XY<float> FloatXY;
+typedef XYRect<float> FloatRect;
+
 #endif