Changeset 766 for cpp

Timestamp:

03/29/18 22:51:30 (7 years ago)

Author:

Maciej Komosinski

Message:

Added a number of useful methods in 2D

File:

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

cpp/common/2d.h

@@ -18 +18 @@
 template <typename Q> XY(const Q& other):x(other.x),y(other.y) {}
 template <typename Q> const XY& operator=(const Q& other) {x=other.x; y=other.y; return *this;}
+template <typename Q> const XY operator()(const Q& other) {return XY(other.x,other.y);}
 XY operator+(const XY&p) const  {return XY(x+p.x,y+p.y);}
 XY operator-(const XY&p) const {return XY(x-p.x,y-p.y);}
@@ -49 +50 @@
 template <typename T> XY<T> xymax(const XY<T>& a, const XY<T>& b) {return XY<T>(max(a.x,b.x),max(a.y,b.y));}
 
-typedef XY<int> IntXY;
+template <typename T>
+class XYMargin
+{
+  public:
+        XYMargin(T x=0):left(x),top(x),right(x),bottom(x) {}
+        XYMargin(T l,T t,T r,T b):left(l),top(t),right(r),bottom(b) {}
+        T left,top,right,bottom;
+        void operator=(T x) {left=top=right=bottom=x;}
+        XYMargin operator-() const {return XYMargin(-left,-top,-right,-bottom);}
+        void operator=(const XYMargin<T> &other) {left=other.left; top=other.top; right=other.right; bottom=other.bottom;}
+        T horizontal() const {return left+right;}
+        T vertical() const {return top+bottom;}
+};
 
 template <typename T>
@@ -58 +71 @@
 XYRect() {}
 XYRect(const XY<T>& p1,const XY<T>& s):p(p1),size(s) {}
+template <typename Q> XYRect(const Q& other):p(other.p),size(other.size) {}
 XYRect(T _x,T _y,T _w,T _h):p(_x,_y),size(_w,_h) {}
 static XYRect<T> centeredAt(const XY<T>& p,XY<T> s) {return XYRect<T>(p-s*0.5,s);}
@@ -64 +78 @@
 XYRect toInt() const {return XYRect(int(p.x),int(p.y),int(p.x+size.x)-int(p.x),int(p.y+size.y)-int(p.y));}
 bool operator==(const XYRect& r) const {return (p==r.p) && (size==r.size);}
+template <typename Q> const XYRect& operator=(const Q& other) {p=other.p; size=other.size; return *this;}
 
 bool intersects(const XYRect& r) const
@@ -91 +106 @@
 }
 
-void extend(const XY<T>& border_size)
+XYRect extendBy(const XY<T>& border_size) const
 {
-size+=border_size*2; p-=border_size;
+return XYRect(p-border_size,size+border_size*2);
+}
+
+XYRect shrinkBy(const XY<T>& border_size) const
+{
+return XYRect(p+border_size,size-border_size*2); 
+}
+
+XYRect extendBy(const XYMargin<T>& m) const
+{
+return XYRect(p.x-m.left,p.y-m.top,size.x+m.horizontal(),size.y+m.vertical());
+}
+
+XYRect shrinkBy(const XYMargin<T>& m) const
+{
+return XYRect(p.x+m.left,p.y+m.top,size.x-m.horizontal(),size.y-m.vertical());
+}
+
+XYMargin<T> marginTowards(const XYRect &r) const
+{
+return XYMargin<T>(r.p.x, r.p.y,
+                (p.x+size.x)-(r.p.x+r.size.x), (p.y+size.y)-(r.p.y+r.size.y));
 }
 
@@ -108 +144 @@
 }
 
+XYRect translation(const XY<T>& t) const
+{
+return XYRect(p+t,size);
+}
+
 T distanceTo(const XY<T>& n) const
 {
@@ -120 +161 @@
 };
 
+typedef XY<int> IntXY;
+typedef XYRect<int> IntRect;
 
 #endif