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

Revert "Fixed a missing include problem in SLASupportAuto.hpp"

Browse source 
This is already solved in master branch by including the header

This reverts commit b7465e935e.
This commit is contained in:
Lukas Matena 2019-02-20 13:16:09 +01:00
parent b7465e935e
commit 574cb53bff
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/SLA/SLAAutoSupports.cpp
View file

@ -499,18 +499,6 @@ void SLAAutoSupports::uniformly_cover(const ExPolygons& islands, Structure& stru
}
}
float SLAAutoSupports::Structure::overlap_area(const Structure &rhs) const
{
double out = 0.;
if (this->bbox.overlap(rhs.bbox)) {
Polygons polys = intersection(to_polygons(*this->polygon), to_polygons(*rhs.polygon), false);
for (const Polygon &poly : polys)
out += poly.area();
}
return float(out);
}
#ifdef SLA_AUTOSUPPORTS_DEBUG
void SLAAutoSupports::output_structures(const std::vector<Structure>& structures)
{

10
src/libslic3r/SLA/SLAAutoSupports.hpp
View file

@ -71,7 +71,15 @@ public:
bool overlaps(const Structure &rhs) const {
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 {
double out = 0.;
if (this->bbox.overlap(rhs.bbox)) {
Polygons polys = intersection(to_polygons(*this->polygon), to_polygons(*rhs.polygon), false);
for (const Polygon &poly : polys)
out += poly.area();
}
return float(out);
}
float area_below() const {
float area = 0.f;
for (const Link &below : this->islands_below)