GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-09-24 03:23:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup of process_external_surfaces()

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-04-03 19:17:37 +02:00
parent ef3d235e79
commit 4926e2c76c
1 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
xs/src/libslic3r/LayerRegion.cpp
View File

@ -73,19 +73,19 @@ LayerRegion::process_external_surfaces()
const Surfaces &surfaces = this->fill_surfaces.surfaces; const Surfaces &surfaces = this->fill_surfaces.surfaces;
SurfaceCollection bottom; SurfaceCollection bottom;
for (Surfaces::const_iterator surface = surfaces.begin(); surface != surfaces.end(); ++surface) { for (const Surface &surface : surfaces) {
if (!surface->is_bottom()) continue; if (!surface.is_bottom()) continue;
const ExPolygons grown = offset_ex(surface->expolygon, +SCALED_EXTERNAL_INFILL_MARGIN); const ExPolygons grown = offset_ex(surface.expolygon, +SCALED_EXTERNAL_INFILL_MARGIN);
/* detect bridge direction before merging grown surfaces otherwise adjacent bridges /* detect bridge direction before merging grown surfaces otherwise adjacent bridges
would get merged into a single one while they need different directions would get merged into a single one while they need different directions
also, supply the original expolygon instead of the grown one, because in case also, supply the original expolygon instead of the grown one, because in case
of very thin (but still working) anchors, the grown expolygon would go beyond them */ of very thin (but still working) anchors, the grown expolygon would go beyond them */
double angle = -1; double angle = -1;
if (this->layer()->lower_layer != NULL && surface->is_bridge()) { if (this->layer()->lower_layer != NULL && surface.is_bridge()) {
BridgeDetector bd( BridgeDetector bd(
surface->expolygon, surface.expolygon,
this->layer()->lower_layer->slices, this->layer()->lower_layer->slices,
this->flow(frInfill, true).scaled_width() this->flow(frInfill, true).scaled_width()
); );
@ -104,28 +104,21 @@ LayerRegion::process_external_surfaces()
} }
} }
for (ExPolygons::const_iterator it = grown.begin(); it != grown.end(); ++it) { Surface templ = surface;
Surface s = *surface; templ.bridge_angle = angle;
s.expolygon = *it; bottom.append(grown, templ);
s.bridge_angle = angle;
bottom.surfaces.push_back(s);
}
} }
SurfaceCollection top; SurfaceCollection top;
for (Surfaces::const_iterator surface = surfaces.begin(); surface != surfaces.end(); ++surface) { for (const Surface &surface : surfaces) {
if (surface->surface_type != stTop) continue; if (surface.surface_type != stTop) continue;
// give priority to bottom surfaces // give priority to bottom surfaces
ExPolygons grown = diff_ex( ExPolygons grown = diff_ex(
offset(surface->expolygon, +SCALED_EXTERNAL_INFILL_MARGIN), offset(surface.expolygon, +SCALED_EXTERNAL_INFILL_MARGIN),
(Polygons)bottom (Polygons)bottom
); );
for (ExPolygons::const_iterator it = grown.begin(); it != grown.end(); ++it) { top.append(grown, surface);
Surface s = *surface;
s.expolygon = *it;
top.surfaces.push_back(s);
}
} }
/* if we're slicing with no infill, we can't extend external surfaces /* if we're slicing with no infill, we can't extend external surfaces
@ -134,10 +127,9 @@ LayerRegion::process_external_surfaces()
if (this->region()->config.fill_density.value > 0) { if (this->region()->config.fill_density.value > 0) {
fill_boundaries = SurfaceCollection(surfaces); fill_boundaries = SurfaceCollection(surfaces);
} else { } else {
for (Surfaces::const_iterator it = surfaces.begin(); it != surfaces.end(); ++it) { for (const Surface &s : surfaces)
if (it->surface_type != stInternal) if (s.surface_type != stInternal)
fill_boundaries.surfaces.push_back(*it); fill_boundaries.surfaces.push_back(s);
}
} }
// intersect the grown surfaces with the actual fill boundaries // intersect the grown surfaces with the actual fill boundaries
@ -151,10 +143,10 @@ LayerRegion::process_external_surfaces()
std::vector<SurfacesConstPtr> groups; std::vector<SurfacesConstPtr> groups;
tb.group(&groups); tb.group(&groups);
for (std::vector<SurfacesConstPtr>::const_iterator g = groups.begin(); g != groups.end(); ++g) { for (const SurfacesConstPtr &g : groups) {
Polygons subject; Polygons subject;
for (SurfacesConstPtr::const_iterator s = g->begin(); s != g->end(); ++s) for (const Surface* s : g)
append_to(subject, (Polygons)**s); append_to(subject, (Polygons)*s);
ExPolygons expp = intersection_ex( ExPolygons expp = intersection_ex(
subject, subject,
@ -162,45 +154,36 @@ LayerRegion::process_external_surfaces()
true // to ensure adjacent expolygons are unified true // to ensure adjacent expolygons are unified
); );
for (ExPolygons::const_iterator ex = expp.begin(); ex != expp.end(); ++ex) { new_surfaces.append(expp, *g.front());
Surface s = *g->front();
s.expolygon = *ex;
new_surfaces.surfaces.push_back(s);
}
} }
} }
/* subtract the new top surfaces from the other non-top surfaces and re-add them */ /* subtract the new top surfaces from the other non-top surfaces and re-add them */
{ {
SurfaceCollection other; SurfaceCollection other;
for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) { for (const Surface &s : surfaces)
if (s->surface_type != stTop && !s->is_bottom()) if (s.surface_type != stTop && !s.is_bottom())
other.surfaces.push_back(*s); other.surfaces.push_back(s);
}
// group surfaces // group surfaces
std::vector<SurfacesConstPtr> groups; std::vector<SurfacesConstPtr> groups;
other.group(&groups); other.group(&groups);
for (std::vector<SurfacesConstPtr>::const_iterator g = groups.begin(); g != groups.end(); ++g) { for (const SurfacesConstPtr &g : groups) {
Polygons subject; Polygons subject;
for (SurfacesConstPtr::const_iterator s = g->begin(); s != g->end(); ++s) for (const Surface* s : g)
append_to(subject, (Polygons)**s); append_to(subject, (Polygons)*s);
ExPolygons expp = diff_ex( ExPolygons expp = diff_ex(
subject, subject,
(Polygons)new_surfaces (Polygons)new_surfaces
); );
for (ExPolygons::const_iterator ex = expp.begin(); ex != expp.end(); ++ex) { new_surfaces.append(expp, *g.front());
Surface s = *g->front();
s.expolygon = *ex;
new_surfaces.surfaces.push_back(s);
}
} }
} }
this->fill_surfaces = new_surfaces; this->fill_surfaces = std::move(new_surfaces);
} }
void void