Changeset 898 for cpp

Timestamp:

11/30/19 01:47:43 (5 years ago)

Author:

Maciej Komosinski

Message:

Added a few more basic 2D functions

File:

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

cpp/common/2d.h

@@ -29 +29 @@
         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); }
+        XY operator*=(const XY& q) { x *= q.x; y *= q.y; return *this; }
+        XY operator/=(const XY& q) { x /= q.x; y /= q.y; return *this; }
+        XY operator*(const XY& q) const { return XY(x*q.x, y*q.y); }
+        XY operator/(const XY& q) const { return XY(x/q.x, y/q.y); }
         void set(T _x, T _y) { x = _x; y = _y; }
         void add(T _x, T _y) { x += _x; y += _y; }
@@ -43 +47 @@
         static XY average(const XY& v1, const XY& v2) { return XY((v1.x + v2.x)*0.5, (v1.y + v2.y)*0.5); }
         double getDirection() const { return atan2(y, x); }
-        static XY interpolate(const XY& v1, const XY& v2, double t) { return v1 + (v2 - v1)*t; }
+        static XY interpolate(const XY& v1, const XY& v2, double t) { return universal_lerp(v1,v2,t); }
         XY toInt() const { return XY(int(x), int(y)); }
         XY transpose() const { return XY(y, x); }