Three bugs fixed in NfpSlideStrategy pipeline: 1. NoFitPolygon.Reflect() incorrectly reversed vertex order. Point reflection (negating both axes) is a 180° rotation that preserves winding — the Reverse() call was converting CCW to CW, producing self-intersecting bowtie NFPs. 2. PolygonHelper inflation used OffsetSide.Left which is inward for CCW perimeters. Changed to OffsetSide.Right for outward inflation so NFP boundary positions give properly-spaced part placements. 3. Removed incorrect correction vector — same-drawing pairs have identical polygon-to-part offsets that cancel out in the NFP displacement. Also refactored NfpSlideStrategy to be immutable (removed mutable cache fields, single constructor with required data, added Create factory method). BestFitFinder remains on RotationSlideStrategy as default. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
78 lines
2.7 KiB
C#
78 lines
2.7 KiB
C#
using OpenNest.Converters;
|
|
using OpenNest.Geometry;
|
|
using OpenNest.Math;
|
|
using System.Linq;
|
|
|
|
namespace OpenNest.Engine.BestFit
|
|
{
|
|
public static class PolygonHelper
|
|
{
|
|
public static PolygonExtractionResult ExtractPerimeterPolygon(Drawing drawing, double halfSpacing)
|
|
{
|
|
var entities = ConvertProgram.ToGeometry(drawing.Program)
|
|
.Where(e => e.Layer != SpecialLayers.Rapid)
|
|
.ToList();
|
|
|
|
if (entities.Count == 0)
|
|
return new PolygonExtractionResult(null, Vector.Zero);
|
|
|
|
var definedShape = new ShapeProfile(entities);
|
|
var perimeter = definedShape.Perimeter;
|
|
|
|
if (perimeter == null)
|
|
return new PolygonExtractionResult(null, Vector.Zero);
|
|
|
|
// Inflate by half-spacing if spacing is non-zero.
|
|
// OffsetSide.Right = outward for CCW perimeters (standard for outer contours).
|
|
var inflated = halfSpacing > 0
|
|
? (perimeter.OffsetEntity(halfSpacing, OffsetSide.Right) as Shape ?? perimeter)
|
|
: perimeter;
|
|
|
|
// Convert to polygon with circumscribed arcs for tight nesting.
|
|
var polygon = inflated.ToPolygonWithTolerance(0.01, circumscribe: true);
|
|
|
|
if (polygon.Vertices.Count < 3)
|
|
return new PolygonExtractionResult(null, Vector.Zero);
|
|
|
|
// Normalize: move polygon to origin.
|
|
polygon.UpdateBounds();
|
|
var bb = polygon.BoundingBox;
|
|
polygon.Offset(-bb.Left, -bb.Bottom);
|
|
|
|
// No correction needed: BestFitFinder always pairs the same drawing with
|
|
// itself, so the polygon-to-part offset is identical for both parts and
|
|
// cancels out in the NFP displacement.
|
|
return new PolygonExtractionResult(polygon, Vector.Zero);
|
|
}
|
|
|
|
public static Polygon RotatePolygon(Polygon polygon, double angle, bool reNormalize = true)
|
|
{
|
|
if (angle.IsEqualTo(0))
|
|
return polygon;
|
|
|
|
var result = new Polygon();
|
|
var cos = System.Math.Cos(angle);
|
|
var sin = System.Math.Sin(angle);
|
|
|
|
foreach (var v in polygon.Vertices)
|
|
{
|
|
result.Vertices.Add(new Vector(
|
|
v.X * cos - v.Y * sin,
|
|
v.X * sin + v.Y * cos));
|
|
}
|
|
|
|
if (reNormalize)
|
|
{
|
|
// Re-normalize to origin.
|
|
result.UpdateBounds();
|
|
var bb = result.BoundingBox;
|
|
result.Offset(-bb.Left, -bb.Bottom);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
public record PolygonExtractionResult(Polygon Polygon, Vector Correction);
|
|
}
|