3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of slicing with modifiers after recent refactoring - sorting

Browse Source 
infills into islands.
This commit is contained in:
Vojtech Bubnik 2023-01-10 12:37:05 +01:00
parent 1912b834b1
commit 25dffb9c2f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libslic3r/Layer.cpp
View File

@ -497,15 +497,18 @@ void Layer::make_perimeters()
} else { } else {
SurfaceCollection new_slices; SurfaceCollection new_slices;
// Use the region with highest infill rate, as the make_perimeters() function below decides on the gap fill based on the infill existence. // Use the region with highest infill rate, as the make_perimeters() function below decides on the gap fill based on the infill existence.
LayerRegion *layerm_config = m_regions[layer_region_ids.front()]; uint32_t region_id_config = layer_region_ids.front();
{ LayerRegion* layerm_config = m_regions[region_id_config];
{
// Merge slices (surfaces) according to number of extra perimeters. // Merge slices (surfaces) according to number of extra perimeters.
for (uint32_t region_id : layer_region_ids) { for (uint32_t region_id : layer_region_ids) {
LayerRegion &layerm = *m_regions[region_id]; LayerRegion &layerm = *m_regions[region_id];
for (const Surface &surface : layerm.slices()) for (const Surface &surface : layerm.slices())
surfaces_to_merge.emplace_back(&surface); surfaces_to_merge.emplace_back(&surface);
if (layerm.region().config().fill_density > layerm_config->region().config().fill_density) if (layerm.region().config().fill_density > layerm_config->region().config().fill_density) {
layerm_config = &layerm; region_id_config = region_id;
layerm_config = &layerm;
}
} }
std::sort(surfaces_to_merge.begin(), surfaces_to_merge.end(), [](const Surface *l, const Surface *r){ return l->extra_perimeters < r->extra_perimeters; }); std::sort(surfaces_to_merge.begin(), surfaces_to_merge.end(), [](const Surface *l, const Surface *r){ return l->extra_perimeters < r->extra_perimeters; });
for (size_t i = 0; i < surfaces_to_merge.size();) { for (size_t i = 0; i < surfaces_to_merge.size();) {
@ -525,7 +528,7 @@ void Layer::make_perimeters()
} }
// make perimeters // make perimeters
layerm_config->make_perimeters(new_slices, perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges); layerm_config->make_perimeters(new_slices, perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges);
this->sort_perimeters_into_islands(new_slices, region_id, perimeter_and_gapfill_ranges, std::move(fill_expolygons), fill_expolygons_ranges, layer_region_ids); this->sort_perimeters_into_islands(new_slices, region_id_config, perimeter_and_gapfill_ranges, std::move(fill_expolygons), fill_expolygons_ranges, layer_region_ids);
} }
} }
} }