Use ShapeOptions directly.

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/ShapeOptions.cs

@@ -15,10 +15,21 @@ public ShapeOptions()
         {
         }
 
-        private ShapeOptions(ShapeOptions source) => this.IntersectionRule = source.IntersectionRule;
+        private ShapeOptions(ShapeOptions source)
+        {
+            this.IntersectionRule = source.IntersectionRule;
+            this.ClippingOperation = source.ClippingOperation;
+        }
+
+        /// <summary>
+        /// Gets or sets the clipping operation.
+        /// <para/>
+        /// Defaults to <see cref="ClippingOperation.Difference"/>.
+        /// </summary>
+        public ClippingOperation ClippingOperation { get; set; } = ClippingOperation.Difference;
 
         /// <summary>
-        /// Gets or sets a value indicating whether antialiasing should be applied.
+        /// Gets or sets the rule for calculating intersection points.
         /// <para/>
         /// Defaults to <see cref="IntersectionRule.EvenOdd"/>.
         /// </summary>

src/ImageSharp.Drawing/Shapes/ClipPathExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
+using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.Drawing.Shapes.PolygonClipper;
 
 namespace SixLabors.ImageSharp.Drawing
@@ -25,17 +26,15 @@ public static IPath Clip(this IPath subjectPath, params IPath[] clipPaths)
         /// Clips the specified subject path with the provided clipping paths.
         /// </summary>
         /// <param name="subjectPath">The subject path.</param>
-        /// <param name="operation">The clipping operation.</param>
-        /// <param name="rule">The intersection rule.</param>
+        /// <param name="options">The shape options.</param>
         /// <param name="clipPaths">The clipping paths.</param>
         /// <returns>The clipped <see cref="IPath"/>.</returns>
         /// <exception cref="ClipperException">Thrown when an error occured while attempting to clip the polygon.</exception>
         public static IPath Clip(
             this IPath subjectPath,
-            ClippingOperation operation,
-            IntersectionRule rule,
+            ShapeOptions options,
             params IPath[] clipPaths)
-            => subjectPath.Clip(operation, rule, (IEnumerable<IPath>)clipPaths);
+            => subjectPath.Clip(options, (IEnumerable<IPath>)clipPaths);
 
         /// <summary>
         /// Clips the specified subject path with the provided clipping paths.
@@ -45,29 +44,27 @@ public static IPath Clip(
         /// <returns>The clipped <see cref="IPath"/>.</returns>
         /// <exception cref="ClipperException">Thrown when an error occured while attempting to clip the polygon.</exception>
         public static IPath Clip(this IPath subjectPath, IEnumerable<IPath> clipPaths)
-            => subjectPath.Clip(ClippingOperation.Difference, IntersectionRule.EvenOdd, clipPaths);
+            => subjectPath.Clip(new(), clipPaths);
 
         /// <summary>
         /// Clips the specified subject path with the provided clipping paths.
         /// </summary>
         /// <param name="subjectPath">The subject path.</param>
-        /// <param name="operation">The clipping operation.</param>
-        /// <param name="rule">The intersection rule.</param>
+        /// <param name="options">The shape options.</param>
         /// <param name="clipPaths">The clipping paths.</param>
         /// <returns>The clipped <see cref="IPath"/>.</returns>
         /// <exception cref="ClipperException">Thrown when an error occured while attempting to clip the polygon.</exception>
         public static IPath Clip(
             this IPath subjectPath,
-            ClippingOperation operation,
-            IntersectionRule rule,
+            ShapeOptions options,
             IEnumerable<IPath> clipPaths)
         {
             Clipper clipper = new();
 
             clipper.AddPath(subjectPath, ClippingType.Subject);
             clipper.AddPaths(clipPaths, ClippingType.Clip);
 
-            IPath[] result = clipper.GenerateClippedShapes(operation, rule);
+            IPath[] result = clipper.GenerateClippedShapes(options.ClippingOperation, options.IntersectionRule);
 
             return new ComplexPolygon(result);
         }

tests/ImageSharp.Drawing.Tests/Drawing/FillPolygonTests.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Numerics;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Drawing.Shapes.PolygonClipper;
 using SixLabors.ImageSharp.Drawing.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -195,7 +194,8 @@ public void FillPolygon_StarCircle_AllOperations(TestImageProvider<Rgba32> provi
             // See http://www.angusj.com/clipper2/Docs/Units/Clipper/Types/ClipType.htm for reference.
             foreach (ClippingOperation operation in (ClippingOperation[])Enum.GetValues(typeof(ClippingOperation)))
             {
-                IPath shape = star.Clip(operation, IntersectionRule.EvenOdd, circle);
+                ShapeOptions options = new() { ClippingOperation = operation };
+                IPath shape = star.Clip(options, circle);
 
                 provider.RunValidatingProcessorTest(
                     c => c.Fill(Color.DeepPink, circle).Fill(Color.LightGray, star).Fill(Color.ForestGreen, shape),