kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

re-fix early exit condition for repeat integer points

Browse Source
This commit is contained in:
David Kaufman
2025-11-07 17:09:41 -05:00
committed by Kacper Donat
parent f4f8bd2c81
commit 4f33d66fb3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/CAM/libarea/Adaptive.cpp
View File

@@ -3014,11 +3014,11 @@ void Adaptive2d::ProcessPolyNode(Paths boundPaths, Paths toolBoundPaths)
// Skip iteration if this IntPoint has already been processed
bool intRepeat = false;
if (interp.m_min && newToolPos == interp.m_min->first.second) {
interp.addPoint(interp.m_min->second, {angle, newToolPos});
interp.m_min = {{angle, newToolPos}, interp.m_min->second};
intRepeat = true;
}
if (interp.m_max && newToolPos == interp.m_max->first.second) {
interp.addPoint(interp.m_max->second, {angle, newToolPos});
interp.m_max = {{angle, newToolPos}, interp.m_max->second};
intRepeat = true;
}
@@ -3033,14 +3033,19 @@ void Adaptive2d::ProcessPolyNode(Paths boundPaths, Paths toolBoundPaths)
continue;
}
// exit early, selecting the better of the two adjacent integers
double error;
if (abs(interp.m_min->second) < abs(interp.m_max->second)) {
newToolDir = rotate(toolDir, interp.m_min->first.first);
newToolPos = interp.m_min->first.second;
error = interp.m_min->second;
}
else {
newToolDir = rotate(toolDir, interp.m_max->first.first);
newToolPos = interp.m_max->first.second;
error = interp.m_max->second;
}
areaPD = error + targetAreaPD;
area = areaPD * double(stepScaled);
break;
}
continue;