GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-12 20:59:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: missing bottom solid infill when support_material_contact_distance == 0, z > 0, and the layer contained non-oriented bridges as well. #3503

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-12-17 11:23:40 +01:00
parent 1d74839373
commit b23e50603e
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,14 +75,14 @@ LayerRegion::process_external_surfaces(const Layer* lower_layer)
for (Surfaces::const_iterator surface = surfaces.begin(); surface != surfaces.end(); ++surface) { for (Surfaces::const_iterator surface = surfaces.begin(); surface != surfaces.end(); ++surface) {
if (!surface->is_bottom()) continue; if (!surface->is_bottom()) continue;
ExPolygons grown = offset_ex(surface->expolygon, +margin); const ExPolygons grown = offset_ex(surface->expolygon, +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 (lower_layer != NULL) { if (lower_layer != NULL && surface->is_bridge()) {
BridgeDetector bd( BridgeDetector bd(
surface->expolygon, surface->expolygon,
lower_layer->slices, lower_layer->slices,
@ -97,8 +97,7 @@ LayerRegion::process_external_surfaces(const Layer* lower_layer)
angle = bd.angle; angle = bd.angle;
if (this->layer()->object()->config.support_material) { if (this->layer()->object()->config.support_material) {
Polygons coverage = bd.coverage(); append_to(this->bridged, bd.coverage());
this->bridged.insert(this->bridged.end(), coverage.begin(), coverage.end());
this->unsupported_bridge_edges.append(bd.unsupported_edges()); this->unsupported_bridge_edges.append(bd.unsupported_edges());
} }
} }

26
xs/src/libslic3r/LayerRegionFill.cpp
View File

@ -44,7 +44,7 @@ LayerRegion::make_fill()
Polygons polygons_bridged; Polygons polygons_bridged;
polygons_bridged.reserve(this->fill_surfaces.surfaces.size()); polygons_bridged.reserve(this->fill_surfaces.surfaces.size());
for (Surfaces::const_iterator it = this->fill_surfaces.surfaces.begin(); it != this->fill_surfaces.surfaces.end(); ++it) for (Surfaces::const_iterator it = this->fill_surfaces.surfaces.begin(); it != this->fill_surfaces.surfaces.end(); ++it)
if (it->bridge_angle >= 0) if (it->is_bridge() && it->bridge_angle >= 0)
append_to(polygons_bridged, (Polygons)*it); append_to(polygons_bridged, (Polygons)*it);
// group surfaces by distinct properties (equal surface_type, thickness, thickness_layers, bridge_angle) // group surfaces by distinct properties (equal surface_type, thickness, thickness_layers, bridge_angle)
@ -53,20 +53,20 @@ LayerRegion::make_fill()
std::vector<SurfacesConstPtr> groups; std::vector<SurfacesConstPtr> groups;
this->fill_surfaces.group(&groups); this->fill_surfaces.group(&groups);
// merge compatible groups (we can generate continuous infill for them) // merge compatible solid groups (we can generate continuous infill for them)
{ {
// cache flow widths and patterns used for all solid groups // cache flow widths and patterns used for all solid groups
// (we'll use them for comparing compatible groups) // (we'll use them for comparing compatible groups)
std::vector<SurfaceGroupAttrib> group_attrib(groups.size()); std::vector<SurfaceGroupAttrib> group_attrib(groups.size());
for (size_t i = 0; i < groups.size(); ++i) { for (size_t i = 0; i < groups.size(); ++i) {
// we can only merge solid non-bridge surfaces, so discard
// non-solid surfaces
const Surface &surface = *groups[i].front(); const Surface &surface = *groups[i].front();
if (surface.is_solid() && (!surface.is_bridge() || this->layer()->id() == 0)) { // we can only merge solid non-bridge surfaces, so discard
group_attrib[i].is_solid = true; // non-solid or bridge surfaces
group_attrib[i].fw = (surface.surface_type == stTop) ? top_solid_infill_flow.width : solid_infill_flow.width; if (!surface.is_solid() || surface.is_bridge()) continue;
group_attrib[i].pattern = surface.is_external() ? this->region()->config.external_fill_pattern.value : ipRectilinear;
} group_attrib[i].is_solid = true;
group_attrib[i].fw = (surface.surface_type == stTop) ? top_solid_infill_flow.width : solid_infill_flow.width;
group_attrib[i].pattern = surface.is_external() ? this->region()->config.external_fill_pattern.value : ipRectilinear;
} }
// Loop through solid groups, find compatible groups and append them to this one. // Loop through solid groups, find compatible groups and append them to this one.
for (size_t i = 0; i < groups.size(); ++i) { for (size_t i = 0; i < groups.size(); ++i) {
@ -85,19 +85,19 @@ LayerRegion::make_fill()
} }
} }
// Give priority to bridges. Process the bridges in the first round, the rest of the surfaces in the 2nd round. // Give priority to oriented bridges. Process the bridges in the first round, the rest of the surfaces in the 2nd round.
for (size_t round = 0; round < 2; ++ round) { for (size_t round = 0; round < 2; ++ round) {
for (std::vector<SurfacesConstPtr>::const_iterator it_group = groups.begin(); it_group != groups.end(); ++ it_group) { for (std::vector<SurfacesConstPtr>::const_iterator it_group = groups.begin(); it_group != groups.end(); ++ it_group) {
const SurfacesConstPtr &group = *it_group; const SurfacesConstPtr &group = *it_group;
bool is_bridge = group.front()->bridge_angle >= 0; const bool is_oriented_bridge = group.front()->is_bridge() && group.front()->bridge_angle >= 0;
if (is_bridge != (round == 0)) if (is_oriented_bridge != (round == 0))
continue; continue;
// Make a union of polygons defining the infiill regions of a group, use a safety offset. // Make a union of polygons defining the infiill regions of a group, use a safety offset.
Polygons union_p = union_(to_polygons(group), true); Polygons union_p = union_(to_polygons(group), true);
// Subtract surfaces having a defined bridge_angle from any other, use a safety offset. // Subtract surfaces having a defined bridge_angle from any other, use a safety offset.
if (!polygons_bridged.empty() && !is_bridge) if (!is_oriented_bridge && !polygons_bridged.empty())
union_p = diff(union_p, polygons_bridged, true); union_p = diff(union_p, polygons_bridged, true);
// subtract any other surface already processed // subtract any other surface already processed