3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ClipperLib: Optimized PointInPolygon() to calculate cross products

Browse source 
with int64s instead of doubles.
Polygon / ExPolygon: contains() reworked to use ClipperLib::PointInPolygon().
	The Slic3r own implementation was not robust.
Fixed test_perimeters after recent refactoring (sorting of extrusions
	into LayerIslands)
This commit is contained in:
Vojtech Bubnik 2022-11-14 15:17:04 +01:00
parent 5eaec515ba
commit 9dca8403fe
8 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libslic3r/ExPolygon.cpp
View file

@ -100,10 +100,12 @@ bool ExPolygon::contains(const Polylines &polylines) const
bool ExPolygon::contains(const Point &point) const
{
if (! this->contour.contains(point))
if (! Slic3r::contains(contour, point, true))
// Outside the outer contour, not on the contour boundary.
return false;
for (const Polygon &hole : this->holes)
if (hole.contains(point))
if (Slic3r::contains(hole, point, false))
// Inside a hole, not on the hole boundary.
return false;
return true;
}
@ -114,13 +116,13 @@ bool ExPolygon::contains_b(const Point &point) const
return this->contains(point) || this->has_boundary_point(point);
}
bool
ExPolygon::has_boundary_point(const Point &point) const
bool ExPolygon::has_boundary_point(const Point &point) const
{
if (this->contour.has_boundary_point(point)) return true;
for (Polygons::const_iterator h = this->holes.begin(); h != this->holes.end(); ++h) {
if (h->has_boundary_point(point)) return true;
}
if (this->contour.has_boundary_point(point))
return true;
for (const Polygon &hole : this->holes)
if (hole.has_boundary_point(point))
return true;
return false;
}