3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIXME on ExPolygon::overlaps(), which should be commutative.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-01-22 15:32:36 +01:00
parent 59017a7dae
commit eef800b5c4
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/ExPolygon.cpp
View file

@ -132,8 +132,7 @@ ExPolygon::has_boundary_point(const Point &point) const
return false; return false;
} }
bool bool ExPolygon::overlaps(const ExPolygon &other) const
ExPolygon::overlaps(const ExPolygon &other) const
{ {
#if 0 #if 0
BoundingBox bbox = get_extents(other); BoundingBox bbox = get_extents(other);
@ -150,6 +149,7 @@ ExPolygon::overlaps(const ExPolygon &other) const
#endif #endif
if (! pl_out.empty()) if (! pl_out.empty())
return true; return true;
//FIXME ExPolygon::overlaps() shall be commutative, it is not!
return ! other.contour.points.empty() && this->contains_b(other.contour.points.front()); return ! other.contour.points.empty() && this->contains_b(other.contour.points.front());
} }

1
src/libslic3r/SLA/SupportPointGenerator.hpp
View file

@ -84,6 +84,7 @@ public:
float overhangs_area = 0.f; float overhangs_area = 0.f;
bool overlaps(const Structure &rhs) const { bool overlaps(const Structure &rhs) const {
//FIXME ExPolygon::overlaps() shall be commutative, it is not!
return this->bbox.overlap(rhs.bbox) && (this->polygon->overlaps(*rhs.polygon) || rhs.polygon->overlaps(*this->polygon)); return this->bbox.overlap(rhs.bbox) && (this->polygon->overlaps(*rhs.polygon) || rhs.polygon->overlaps(*this->polygon));
} }
float overlap_area(const Structure &rhs) const { float overlap_area(const Structure &rhs) const {