3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Support calculation optimized.

Browse source
This commit is contained in:
bubnikv 2016-11-24 15:05:05 +01:00
parent e02755632e
commit a5b04d5cf3
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
xs/src/libslic3r/SupportMaterial.cpp
View file

@ -770,17 +770,27 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::bottom_conta
Polygons top = collect_region_slices_by_type(layer, stTop); Polygons top = collect_region_slices_by_type(layer, stTop);
if (top.empty()) if (top.empty())
continue; continue;
size_t projection_size_old = projection.size();
// Collect projections of all contact areas above or at the same level as this top surface. // Collect projections of all contact areas above or at the same level as this top surface.
for (; contact_idx >= 0 && top_contacts[contact_idx]->print_z >= layer.print_z; -- contact_idx) { for (; contact_idx >= 0 && top_contacts[contact_idx]->print_z >= layer.print_z; -- contact_idx) {
// Contact surfaces are expanded away from the object, trimmed by the object. // Contact surfaces are expanded away from the object, trimmed by the object.
polygons_append(projection, top_contacts[contact_idx]->polygons); // Use a slight positive offset to overlap the touching regions.
polygons_append(projection, offset(top_contacts[contact_idx]->polygons, SCALED_EPSILON));
// These are the overhang surfaces. They are touching the object and they are not expanded away from the object. // These are the overhang surfaces. They are touching the object and they are not expanded away from the object.
polygons_append(projection, *top_contacts[contact_idx]->aux_polygons); // Use a slight positive offset to overlap the touching regions.
polygons_append(projection, offset(*top_contacts[contact_idx]->aux_polygons, SCALED_EPSILON));
}
if (projection.empty())
continue;
if (projection_size_old < projection.size()) {
// Merge the newly added regions. Don't use the safety offset, the offset has been added already.
projection = union_(projection, false);
} }
// Now find whether any projection of the contact surfaces above layer.print_z not yet supported by any // Now find whether any projection of the contact surfaces above layer.print_z not yet supported by any
// top surfaces above layer.print_z falls onto this top surface. // top surfaces above layer.print_z falls onto this top surface.
// touching are the contact surfaces supported exclusively by this top surfaaces. // touching are the contact surfaces supported exclusively by this top surfaaces.
Polygons touching = intersection(top, projection, true); // Do safety offset on the projection surfaces, so they overlap. // Don't use a safety offset as it has been applied during insertion of polygons.
Polygons touching = intersection(top, projection, false);
if (touching.empty()) if (touching.empty())
continue; continue;
// Allocate a new bottom contact layer. // Allocate a new bottom contact layer.
@ -800,8 +810,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::bottom_conta
layer_new.idx_object_layer_below = layer_id; layer_new.idx_object_layer_below = layer_id;
layer_new.bridging = ! m_soluble_interface; layer_new.bridging = ! m_soluble_interface;
//FIXME how much to inflate the top surface? //FIXME how much to inflate the top surface?
Polygons poly_new = offset(touching, float(m_support_material_flow.scaled_width())); layer_new.polygons = offset(touching, float(m_support_material_flow.scaled_width()));
layer_new.polygons.swap(poly_new);
// Remove the areas that touched from the projection that will continue on next, lower, top surfaces. // Remove the areas that touched from the projection that will continue on next, lower, top surfaces.
projection = diff(projection, touching); projection = diff(projection, touching);
} }