More tests

Author: kunitoki

justfile

@@ -13,6 +13,12 @@ clean:
 build CONFIG="Debug":
   cmake --build build --config {{CONFIG}}
 
+[doc("execute unit tests using cmake")]
+test CONFIG="Debug":
+  cmake -G Xcode -B build
+  cmake --build build --target yup_tests --config {{CONFIG}}
+  build/tests/{{CONFIG}}/yup_tests --gtest_filter=PathTests.*
+
 [doc("generate and open project in macOS using Xcode")]
 osx PROFILING="OFF":
   cmake -G Xcode -B build -DYUP_ENABLE_PROFILING={{PROFILING}}

modules/yup_graphics/primitives/yup_Path.cpp

@@ -167,6 +167,9 @@ Path& Path::addLine (const Line<float>& line)
 
 Path& Path::addRectangle (float x, float y, float width, float height)
 {
+    width = jmax (0.0f, width);
+    height = jmax (0.0f, height);
+
     reserveSpace (size() + 5);
 
     moveTo (x, y);
@@ -189,6 +192,9 @@ Path& Path::addRoundedRectangle (float x, float y, float width, float height, fl
 {
     reserveSpace (size() + 9);
 
+    width = jmax (0.0f, width);
+    height = jmax (0.0f, height);
+
     const float centerWidth = width * 0.5f;
     const float centerHeight = height * 0.5f;
     radiusTopLeft = jmin (radiusTopLeft, centerWidth, centerHeight);
@@ -245,6 +251,9 @@ Path& Path::addEllipse (float x, float y, float width, float height)
 {
     reserveSpace (size() + 6);
 
+    width = jmax (0.0f, width);
+    height = jmax (0.0f, height);
+
     const float rx = width * 0.5f;
     const float ry = height * 0.5f;
     const float cx = x + rx;
@@ -273,6 +282,9 @@ Path& Path::addCenteredEllipse (float centerX, float centerY, float radiusX, flo
 {
     reserveSpace (size() + 6);
 
+    radiusX = jmax (0.0f, radiusX);
+    radiusY = jmax (0.0f, radiusY);
+
     const float rx = radiusX;
     const float ry = radiusY;
     const float cx = centerX;
@@ -304,6 +316,9 @@ Path& Path::addCenteredEllipse (const Point<float>& center, const Size<float>& d
 
 Path& Path::addArc (float x, float y, float width, float height, float fromRadians, float toRadians, bool startAsNewSubPath)
 {
+    width = jmax (0.0f, width);
+    height = jmax (0.0f, height);
+
     const float radiusX = width * 0.5f;
     const float radiusY = height * 0.5f;
 
@@ -329,6 +344,9 @@ Path& Path::addCenteredArc (float centerX, float centerY, float radiusX, float r
     const float sinTheta = std::sin (rotationOfEllipse);
 
     // Initialize variables for the loop
+    radiusX = jmax (0.0f, radiusX);
+    radiusY = jmax (0.0f, radiusY);
+
     float x = std::cos (fromRadians) * radiusX;
     float y = std::sin (fromRadians) * radiusY;
     float rotatedX = x * cosTheta - y * sinTheta + centerX;
@@ -369,14 +387,15 @@ Path& Path::addCenteredArc (const Point<float>& center, const Size<float>& diame
 }
 
 //==============================================================================
-void Path::addPolygon (Point<float> centre, int numberOfSides, float radius, float startAngle)
+Path& Path::addPolygon (Point<float> centre, int numberOfSides, float radius, float startAngle)
 {
-    if (numberOfSides < 3 || radius <= 0.0f)
-        return;
+    if (numberOfSides < 3)
+        return *this;
 
     reserveSpace (size() + numberOfSides + 1);
 
     const float angleIncrement = MathConstants<float>::twoPi / numberOfSides;
+    radius = jmax (0.0f, radius);
 
     // Start with the first vertex
     float angle = startAngle;
@@ -395,17 +414,21 @@ void Path::addPolygon (Point<float> centre, int numberOfSides, float radius, flo
     }
 
     close();
+
+    return *this;
 }
 
 //==============================================================================
-void Path::addStar (Point<float> centre, int numberOfPoints, float innerRadius, float outerRadius, float startAngle)
+Path& Path::addStar (Point<float> centre, int numberOfPoints, float innerRadius, float outerRadius, float startAngle)
 {
-    if (numberOfPoints < 3 || innerRadius <= 0.0f || outerRadius <= 0.0f)
-        return;
+    if (numberOfPoints < 3)
+        return *this;
 
     reserveSpace (size() + numberOfPoints * 2 + 1);
 
     const float angleIncrement = MathConstants<float>::twoPi / (numberOfPoints * 2);
+    innerRadius = jmax (0.0f, innerRadius);
+    outerRadius = jmax (0.0f, outerRadius);
 
     // Start with the first outer vertex
     float angle = startAngle;
@@ -425,13 +448,15 @@ void Path::addStar (Point<float> centre, int numberOfPoints, float innerRadius,
     }
 
     close();
+
+    return *this;
 }
 
 //==============================================================================
-void Path::addBubble (Rectangle<float> bodyArea, Rectangle<float> maximumArea, Point<float> arrowTipPosition, float cornerSize, float arrowBaseWidth)
+Path& Path::addBubble (Rectangle<float> bodyArea, Rectangle<float> maximumArea, Point<float> arrowTipPosition, float cornerSize, float arrowBaseWidth)
 {
     if (bodyArea.isEmpty() || maximumArea.isEmpty() || arrowBaseWidth <= 0.0f)
-        return;
+        return *this;
 
     // Clamp corner size to reasonable bounds
     cornerSize = jmin (cornerSize, bodyArea.getWidth() * 0.5f, bodyArea.getHeight() * 0.5f);
@@ -609,6 +634,8 @@ void Path::addBubble (Rectangle<float> bodyArea, Rectangle<float> maximumArea, P
 
     // Close the path
     close();
+
+    return *this;
 }
 
 //==============================================================================

modules/yup_graphics/primitives/yup_Path.h

@@ -438,7 +438,7 @@ class YUP_API Path
         @param radius The radius from the center to each vertex.
         @param startAngle The starting angle in radians (0.0f starts at the right).
     */
-    void addPolygon (Point<float> centre, int numberOfSides, float radius, float startAngle = 0.0f);
+    Path& addPolygon (Point<float> centre, int numberOfSides, float radius, float startAngle = 0.0f);
 
     //==============================================================================
     /** Adds a star shape to the path.
@@ -452,7 +452,7 @@ class YUP_API Path
         @param outerRadius The radius from the center to the outer vertices.
         @param startAngle The starting angle in radians (0.0f starts at the right).
     */
-    void addStar (Point<float> centre, int numberOfPoints, float innerRadius, float outerRadius, float startAngle = 0.0f);
+    Path& addStar (Point<float> centre, int numberOfPoints, float innerRadius, float outerRadius, float startAngle = 0.0f);
 
     //==============================================================================
     /** Adds a speech bubble shape to the path.
@@ -466,7 +466,7 @@ class YUP_API Path
         @param cornerSize The radius of the rounded corners.
         @param arrowBaseWidth The width of the arrow at its base.
     */
-    void addBubble (Rectangle<float> bodyArea, Rectangle<float> maximumArea, Point<float> arrowTipPosition, float cornerSize, float arrowBaseWidth);
+    Path& addBubble (Rectangle<float> bodyArea, Rectangle<float> maximumArea, Point<float> arrowTipPosition, float cornerSize, float arrowBaseWidth);
 
     //==============================================================================
     /** Converts the path to a stroke polygon with specified width.