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

Path: Adaptive - fix for linking moves optimization

Browse Source
This commit is contained in:
kreso-t
2018-08-28 22:41:17 +02:00
committed by wmayer
parent 0c13ef45ed
commit 1f9bf2e2a5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,7 +249,7 @@ namespace AdaptivePath {
bool IsPointWithinCutRegion(const Paths & toolBoundPaths,const IntPoint & point) {
for(size_t i=0; i<toolBoundPaths.size();i++) {
int pip=PointInPolygon(point, toolBoundPaths[i]);
if(i==0 && pip==0) return false; // is outside boundary
if(i==0 && (pip==0 || pip==-1)) return false; // is outside or on boundary
if(i>0 && pip!=0) return false; // is inside hole
}
return true;
@@ -1051,7 +1051,12 @@ namespace AdaptivePath {
Clipper clip;
mt=MotionType::mtCutting; // asume we can cut trough
IntPoint inters; // to hold intersection point
if(IntersectionPoint(toolBoundPaths,lastPoint, nextPoint,inters)) {
if(
!IsPointWithinCutRegion(toolBoundPaths,lastPoint)
||
!IsPointWithinCutRegion(toolBoundPaths,nextPoint)
||
IntersectionPoint(toolBoundPaths,lastPoint, nextPoint,inters)) {
// if intersect with boundary - its not clear to cut
mt=MotionType::mtLinkNotClear;
// cout<<"linking - touches boundary" << endl;