More point and math

Author: kunitoki

modules/yup_graphics/primitives/yup_Point.h

@@ -642,11 +642,9 @@ class YUP_API Point
 
         @return The angle in radians between this point and the other point.
     */
-    [[nodiscard]] constexpr float angleTo (const Point& other) const noexcept
+    [[nodiscard]] float angleTo (const Point& other) const noexcept
     {
-        const auto magProduct = magnitude() * other.magnitude();
-
-        return magProduct == 0.0f ? 0.0f : std::acos (dotProduct (other) / magProduct);
+        return std::atan2 (other.x - x, other.y - y);
     }
 
     //==============================================================================

tests/yup_core/yup_MathFunctions.cpp

@@ -0,0 +1,34 @@
+/*
+  ==============================================================================
+
+   This file is part of the YUP library.
+   Copyright (c) 2025 - [email protected]
+
+   YUP is an open source library subject to open-source licensing.
+
+   The code included in this file is provided under the terms of the ISC license
+   http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+   to use, copy, modify, and/or distribute this software for any purpose with or
+   without fee is hereby granted provided that the above copyright notice and
+   this permission notice appear in all copies.
+
+   YUP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+#include <gtest/gtest.h>
+
+#include <yup_core/yup_core.h>
+
+using namespace yup;
+
+namespace
+{
+} // namespace
+
+TEST (MathFunctionsTests, XYZ)
+{
+}

tests/yup_graphics/yup_Point.cpp

@@ -62,6 +62,10 @@ TEST (PointTests, GetSet_Coordinates)
     p.setY (4.0f);
     EXPECT_FLOAT_EQ (p.getX(), 3.0f);
     EXPECT_FLOAT_EQ (p.getY(), 4.0f);
+
+    auto p2 = p.withXY (5.0f, 6.0f);
+    EXPECT_FLOAT_EQ (p2.getX(), 5.0f);
+    EXPECT_FLOAT_EQ (p2.getY(), 6.0f);
 }
 
 TEST (PointTests, With_Coordinates)
@@ -179,6 +183,14 @@ TEST (PointTests, Rotation)
     }
 }
 
+TEST (PointTests, AngleTo)
+{
+    Point<float> p1 (0.0f, 0.0f);
+    Point<float> p2 (1.0f, 1.0f);
+
+    EXPECT_FLOAT_EQ (p1.angleTo (p2), yup::degreesToRadians (45.0f));
+}
+
 TEST (PointTests, Midpoint)
 {
     Point<float> p1 (0.0f, 0.0f);
@@ -234,6 +246,20 @@ TEST (PointTests, Reflection)
     Point<float> pO = p.reflectedOverOrigin();
     EXPECT_FLOAT_EQ (pO.getX(), -1.0f);
     EXPECT_FLOAT_EQ (pO.getY(), -2.0f);
+
+    Point<float> p0 (1.0f, 2.0f);
+
+    p0.reflectOverXAxis();
+    EXPECT_FLOAT_EQ (p0.getX(), 1.0f);
+    EXPECT_FLOAT_EQ (p0.getY(), -2.0f);
+
+    p0.reflectOverYAxis();
+    EXPECT_FLOAT_EQ (p0.getX(), -1.0f);
+    EXPECT_FLOAT_EQ (p0.getY(), -2.0f);
+
+    p0.reflectOverOrigin();
+    EXPECT_FLOAT_EQ (p0.getX(), 1.0f);
+    EXPECT_FLOAT_EQ (p0.getY(), 2.0f);
 }
 
 TEST (PointTests, MinMax_Abs)
@@ -263,18 +289,42 @@ TEST (PointTests, Arithmetic_Operators)
     Point<float> sum = p1 + p2;
     EXPECT_FLOAT_EQ (sum.getX(), 4.0f);
     EXPECT_FLOAT_EQ (sum.getY(), 6.0f);
+    sum = sum + 1.0f;
+    EXPECT_FLOAT_EQ (sum.getX(), 5.0f);
+    EXPECT_FLOAT_EQ (sum.getY(), 7.0f);
+    sum += 1.0f;
+    EXPECT_FLOAT_EQ (sum.getX(), 6.0f);
+    EXPECT_FLOAT_EQ (sum.getY(), 8.0f);
 
     Point<float> diff = p2 - p1;
     EXPECT_FLOAT_EQ (diff.getX(), 2.0f);
     EXPECT_FLOAT_EQ (diff.getY(), 2.0f);
-
-    Point<float> scaled = p1 * 2.0f;
-    EXPECT_FLOAT_EQ (scaled.getX(), 2.0f);
-    EXPECT_FLOAT_EQ (scaled.getY(), 4.0f);
-
-    Point<float> divided = scaled / 2.0f;
-    EXPECT_FLOAT_EQ (divided.getX(), 1.0f);
-    EXPECT_FLOAT_EQ (divided.getY(), 2.0f);
+    diff = diff - 1.0f;
+    EXPECT_FLOAT_EQ (diff.getX(), 1.0f);
+    EXPECT_FLOAT_EQ (diff.getY(), 1.0f);
+    diff -= 1.0f;
+    EXPECT_FLOAT_EQ (diff.getX(), 0.0f);
+    EXPECT_FLOAT_EQ (diff.getY(), 0.0f);
+
+    Point<float> mul = p2 * p1;
+    EXPECT_FLOAT_EQ (mul.getX(), 3.0f);
+    EXPECT_FLOAT_EQ (mul.getY(), 8.0f);
+    mul = mul * 2.0f;
+    EXPECT_FLOAT_EQ (mul.getX(), 6.0f);
+    EXPECT_FLOAT_EQ (mul.getY(), 16.0f);
+    mul *= 0.5f;
+    EXPECT_FLOAT_EQ (mul.getX(), 3.0f);
+    EXPECT_FLOAT_EQ (mul.getY(), 8.0f);
+
+    Point<float> div = p2 / p1;
+    EXPECT_FLOAT_EQ (div.getX(), 3.0f);
+    EXPECT_FLOAT_EQ (div.getY(), 2.0f);
+    div = div / 2.0f;
+    EXPECT_FLOAT_EQ (div.getX(), 1.5f);
+    EXPECT_FLOAT_EQ (div.getY(), 1.0f);
+    div /= 0.5f;
+    EXPECT_FLOAT_EQ (div.getX(), 3.0f);
+    EXPECT_FLOAT_EQ (div.getY(), 2.0f);
 }
 
 TEST (PointTests, Equality_Operators)

tests/yup_graphics/yup_Rectangle.cpp

@@ -42,6 +42,13 @@ TEST (RectangleTests, Default_Constructor)
 
 TEST (RectangleTests, Parameterized_Constructors)
 {
+    // Constructor with width, height
+    Rectangle<float> r0 (3.0f, 4.0f);
+    EXPECT_FLOAT_EQ (r0.getX(), 0.0f);
+    EXPECT_FLOAT_EQ (r0.getY(), 0.0f);
+    EXPECT_FLOAT_EQ (r0.getWidth(), 3.0f);
+    EXPECT_FLOAT_EQ (r0.getHeight(), 4.0f);
+
     // Constructor with x, y, width, height
     Rectangle<float> r1 (1.0f, 2.0f, 3.0f, 4.0f);
     EXPECT_FLOAT_EQ (r1.getX(), 1.0f);
@@ -147,10 +154,14 @@ TEST (RectangleTests, Position_And_Size)
     EXPECT_FLOAT_EQ (r4.getWidth(), 9.0f);
     EXPECT_FLOAT_EQ (r4.getHeight(), 10.0f);
 
+    Rectangle<float> r5 = r.withSize (9.0f, 10.0f);
+    EXPECT_FLOAT_EQ (r5.getWidth(), 9.0f);
+    EXPECT_FLOAT_EQ (r5.getHeight(), 10.0f);
+
     // Test withZeroSize
-    Rectangle<float> r5 = r.withZeroSize();
-    EXPECT_FLOAT_EQ (r5.getWidth(), 0.0f);
-    EXPECT_FLOAT_EQ (r5.getHeight(), 0.0f);
+    Rectangle<float> r6 = r.withZeroSize();
+    EXPECT_FLOAT_EQ (r6.getWidth(), 0.0f);
+    EXPECT_FLOAT_EQ (r6.getHeight(), 0.0f);
 }
 
 TEST (RectangleTests, Corners)