Changeset 1130 for cpp/common/2d.h

Timestamp:

04/16/21 15:55:34 (3 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

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

cpp/common/2d.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -6 +6 @@
 #define _2D_H_
 
-#include "nonstd_stl.h"
 #include <math.h>
+#include <algorithm>
 
 //unification of old GUIXY and Pt2D
@@ -58 +58 @@
 template<> inline bool XY<int>::operator==(const XY<int> &p) const { return (x == p.x) && (y == p.y); }
 
-template <typename T> XY<T> xymin(const XY<T> &a, const XY<T> &b) { return XY<T>(min(a.x, b.x), min(a.y, b.y)); }
-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)); }
+template <typename T> XY<T> xymin(const XY<T> &a, const XY<T> &b) { return XY<T>(std::min(a.x, b.x), std::min(a.y, b.y)); }
+template <typename T> XY<T> xymax(const XY<T> &a, const XY<T> &b) { return XY<T>(std::max(a.x, b.x), std::max(a.y, b.y)); }
 
 template <typename T>
@@ -74 +74 @@
         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))); }
+        XYMargin normalized() const { return XYMargin(std::max(left, T(0)), std::max(top, T(0)), std::max(right, T(0)), std::max(bottom, T(0))); }
 };
 
@@ -162 +162 @@
         }
 
-        XYRect fitAspect(float aspect) ///< place a new rectangle having 'aspect' inside the rectangle
+        XYRect fitAspect(float aspect) const ///< place a new rectangle having 'aspect' inside the rectangle
         {
                 XYRect r;
@@ -179 +179 @@
                 XY<T> p2 = p + size;
                 XY<T> rp2 = r.p + r.size;
-                i.p.x = max(p.x, r.p.x);
-                i.p.y = max(p.y, r.p.y);
-                i.size.x = min(p2.x, rp2.x) - i.p.x;
-                i.size.y = min(p2.y, rp2.y) - i.p.y;
+                i.p.x = std::max(p.x, r.p.x);
+                i.p.y = std::max(p.y, r.p.y);
+                i.size.x = std::min(p2.x, rp2.x) - i.p.x;
+                i.size.y = std::min(p2.y, rp2.y) - i.p.y;
                 return i;
         }