Add Fill symmetry, new Pie polygon, and migrate to extensions

Author: JimBobSquarePants

src/ImageSharp.Drawing/Pie.cs

@@ -0,0 +1,119 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using System.Numerics;
+
+namespace SixLabors.ImageSharp.Drawing;
+
+/// <summary>
+/// A pie sector shape defined by a center point, radii, rotation, and arc sweep.
+/// </summary>
+public sealed class Pie : Polygon
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Pie"/> class.
+    /// </summary>
+    /// <param name="center">The center point of the pie.</param>
+    /// <param name="radius">The x and y radii of the pie ellipse.</param>
+    /// <param name="rotation">The ellipse rotation in degrees.</param>
+    /// <param name="startAngle">The pie start angle in degrees.</param>
+    /// <param name="sweepAngle">The pie sweep angle in degrees.</param>
+    public Pie(PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+        : base(CreateSegments(center, radius, rotation, startAngle, sweepAngle))
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Pie"/> class.
+    /// </summary>
+    /// <param name="center">The center point of the pie.</param>
+    /// <param name="radius">The x and y radii of the pie ellipse.</param>
+    /// <param name="startAngle">The pie start angle in degrees.</param>
+    /// <param name="sweepAngle">The pie sweep angle in degrees.</param>
+    public Pie(PointF center, SizeF radius, float startAngle, float sweepAngle)
+        : this(center, radius, 0F, startAngle, sweepAngle)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Pie"/> class.
+    /// </summary>
+    /// <param name="x">The x-coordinate of the pie center.</param>
+    /// <param name="y">The y-coordinate of the pie center.</param>
+    /// <param name="radiusX">The x-radius of the pie ellipse.</param>
+    /// <param name="radiusY">The y-radius of the pie ellipse.</param>
+    /// <param name="rotation">The ellipse rotation in degrees.</param>
+    /// <param name="startAngle">The pie start angle in degrees.</param>
+    /// <param name="sweepAngle">The pie sweep angle in degrees.</param>
+    public Pie(float x, float y, float radiusX, float radiusY, float rotation, float startAngle, float sweepAngle)
+        : this(new PointF(x, y), new SizeF(radiusX, radiusY), rotation, startAngle, sweepAngle)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Pie"/> class.
+    /// </summary>
+    /// <param name="x">The x-coordinate of the pie center.</param>
+    /// <param name="y">The y-coordinate of the pie center.</param>
+    /// <param name="radiusX">The x-radius of the pie ellipse.</param>
+    /// <param name="radiusY">The y-radius of the pie ellipse.</param>
+    /// <param name="startAngle">The pie start angle in degrees.</param>
+    /// <param name="sweepAngle">The pie sweep angle in degrees.</param>
+    public Pie(float x, float y, float radiusX, float radiusY, float startAngle, float sweepAngle)
+        : this(x, y, radiusX, radiusY, 0F, startAngle, sweepAngle)
+    {
+    }
+
+    private Pie(ILineSegment[] segments)
+        : base(segments, true)
+    {
+    }
+
+    /// <inheritdoc />
+    public override IPath Transform(Matrix4x4 matrix)
+    {
+        if (matrix.IsIdentity)
+        {
+            return this;
+        }
+
+        ILineSegment[] segments = new ILineSegment[this.LineSegments.Count];
+
+        for (int i = 0; i < segments.Length; i++)
+        {
+            segments[i] = this.LineSegments[i].Transform(matrix);
+        }
+
+        return new Pie(segments);
+    }
+
+    private static ILineSegment[] CreateSegments(PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+    {
+        Guard.MustBeGreaterThan(radius.Width, 0, "radiusX");
+        Guard.MustBeGreaterThan(radius.Height, 0, "radiusY");
+
+        PointF arcStart = GetArcPoint(center, radius, rotation, startAngle);
+        ArcLineSegment arc = new(center, radius, rotation, startAngle, sweepAngle);
+
+        return
+        [
+            new LinearLineSegment(center, arcStart),
+            arc,
+            new LinearLineSegment(arc.EndPoint, center)
+        ];
+    }
+
+    private static PointF GetArcPoint(PointF center, SizeF radius, float rotation, float angle)
+    {
+        float rotationRadians = rotation * (MathF.PI / 180F);
+        float angleRadians = angle * (MathF.PI / 180F);
+        float cosRotation = MathF.Cos(rotationRadians);
+        float sinRotation = MathF.Sin(rotationRadians);
+        float cosAngle = MathF.Cos(angleRadians);
+        float sinAngle = MathF.Sin(angleRadians);
+
+        return new PointF(
+            center.X + (radius.Width * cosRotation * cosAngle) - (radius.Height * sinRotation * sinAngle),
+            center.Y + (radius.Width * sinRotation * cosAngle) + (radius.Height * cosRotation * sinAngle));
+    }
+}

src/ImageSharp.Drawing/Processing/DrawingCanvasShapeExtensions.cs

@@ -0,0 +1,192 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+namespace SixLabors.ImageSharp.Drawing.Processing;
+
+/// <summary>
+/// Convenience shape helpers that build paths and forward to the core <see cref="IDrawingCanvas"/> fill and draw primitives.
+/// </summary>
+public static class DrawingCanvasShapeExtensions
+{
+    /// <summary>
+    /// Fills a local region using the given brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade destination pixels.</param>
+    /// <param name="region">Region to fill in local coordinates.</param>
+    public static void Fill(this IDrawingCanvas canvas, Brush brush, Rectangle region)
+        => canvas.Fill(brush, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
+
+    /// <summary>
+    /// Fills all paths in a collection using the given brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="paths">Path collection to fill.</param>
+    public static void Fill(this IDrawingCanvas canvas, Brush brush, IPathCollection paths)
+    {
+        Guard.NotNull(paths, nameof(paths));
+
+        foreach (IPath path in paths)
+        {
+            canvas.Fill(brush, path);
+        }
+    }
+
+    /// <summary>
+    /// Fills a path built by the provided builder using the given brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="pathBuilder">The path builder describing the fill region.</param>
+    public static void Fill(this IDrawingCanvas canvas, Brush brush, PathBuilder pathBuilder)
+    {
+        Guard.NotNull(pathBuilder, nameof(pathBuilder));
+        canvas.Fill(brush, pathBuilder.Build());
+    }
+
+    /// <summary>
+    /// Fills an ellipse using the provided brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="center">Ellipse center point in local coordinates.</param>
+    /// <param name="size">Ellipse width and height in local coordinates.</param>
+    public static void FillEllipse(this IDrawingCanvas canvas, Brush brush, PointF center, SizeF size)
+        => canvas.Fill(brush, new EllipsePolygon(center, size));
+
+    /// <summary>
+    /// Fills the closed arc shape produced by joining the arc endpoints with a straight line.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="center">Arc center point in local coordinates.</param>
+    /// <param name="radius">Arc radii in local coordinates.</param>
+    /// <param name="rotation">Ellipse rotation in degrees.</param>
+    /// <param name="startAngle">Arc start angle in degrees.</param>
+    /// <param name="sweepAngle">Arc sweep angle in degrees.</param>
+    public static void FillArc(this IDrawingCanvas canvas, Brush brush, PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+        => canvas.Fill(brush, new Path(new ArcLineSegment(center, radius, rotation, startAngle, sweepAngle)));
+
+    /// <summary>
+    /// Fills a pie sector using the provided brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="center">Pie center point in local coordinates.</param>
+    /// <param name="radius">Pie radii in local coordinates.</param>
+    /// <param name="rotation">Ellipse rotation in degrees.</param>
+    /// <param name="startAngle">Pie start angle in degrees.</param>
+    /// <param name="sweepAngle">Pie sweep angle in degrees.</param>
+    public static void FillPie(this IDrawingCanvas canvas, Brush brush, PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+        => canvas.Fill(brush, new Pie(center, radius, rotation, startAngle, sweepAngle));
+
+    /// <summary>
+    /// Fills a pie sector using the provided brush.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="brush">Brush used to shade covered pixels.</param>
+    /// <param name="center">Pie center point in local coordinates.</param>
+    /// <param name="radius">Pie radii in local coordinates.</param>
+    /// <param name="startAngle">Pie start angle in degrees.</param>
+    /// <param name="sweepAngle">Pie sweep angle in degrees.</param>
+    public static void FillPie(this IDrawingCanvas canvas, Brush brush, PointF center, SizeF radius, float startAngle, float sweepAngle)
+        => canvas.Fill(brush, new Pie(center, radius, startAngle, sweepAngle));
+
+    /// <summary>
+    /// Draws an arc outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the arc outline.</param>
+    /// <param name="center">Arc center point in local coordinates.</param>
+    /// <param name="radius">Arc radii in local coordinates.</param>
+    /// <param name="rotation">Ellipse rotation in degrees.</param>
+    /// <param name="startAngle">Arc start angle in degrees.</param>
+    /// <param name="sweepAngle">Arc sweep angle in degrees.</param>
+    public static void DrawArc(this IDrawingCanvas canvas, Pen pen, PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+        => canvas.Draw(pen, new Path(new ArcLineSegment(center, radius, rotation, startAngle, sweepAngle)));
+
+    /// <summary>
+    /// Draws a cubic bezier outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the bezier outline.</param>
+    /// <param name="points">Bezier control points.</param>
+    public static void DrawBezier(this IDrawingCanvas canvas, Pen pen, params PointF[] points)
+    {
+        Guard.NotNull(points, nameof(points));
+        canvas.Draw(pen, new Path(new CubicBezierLineSegment(points)));
+    }
+
+    /// <summary>
+    /// Draws an ellipse outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the ellipse outline.</param>
+    /// <param name="center">Ellipse center point in local coordinates.</param>
+    /// <param name="size">Ellipse width and height in local coordinates.</param>
+    public static void DrawEllipse(this IDrawingCanvas canvas, Pen pen, PointF center, SizeF size)
+        => canvas.Draw(pen, new EllipsePolygon(center, size));
+
+    /// <summary>
+    /// Draws a pie sector outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the pie outline.</param>
+    /// <param name="center">Pie center point in local coordinates.</param>
+    /// <param name="radius">Pie radii in local coordinates.</param>
+    /// <param name="rotation">Ellipse rotation in degrees.</param>
+    /// <param name="startAngle">Pie start angle in degrees.</param>
+    /// <param name="sweepAngle">Pie sweep angle in degrees.</param>
+    public static void DrawPie(this IDrawingCanvas canvas, Pen pen, PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
+        => canvas.Draw(pen, new Pie(center, radius, rotation, startAngle, sweepAngle));
+
+    /// <summary>
+    /// Draws a pie sector outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the pie outline.</param>
+    /// <param name="center">Pie center point in local coordinates.</param>
+    /// <param name="radius">Pie radii in local coordinates.</param>
+    /// <param name="startAngle">Pie start angle in degrees.</param>
+    /// <param name="sweepAngle">Pie sweep angle in degrees.</param>
+    public static void DrawPie(this IDrawingCanvas canvas, Pen pen, PointF center, SizeF radius, float startAngle, float sweepAngle)
+        => canvas.Draw(pen, new Pie(center, radius, startAngle, sweepAngle));
+
+    /// <summary>
+    /// Draws a rectangular outline using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the rectangle outline.</param>
+    /// <param name="region">Rectangle region to stroke.</param>
+    public static void Draw(this IDrawingCanvas canvas, Pen pen, Rectangle region)
+        => canvas.Draw(pen, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
+
+    /// <summary>
+    /// Draws all paths in a collection using the provided pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate outlines.</param>
+    /// <param name="paths">Path collection to stroke.</param>
+    public static void Draw(this IDrawingCanvas canvas, Pen pen, IPathCollection paths)
+    {
+        Guard.NotNull(paths, nameof(paths));
+
+        foreach (IPath path in paths)
+        {
+            canvas.Draw(pen, path);
+        }
+    }
+
+    /// <summary>
+    /// Draws a path outline built by the provided builder using the given pen.
+    /// </summary>
+    /// <param name="canvas">The destination canvas.</param>
+    /// <param name="pen">Pen used to generate the outline fill path.</param>
+    /// <param name="pathBuilder">The path builder describing the path to stroke.</param>
+    public static void Draw(this IDrawingCanvas canvas, Pen pen, PathBuilder pathBuilder)
+    {
+        Guard.NotNull(pathBuilder, nameof(pathBuilder));
+        canvas.Draw(pen, pathBuilder.Build());
+    }
+}

src/ImageSharp.Drawing/Processing/DrawingCanvas{TPixel}.cs

@@ -305,28 +305,7 @@ public void Clear(Brush brush, IPath path)
 
     /// <inheritdoc />
     public void Fill(Brush brush)
-        => this.Fill(brush, this.Bounds);
-
-    /// <inheritdoc />
-    public void Fill(Brush brush, Rectangle region)
-        => this.Fill(brush, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
-
-    /// <inheritdoc />
-    public void Fill(Brush brush, IPathCollection paths)
-    {
-        Guard.NotNull(paths, nameof(paths));
-        foreach (IPath path in paths)
-        {
-            this.EnqueueFillPath(brush, path);
-        }
-    }
-
-    /// <inheritdoc />
-    public void Fill(Brush brush, PathBuilder pathBuilder)
-    {
-        Guard.NotNull(pathBuilder, nameof(pathBuilder));
-        this.Fill(brush, pathBuilder.Build());
-    }
+        => this.Fill(brush, new RectangularPolygon(this.Bounds.X, this.Bounds.Y, this.Bounds.Width, this.Bounds.Height));
 
     /// <inheritdoc />
     public void Fill(Brush brush, IPath path)
@@ -396,21 +375,6 @@ public void Process(IPath path, Action<IImageProcessingContext> operation)
             state.ClipPaths);
     }
 
-    /// <inheritdoc />
-    public void DrawArc(Pen pen, PointF center, SizeF radius, float rotation, float startAngle, float sweepAngle)
-        => this.Draw(pen, new Path(new ArcLineSegment(center, radius, rotation, startAngle, sweepAngle)));
-
-    /// <inheritdoc />
-    public void DrawBezier(Pen pen, params PointF[] points)
-    {
-        Guard.NotNull(points, nameof(points));
-        this.Draw(pen, new Path(new CubicBezierLineSegment(points)));
-    }
-
-    /// <inheritdoc />
-    public void DrawEllipse(Pen pen, PointF center, SizeF size)
-        => this.Draw(pen, new EllipsePolygon(center, size));
-
     /// <summary>
     /// Draws a two-point line segment using the provided pen and drawing options.
     /// </summary>
@@ -488,27 +452,6 @@ public void DrawLine(Pen pen, params PointF[] points)
         this.PrepareStrokePolylineCompositionCore(points, pen.StrokeFill, effectiveOptions, pen);
     }
 
-    /// <inheritdoc />
-    public void Draw(Pen pen, Rectangle region)
-        => this.Draw(pen, new RectangularPolygon(region.X, region.Y, region.Width, region.Height));
-
-    /// <inheritdoc />
-    public void Draw(Pen pen, IPathCollection paths)
-    {
-        Guard.NotNull(paths, nameof(paths));
-        foreach (IPath path in paths)
-        {
-            this.Draw(pen, path);
-        }
-    }
-
-    /// <inheritdoc />
-    public void Draw(Pen pen, PathBuilder pathBuilder)
-    {
-        Guard.NotNull(pathBuilder, nameof(pathBuilder));
-        this.Draw(pen, pathBuilder.Build());
-    }
-
     /// <inheritdoc />
     public void Draw(Pen pen, IPath path)
     {