Changeset 778 for cpp/common

Timestamp:

05/11/18 23:38:10 (7 years ago)

Author:

Maciej Komosinski

Message:

A few useful functions added for 2D operations

File:

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

cpp/common/2d.h

@@ -62 +62 @@
         T horizontal() const {return left+right;}
         T vertical() const {return top+bottom;}
+        bool operator==(const XYMargin &other) const {return left==other.left && top==other.top && right==other.right && bottom==other.bottom;}
+        XYMargin normalized() const {return XYMargin(max(left,T(0)),max(top,T(0)),max(right,T(0)),max(bottom,T(0)));}
 };
 
@@ -128 +130 @@
 XYMargin<T> marginTowards(const XYRect &r) const
 {
-return XYMargin<T>(r.p.x, r.p.y,
+return XYMargin<T>(r.p.x-p.x, r.p.y-p.y,
                 (p.x+size.x)-(r.p.x+r.size.x), (p.y+size.y)-(r.p.y+r.size.y));
 }