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:29:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix no_sort: support generator accept chained ExtrusionEntityCollection

Browse Source
This commit is contained in:
supermerill 2018-08-15 15:39:35 +02:00
parent 2437579de6
commit 453627440f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xs/src/libslic3r/SupportMaterial.cpp
View File

@ -632,6 +632,20 @@ private:
Points m_island_samples; Points m_island_samples;
}; };
void push_entity_as_polyline(Polylines &push_into, ExtrusionEntity* entity) {
if (const ExtrusionPath* path = dynamic_cast<const ExtrusionPath*>(entity)) {
push_into.push_back(path->polyline);
} else if (const ExtrusionMultiPath* multipath = dynamic_cast<const ExtrusionMultiPath*>(entity)) {
push_into.push_back(multipath->as_polyline());
} else if (const ExtrusionLoop* loop = dynamic_cast<const ExtrusionLoop*>(entity)) {
push_into.push_back(loop->as_polyline());
} else if (const ExtrusionEntityCollection* coll = dynamic_cast<const ExtrusionEntityCollection*>(entity)) {
for (ExtrusionEntity* child_entity : coll->entities) {
push_entity_as_polyline(push_into, child_entity);
}
}
}
// Generate top contact layers supporting overhangs. // Generate top contact layers supporting overhangs.
// For a soluble interface material synchronize the layer heights with the object, otherwise leave the layer height undefined. // For a soluble interface material synchronize the layer heights with the object, otherwise leave the layer height undefined.
// If supports over bed surface only are requested, don't generate contact layers over an object. // If supports over bed surface only are requested, don't generate contact layers over an object.
@ -776,15 +790,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::top_contact_
// TODO: split_at_first_point() could split a bridge mid-way // TODO: split_at_first_point() could split a bridge mid-way
Polylines overhang_perimeters; Polylines overhang_perimeters;
for (ExtrusionEntity* extrusion_entity : layerm->perimeters.entities) { for (ExtrusionEntity* extrusion_entity : layerm->perimeters.entities) {
const ExtrusionEntityCollection *island = dynamic_cast<ExtrusionEntityCollection*>(extrusion_entity); push_entity_as_polyline(overhang_perimeters, extrusion_entity);
assert(island != NULL);
for (size_t i = 0; i < island->entities.size(); ++ i) {
ExtrusionEntity *entity = island->entities[i];
ExtrusionLoop *loop = dynamic_cast<Slic3r::ExtrusionLoop*>(entity);
overhang_perimeters.push_back(loop ?
loop->as_polyline() :
dynamic_cast<const Slic3r::ExtrusionPath*>(entity)->polyline);
}
} }
// workaround for Clipper bug, see Slic3r::Polygon::clip_as_polyline() // workaround for Clipper bug, see Slic3r::Polygon::clip_as_polyline()