Merge pull request #284 from SixLabors/js/shape-constructors

Add Convenience Constructors to shapes

Author: JimBobSquarePants

samples/DrawShapesWithImageSharp/Program.cs

@@ -111,7 +111,7 @@ private static void DrawSerializedOPenSansLetterShape_a()
                 PointF[] points = pl.Select(p => p.Split('x'))
                             .Select(p => new PointF(float.Parse(p[0]), float.Parse(p[1])))
                             .ToArray();
-                return new Polygon(new LinearLineSegment(points));
+                return new Polygon(points);
             }).ToArray();
 
             var complex = new ComplexPolygon(polys);
@@ -131,7 +131,7 @@ private static void DrawSerializedOPenSansLetterShape_o()
                             .Select(p => new PointF(float.Parse(p[0]), float.Parse(p[1])))
                             .ToArray();
 
-                return new Polygon(new LinearLineSegment(points));
+                return new Polygon(points);
             }).ToArray();
 
             var complex = new ComplexPolygon(polys);

src/ImageSharp.Drawing/Processing/Extensions/DrawLineExtensions.cs

@@ -25,7 +25,7 @@ public static IImageProcessingContext DrawLine(
             Brush brush,
             float thickness,
             params PointF[] points) =>
-            source.Draw(options, new SolidPen(brush, thickness), new Path(new LinearLineSegment(points)));
+            source.Draw(options, new SolidPen(brush, thickness), new Path(points));
 
         /// <summary>
         /// Draws the provided points as an open linear path at the provided thickness with the supplied brush.
@@ -40,7 +40,7 @@ public static IImageProcessingContext DrawLine(
             Brush brush,
             float thickness,
             params PointF[] points) =>
-            source.Draw(new SolidPen(brush, thickness), new Path(new LinearLineSegment(points)));
+            source.Draw(new SolidPen(brush, thickness), new Path(points));
 
         /// <summary>
         /// Draws the provided points as an open linear path at the provided thickness with the supplied brush.
@@ -87,7 +87,7 @@ public static IImageProcessingContext DrawLine(
             DrawingOptions options,
             Pen pen,
             params PointF[] points) =>
-            source.Draw(options, pen, new Path(new LinearLineSegment(points)));
+            source.Draw(options, pen, new Path(points));
 
         /// <summary>
         /// Draws the provided points as an open linear path with the supplied pen.
@@ -100,6 +100,6 @@ public static IImageProcessingContext DrawLine(
             this IImageProcessingContext source,
             Pen pen,
             params PointF[] points) =>
-            source.Draw(pen, new Path(new LinearLineSegment(points)));
+            source.Draw(pen, new Path(points));
     }
 }

src/ImageSharp.Drawing/Processing/Extensions/DrawPolygonExtensions.cs

@@ -21,7 +21,7 @@ public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
             Pen pen,
             params PointF[] points) =>
-            source.Draw(source.GetDrawingOptions(), pen, new Polygon(new LinearLineSegment(points)));
+            source.Draw(source.GetDrawingOptions(), pen, new Polygon(points));
 
         /// <summary>
         /// Draws the provided points as a closed linear polygon with the provided pen.
@@ -36,7 +36,7 @@ public static IImageProcessingContext DrawPolygon(
             DrawingOptions options,
             Pen pen,
             params PointF[] points) =>
-            source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
+            source.Draw(options, pen, new Polygon(points));
 
         /// <summary>
         /// Draws the provided points as a closed linear polygon with the provided brush at the provided thickness.

src/ImageSharp.Drawing/Processing/Extensions/FillPolygonExtensions.cs

@@ -23,7 +23,7 @@ public static IImageProcessingContext FillPolygon(
             DrawingOptions options,
             Brush brush,
             params PointF[] points) =>
-            source.Fill(options, brush, new Polygon(new LinearLineSegment(points)));
+            source.Fill(options, brush, new Polygon(points));
 
         /// <summary>
         /// Flood fills the image in the shape of a linear polygon described by the points
@@ -36,7 +36,7 @@ public static IImageProcessingContext FillPolygon(
             this IImageProcessingContext source,
             Brush brush,
             params PointF[] points) =>
-            source.Fill(brush, new Polygon(new LinearLineSegment(points)));
+            source.Fill(brush, new Polygon(points));
 
         /// <summary>
         /// Flood fills the image in the shape of a linear polygon described by the points
@@ -51,7 +51,7 @@ public static IImageProcessingContext FillPolygon(
             DrawingOptions options,
             Color color,
             params PointF[] points) =>
-            source.Fill(options, new SolidBrush(color), new Polygon(new LinearLineSegment(points)));
+            source.Fill(options, new SolidBrush(color), new Polygon(points));
 
         /// <summary>
         /// Flood fills the image in the shape of a linear polygon described by the points
@@ -64,6 +64,6 @@ public static IImageProcessingContext FillPolygon(
             this IImageProcessingContext source,
             Color color,
             params PointF[] points) =>
-            source.Fill(new SolidBrush(color), new Polygon(new LinearLineSegment(points)));
+            source.Fill(new SolidBrush(color), new Polygon(points));
     }
 }

src/ImageSharp.Drawing/Shapes/Path.cs

@@ -17,6 +17,15 @@ public class Path : IPath, ISimplePath, IPathInternals, IInternalPathOwner
         private readonly ILineSegment[] lineSegments;
         private InternalPath innerPath;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Path"/> class.
+        /// </summary>
+        /// <param name="points">The collection of points; processed as a series of linear line segments.</param>
+        public Path(PointF[] points)
+            : this(new LinearLineSegment(points))
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Path"/> class.
         /// </summary>

src/ImageSharp.Drawing/Shapes/Polygon.cs

@@ -11,6 +11,15 @@ namespace SixLabors.ImageSharp.Drawing
     /// </summary>
     public class Polygon : Path
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Polygon"/> class.
+        /// </summary>
+        /// <param name="points">The collection of points; processed as a series of linear line segments.</param>
+        public Polygon(PointF[] points)
+            : this(new LinearLineSegment(points))
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Polygon"/> class.
         /// </summary>

src/ImageSharp.Drawing/Shapes/PolygonClipper/Clipper.cs

@@ -54,7 +54,7 @@ public IPath[] GenerateClippedShapes(ClippingOperation operation, IntersectionRu
 #endif
                 }
 
-                shapes[index++] = new Polygon(new LinearLineSegment(points));
+                shapes[index++] = new Polygon(points);
             }
 
             for (int i = 0; i < openPaths.Count; i++)
@@ -72,7 +72,7 @@ public IPath[] GenerateClippedShapes(ClippingOperation operation, IntersectionRu
 #endif
                 }
 
-                shapes[index++] = new Polygon(new LinearLineSegment(points));
+                shapes[index++] = new Polygon(points);
             }
 
             return shapes;

src/ImageSharp.Drawing/Shapes/PolygonClipper/ClipperOffset.cs

@@ -48,7 +48,7 @@ public ComplexPolygon Execute(float width)
 #endif
                 }
 
-                polygons[i] = new Polygon(new LinearLineSegment(points));
+                polygons[i] = new Polygon(points);
             }
 
             return new ComplexPolygon(polygons);

tests/ImageSharp.Drawing.Tests/Shapes/Scan/TessellatedMultipolygonTests.cs

@@ -47,7 +47,7 @@ public void Create_FromPolygon_Case1(bool reverseOriginal)
                 points.AsSpan().Reverse();
             }
 
-            var polygon = new Polygon(new LinearLineSegment(points));
+            var polygon = new Polygon(points);
 
             using var multipolygon = TessellatedMultipolygon.Create(polygon, MemoryAllocator);
             VerifyRing(multipolygon[0], points, reverseOriginal, false);
@@ -65,7 +65,7 @@ public void Create_FromPolygon_Case2(bool reverseOriginal)
                 points.AsSpan().Reverse();
             }
 
-            var polygon = new Polygon(new LinearLineSegment(points));
+            var polygon = new Polygon(points);
 
             using var multipolygon = TessellatedMultipolygon.Create(polygon, MemoryAllocator);