aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: consolidate HasOverlappingParts into FillHelpers

Browse Source 
StripeFiller and FillExtents had identical 24-line overlap detection
methods; move to FillHelpers and delegate from both callers.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-28 16:22:00 -04:00
parent cc85493a0c
commit 3022982f6d
3 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenNest.Engine/Fill/FillExtents.cs
View File

@@ -1,3 +1,4 @@
using OpenNest.Engine.Strategies;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System; using System;
@@ -411,30 +412,7 @@ namespace OpenNest.Engine.Fill
part.BoundingBox.Bottom >= workArea.Bottom - Tolerance.Epsilon; part.BoundingBox.Bottom >= workArea.Bottom - Tolerance.Epsilon;
} }
private static bool HasOverlappingParts(List<Part> parts) private static bool HasOverlappingParts(List<Part> parts) =>
{ FillHelpers.HasOverlappingParts(parts);
for (var i = 0; i < parts.Count; i++)
{
var b1 = parts[i].BoundingBox;
for (var j = i + 1; j < parts.Count; j++)
{
var b2 = parts[j].BoundingBox;
var overlapX = System.Math.Min(b1.Right, b2.Right)
- System.Math.Max(b1.Left, b2.Left);
var overlapY = System.Math.Min(b1.Top, b2.Top)
- System.Math.Max(b1.Bottom, b2.Bottom);
if (overlapX <= Tolerance.Epsilon || overlapY <= Tolerance.Epsilon)
continue;
if (parts[i].Intersects(parts[j], out _))
return true;
}
}
return false;
}
} }
} }

31
OpenNest.Engine/Fill/StripeFiller.cs
View File

@@ -481,33 +481,6 @@ public class StripeFiller
return axis == NestDirection.Horizontal ? box.Width : box.Length; return axis == NestDirection.Horizontal ? box.Width : box.Length;
} }
/// <summary> private static bool HasOverlappingParts(List<Part> parts) =>
/// Checks if any pair of parts geometrically overlap. Uses bounding box FillHelpers.HasOverlappingParts(parts);
/// pre-filtering for performance, then falls back to shape intersection.
/// </summary>
private static bool HasOverlappingParts(List<Part> parts)
{
for (var i = 0; i < parts.Count; i++)
{
var b1 = parts[i].BoundingBox;
for (var j = i + 1; j < parts.Count; j++)
{
var b2 = parts[j].BoundingBox;
var overlapX = System.Math.Min(b1.Right, b2.Right)
- System.Math.Max(b1.Left, b2.Left);
var overlapY = System.Math.Min(b1.Top, b2.Top)
- System.Math.Max(b1.Bottom, b2.Bottom);
if (overlapX <= Tolerance.Epsilon || overlapY <= Tolerance.Epsilon)
continue;
if (parts[i].Intersects(parts[j], out _))
return true;
}
}
return false;
}
} }

30
OpenNest.Engine/Strategies/FillHelpers.cs
View File

@@ -109,5 +109,35 @@ namespace OpenNest.Engine.Strategies
var fallback = fillFunc(other); var fallback = fillFunc(other);
return fallback ?? new List<Part>(); return fallback ?? new List<Part>();
} }
/// <summary>
/// Checks if any pair of parts geometrically overlap. Uses bounding box
/// pre-filtering for performance, then falls back to shape intersection.
/// </summary>
internal static bool HasOverlappingParts(List<Part> parts)
{
for (var i = 0; i < parts.Count; i++)
{
var b1 = parts[i].BoundingBox;
for (var j = i + 1; j < parts.Count; j++)
{
var b2 = parts[j].BoundingBox;
var overlapX = System.Math.Min(b1.Right, b2.Right)
- System.Math.Max(b1.Left, b2.Left);
var overlapY = System.Math.Min(b1.Top, b2.Top)
- System.Math.Max(b1.Bottom, b2.Bottom);
if (overlapX <= Tolerance.Epsilon || overlapY <= Tolerance.Epsilon)
continue;
if (parts[i].Intersects(parts[j], out _))
return true;
}
}
return false;
}
} }
} }