fix: account for contour winding direction in lead-in normal computation

ComputeNormal assumed CW winding for all contours. For CCW-wound cutouts,
line normals pointed to the material side instead of scrap, placing lead-ins
on the wrong side. Now accepts a winding parameter: lines flip the normal
for CCW winding, and arcs flip when arc direction differs from contour
winding (concave feature detection).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-02 12:06:08 -04:00
parent ec0baad585
commit 64945220b9
2 changed files with 20 additions and 13 deletions

View File

@@ -102,7 +102,7 @@ namespace OpenNest.Actions
snapPoint = closest;
snapEntity = entity;
snapContourType = info.ContourType;
snapNormal = ContourCuttingStrategy.ComputeNormal(closest, entity, info.ContourType);
snapNormal = ContourCuttingStrategy.ComputeNormal(closest, entity, info.ContourType, info.Winding);
hasSnap = true;
hoveredContour = info;
}
@@ -282,7 +282,7 @@ namespace OpenNest.Actions
{
snapPoint = bestPoint;
snapEntity = bestEntity;
snapNormal = ContourCuttingStrategy.ComputeNormal(bestPoint, bestEntity, snapContourType);
snapNormal = ContourCuttingStrategy.ComputeNormal(bestPoint, bestEntity, snapContourType, hoveredContour.Winding);
activeSnapType = bestType;
}
@@ -356,7 +356,8 @@ namespace OpenNest.Actions
contours.Add(new ShapeInfo
{
Shape = profile.Perimeter,
ContourType = ContourType.External
ContourType = ContourType.External,
Winding = ContourCuttingStrategy.DetermineWinding(profile.Perimeter)
});
}
@@ -366,7 +367,8 @@ namespace OpenNest.Actions
contours.Add(new ShapeInfo
{
Shape = cutout,
ContourType = ContourCuttingStrategy.DetectContourType(cutout)
ContourType = ContourCuttingStrategy.DetectContourType(cutout),
Winding = ContourCuttingStrategy.DetermineWinding(cutout)
});
}
}
@@ -483,6 +485,7 @@ namespace OpenNest.Actions
{
public Shape Shape { get; set; }
public ContourType ContourType { get; set; }
public RotationType Winding { get; set; }
}
}
}