GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-03 02:00:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-2585: Fix empty layers when multi-material painting and modifiers are used.

Browse Source
This commit is contained in:
Lukáš Hejl 2024-12-05 14:46:48 +01:00 committed by Lukas Matena
parent 14be8a9cb8
commit 4b3da02ec2
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libslic3r/PrintObjectSlice.cpp
View File

@ -595,12 +595,13 @@ void apply_mm_segmentation(PrintObject &print_object, ThrowOnCancel throw_on_can
BoundingBox bbox; BoundingBox bbox;
}; };
std::vector<ByExtruder> by_extruder;
struct ByRegion { struct ByRegion {
ExPolygons expolygons; ExPolygons expolygons;
bool needs_merge { false }; bool needs_merge { false };
}; };
std::vector<ByRegion> by_region;
std::vector<ByExtruder> by_extruder;
std::vector<ByRegion> by_region;
for (size_t layer_id = range.begin(); layer_id < range.end(); ++layer_id) { for (size_t layer_id = range.begin(); layer_id < range.end(); ++layer_id) {
throw_on_cancel(); throw_on_cancel();
Layer &layer = *print_object.get_layer(int(layer_id)); Layer &layer = *print_object.get_layer(int(layer_id));
@ -645,34 +646,36 @@ void apply_mm_segmentation(PrintObject &print_object, ThrowOnCancel throw_on_can
assert(&parent_print_region == layer_range.volume_regions[it_first_painted_region->parent].region); assert(&parent_print_region == layer_range.volume_regions[it_first_painted_region->parent].region);
// Find the first PaintedRegion with different parent PrintRegion.
auto it_last_painted_region = std::find_if(it_first_painted_region, layer_range.painted_regions.cend(), [&it_first_painted_region](const auto &painted_region) {
return painted_region.parent != it_first_painted_region->parent;
});
// Update the beginning PaintedRegion iterator for the next iteration. // Update the beginning PaintedRegion iterator for the next iteration.
it_painted_region_begin = it_last_painted_region; it_painted_region_begin = it_first_painted_region;
const BoundingBox parent_layer_region_bbox = get_extents(parent_layer_region.slices().surfaces); const BoundingBox parent_layer_region_bbox = get_extents(parent_layer_region.slices().surfaces);
bool self_trimmed = false; bool self_trimmed = false;
int self_extruder_id = -1; // 1-based extruder ID int self_extruder_id = -1; // 1-based extruder ID
for (auto it_painted_region = it_first_painted_region; it_painted_region != it_last_painted_region; ++it_painted_region) { for (int extruder_id = 1; extruder_id <= int(by_extruder.size()); ++extruder_id) {
const int extruder_id = int(it_painted_region->extruder_id); // 1-based extruder ID
assert(extruder_id > 0 && (extruder_id - 1) < int(by_extruder.size()));
assert(layer_range.volume_regions[it_painted_region->parent].region == &parent_print_region);
const ByExtruder &segmented = by_extruder[extruder_id - 1]; const ByExtruder &segmented = by_extruder[extruder_id - 1];
if (!segmented.bbox.defined || !parent_layer_region_bbox.overlap(segmented.bbox)) if (!segmented.bbox.defined || !parent_layer_region_bbox.overlap(segmented.bbox))
continue; continue;
// Find the first target region iterator.
auto it_target_region = std::find_if(it_painted_region_begin, layer_range.painted_regions.cend(), [extruder_id](const auto &painted_region) {
return int(painted_region.extruder_id) >= extruder_id;
});
assert(it_target_region != layer_range.painted_regions.end());
assert(layer_range.volume_regions[it_target_region->parent].region == &parent_print_region && int(it_target_region->extruder_id) == extruder_id);
// Update the beginning PaintedRegion iterator for the next iteration.
it_painted_region_begin = it_target_region;
// FIXME: Don't trim by self, it is not reliable. // FIXME: Don't trim by self, it is not reliable.
if (it_painted_region->region == &parent_print_region) { if (it_target_region->region == &parent_print_region) {
self_extruder_id = extruder_id; self_extruder_id = extruder_id;
continue; continue;
} }
// Steal from this region. // Steal from this region.
int target_region_id = it_painted_region->region->print_object_region_id(); int target_region_id = it_target_region->region->print_object_region_id();
ExPolygons stolen = intersection_ex(parent_layer_region.slices().surfaces, segmented.expolygons); ExPolygons stolen = intersection_ex(parent_layer_region.slices().surfaces, segmented.expolygons);
if (!stolen.empty()) { if (!stolen.empty()) {
ByRegion &dst = by_region[target_region_id]; ByRegion &dst = by_region[target_region_id];