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

fix(bestfit): stop at internal arc tangency

Browse Source
This commit is contained in:
aj
2026-09-27 16:35:53 -04:00
parent bc5fd86996
commit ca1902e075
7 changed files with 519 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Engine/BestFit/CpuDistanceComputer.cs
+4 -46
View File
@@ -253,55 +253,13 @@ namespace OpenNest.Engine.BestFit
for (var s = 0; s < stationaryCurves.Length; s++)
{
var sc = stationaryCurves[s];
var d = SpatialQuery.RayCircleDistance(
mcx,
mcy,
sc.Cx,
sc.Cy,
mc.Radius + sc.Radius,
dirX,
dirY
);
var d = SpatialQuery.CurveTangencyDistance(
mcx, mcy, mc.Radius, mc.Entity as Arc,
sc.Cx, sc.Cy, sc.Radius, sc.Entity as Arc, dirX, dirY);
if (d >= minDist || d == double.MaxValue)
if (d >= minDist)
continue;
if (mc.Entity is Arc || sc.Entity is Arc)
{
var mx = mcx + d * dirX;
var my = mcy + d * dirY;
var toCx = sc.Cx - mx;
var toCy = sc.Cy - my;
if (mc.Entity is Arc mArc)
{
var angle = Angle.NormalizeRad(System.Math.Atan2(toCy, toCx));
if (
!Angle.IsBetweenRad(
angle,
mArc.StartAngle,
mArc.EndAngle,
mArc.IsReversed
)
)
continue;
}
if (sc.Entity is Arc sArc)
{
var angle = Angle.NormalizeRad(System.Math.Atan2(-toCy, -toCx));
if (
!Angle.IsBetweenRad(
angle,
sArc.StartAngle,
sArc.EndAngle,
sArc.IsReversed
)
)
continue;
}
}
minDist = d;
if (d <= 0)
{