mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix the empty layer after adding modifier 

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iad6c149cb5f1a50a199fdf1dd50f4971898972e2
This commit is contained in:
qing.zhang 2022-10-20 15:35:27 +08:00 committed by Lane.Wei
parent 8bc8c373a8
commit e3d256ca5e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libslic3r/Fill/Fill.cpp
View File

@ -109,6 +109,9 @@ struct SurfaceFill {
Surface surface; Surface surface;
ExPolygons expolygons; ExPolygons expolygons;
SurfaceFillParams params; SurfaceFillParams params;
// BBS
std::vector<size_t> region_id_group;
ExPolygons no_overlap_expolygons;
}; };
// BBS: used to judge whether the internal solid infill area is narrow // BBS: used to judge whether the internal solid infill area is narrow
@ -210,8 +213,18 @@ std::vector<SurfaceFill> group_fills(const Layer &layer)
fill.region_id = region_id; fill.region_id = region_id;
fill.surface = surface; fill.surface = surface;
fill.expolygons.emplace_back(std::move(fill.surface.expolygon)); fill.expolygons.emplace_back(std::move(fill.surface.expolygon));
} else //BBS
fill.expolygons.emplace_back(surface.expolygon); fill.region_id_group.push_back(region_id);
fill.no_overlap_expolygons = layerm.fill_no_overlap_expolygons;
} else {
fill.expolygons.emplace_back(surface.expolygon);
//BBS
auto t = find(fill.region_id_group.begin(), fill.region_id_group.end(), region_id);
if (t == fill.region_id_group.end()) {
fill.region_id_group.push_back(region_id);
fill.no_overlap_expolygons = union_ex(fill.no_overlap_expolygons, layerm.fill_no_overlap_expolygons);
}
}
} }
} }
} }
@ -337,6 +350,8 @@ std::vector<SurfaceFill> group_fills(const Layer &layer)
surface_fills.back().region_id = surface_fills[i].region_id; surface_fills.back().region_id = surface_fills[i].region_id;
surface_fills.back().surface.surface_type = stInternalSolid; surface_fills.back().surface.surface_type = stInternalSolid;
surface_fills.back().surface.thickness = surface_fills[i].surface.thickness; surface_fills.back().surface.thickness = surface_fills[i].surface.thickness;
surface_fills.back().region_id_group = surface_fills[i].region_id_group;
surface_fills.back().no_overlap_expolygons = surface_fills[i].no_overlap_expolygons;
for (size_t j = 0; j < narrow_expolygons_index.size(); j++) { for (size_t j = 0; j < narrow_expolygons_index.size(); j++) {
// BBS: move the narrow expolygons to new surface_fills.back(); // BBS: move the narrow expolygons to new surface_fills.back();
surface_fills.back().expolygons.emplace_back(std::move(surface_fills[i].expolygons[narrow_expolygons_index[j]])); surface_fills.back().expolygons.emplace_back(std::move(surface_fills[i].expolygons[narrow_expolygons_index[j]]));