Feng shui all the things.

Author: JimBobSquarePants

README.md

@@ -15,11 +15,11 @@ SixLabors.ImageSharp.Drawing
 
 </div>
 
-### **ImageSharp.Drawing** provides extensions to ImageSharp containing powerful, cross-platform 2D polygon manipulation and drawing APIs.
+### **ImageSharp.Drawing** provides extensions to ImageSharp containing powerful, Cross-Platform 2D polygon manipulation and drawing APIs.
 
 Designed to democratize image processing, ImageSharp.Drawing brings you an incredibly powerful yet beautifully simple API.
 
-Built against [.NET 6](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp.Drawing can be used in device, cloud, and embedded/IoT scenarios. 
+Built against [.NET 8](https://docs.microsoft.com/en-us/dotnet/standard/net-standard), ImageSharp.Drawing can be used in device, cloud, and embedded/IoT scenarios. 
 
 ## License
 
@@ -61,12 +61,12 @@ If you prefer, you can compile ImageSharp.Drawing yourself (please do and help!)
 
 - Using [Visual Studio 2022](https://visualstudio.microsoft.com/vs/)
   - Make sure you have the latest version installed
-  - Make sure you have [the .NET 7 SDK](https://www.microsoft.com/net/core#windows) installed
+  - Make sure you have [the .NET 8 SDK](https://www.microsoft.com/net/core#windows) installed
 
 Alternatively, you can work from command line and/or with a lightweight editor on **both Linux/Unix and Windows**:
 
 - [Visual Studio Code](https://code.visualstudio.com/) with [C# Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp)
-- [the .NET 7 SDK](https://www.microsoft.com/net/core#linuxubuntu)
+- [the .NET 8 SDK](https://www.microsoft.com/net/core#linuxubuntu)
 
 To clone ImageSharp.Drawing locally, click the "Clone in [YOUR_OS]" button above or run the following git commands:
 

src/ImageSharp.Drawing.WebGPU/WebGPUDrawingBackend.CoverageRasterizer.cs

@@ -6,7 +6,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Silk.NET.WebGPU;
-using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using WgpuBuffer = Silk.NET.WebGPU.Buffer;

src/ImageSharp.Drawing.WebGPU/WebGPUDrawingBackend.cs

@@ -7,8 +7,6 @@
 using System.Runtime.InteropServices;
 using Silk.NET.WebGPU;
 using Silk.NET.WebGPU.Extensions.WGPU;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using WgpuBuffer = Silk.NET.WebGPU.Buffer;
@@ -508,8 +506,8 @@ private bool TryRenderPreparedFlush<TPixel>(
             outputOriginY = 0;
         }
 
-        List<CompositionCoverageDefinition> coverageDefinitions = new();
-        Dictionary<CoverageDefinitionIdentity, int> coverageDefinitionIndexByKey = new();
+        List<CompositionCoverageDefinition> coverageDefinitions = [];
+        Dictionary<CoverageDefinitionIdentity, int> coverageDefinitionIndexByKey = [];
         int[] batchCoverageIndices = new int[preparedBatches.Count];
         for (int i = 0; i < batchCoverageIndices.Length; i++)
         {
@@ -628,7 +626,7 @@ private bool TryDispatchPreparedCompositeCommands<TPixel>(
         }
 
         string pipelineKey = $"prepared-composite-fine/{flushContext.TextureFormat}";
-        WebGPUCompositeBindGroupLayoutFactory layoutFactory = (WebGPU api, Device* device, out BindGroupLayout* layout, out string? layoutError)
+        bool LayoutFactory(WebGPU api, Device* device, out BindGroupLayout* layout, out string? layoutError)
             => TryCreatePreparedCompositeFineBindGroupLayout(
                 api,
                 device,
@@ -640,7 +638,7 @@ private bool TryDispatchPreparedCompositeCommands<TPixel>(
         if (!flushContext.DeviceState.TryGetOrCreateCompositeComputePipeline(
                 pipelineKey,
                 shaderCode,
-                layoutFactory,
+                LayoutFactory,
                 out BindGroupLayout* bindGroupLayout,
                 out ComputePipeline* pipeline,
                 out error))
@@ -790,8 +788,8 @@ private bool TryDispatchPreparedCompositeCommands<TPixel>(
                         destinationX + destinationRegion.Width,
                         destinationY + destinationRegion.Height);
                     commandIndex++;
+                }
             }
-        }
 
             int usedParameterByteCount = checked(flushCommandCount * (int)parameterSize);
             if (!flushContext.DeviceState.TryGetOrCreateSharedBuffer(
@@ -852,7 +850,7 @@ private bool TryDispatchPreparedCompositeCommands<TPixel>(
                 return false;
             }
 
-            nuint binDataByteCount = checked((nuint)binningSize * (nuint)sizeof(uint));
+            nuint binDataByteCount = checked(binningSize * (nuint)sizeof(uint));
             if (!flushContext.DeviceState.TryGetOrCreateSharedBuffer(
                     PreparedCompositeBinDataBufferKey,
                     BufferUsage.Storage | BufferUsage.CopyDst,
@@ -918,8 +916,8 @@ private bool TryDispatchPreparedCompositeCommands<TPixel>(
                 (nuint)tileCountsByteCount);
 
             uint tileCommandCapacity = maxTileCommandIndices;
-            nuint usedTileCommandCount = (nuint)Math.Max(tileCommandCapacity, 1u);
-            nuint tileCommandIndicesByteCount = checked(usedTileCommandCount * (nuint)sizeof(uint));
+            nuint usedTileCommandCount = Math.Max(tileCommandCapacity, 1u);
+            nuint tileCommandIndicesByteCount = checked(usedTileCommandCount * sizeof(uint));
             if (!flushContext.DeviceState.TryGetOrCreateSharedBuffer(
                     PreparedCompositeTileIndicesBufferKey,
                     BufferUsage.Storage | BufferUsage.CopyDst,
@@ -1874,7 +1872,7 @@ private static uint DivideRoundUp(int value, int divisor)
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static uint FloatToUInt32Bits(float value)
-        => unchecked((uint)System.BitConverter.SingleToInt32Bits(value));
+        => unchecked((uint)BitConverter.SingleToInt32Bits(value));
 
     /// <summary>
     /// Finalizes one flush by submitting command buffers and optionally reading results back to CPU memory.

…geSharp.Drawing/Shapes/ArcLineSegment.cs src/ImageSharp.Drawing/ArcLineSegment.cssrc/ImageSharp.Drawing/Shapes/ArcLineSegment.cs renamed to src/ImageSharp.Drawing/ArcLineSegment.cs src/ImageSharp.Drawing/Shapes/ArcLineSegment.cs renamed to src/ImageSharp.Drawing/ArcLineSegment.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using SixLabors.ImageSharp.Drawing.PolygonGeometry;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Drawing.Shapes.PolygonGeometry;
 
 namespace SixLabors.ImageSharp.Drawing;
 

…Sharp.Drawing/Shapes/BooleanOperation.cs …c/ImageSharp.Drawing/BooleanOperation.cssrc/ImageSharp.Drawing/Shapes/BooleanOperation.cs renamed to src/ImageSharp.Drawing/BooleanOperation.cs src/ImageSharp.Drawing/Shapes/BooleanOperation.cs renamed to src/ImageSharp.Drawing/BooleanOperation.cs

@@ -2,6 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using System.Numerics;
+using SixLabors.ImageSharp.Drawing.Helpers;
 
 namespace SixLabors.ImageSharp.Drawing;
 
@@ -54,7 +55,7 @@ public CubicBezierLineSegment(PointF start, PointF controlPoint1, PointF control
 
     /// <inheritdoc cref="CubicBezierLineSegment(PointF, PointF, PointF, PointF, PointF[])" />
     public CubicBezierLineSegment(PointF start, PointF controlPoint1, PointF controlPoint2, PointF end)
-        : this(new[] { start, controlPoint1, controlPoint2, end })
+        : this([start, controlPoint1, controlPoint2, end])
     {
     }
 
@@ -119,7 +120,7 @@ private static PointF[] GetDrawingPoints(PointF[] controlPoints)
             drawingPoints.AddRange(bezierCurveDrawingPoints);
         }
 
-        return drawingPoints.ToArray();
+        return [.. drawingPoints];
     }
 
     private static List<PointF> FindDrawingPoints(int curveIndex, PointF[] controlPoints)