QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-31 16:08:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

add top surface gap_infill

Browse Source
This commit is contained in:
Wang YB
2024-03-08 09:11:53 +08:00
parent cea37f9f7d
commit 2a8cdc3414
8 changed files with 321 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/Layer.cpp
View File

@@ -621,6 +621,8 @@ void Layer::make_perimeters()
std::vector<uint32_t> layer_region_ids;
std::vector<std::pair<ExtrusionRange, ExtrusionRange>> perimeter_and_gapfill_ranges;
ExPolygons fill_expolygons;
//w21
ExPolygons fill_no_overlap_expolygons;
std::vector<ExPolygonRange> fill_expolygons_ranges;
SurfacesPtr surfaces_to_merge;
SurfacesPtr surfaces_to_merge_temp;
@@ -651,6 +653,8 @@ void Layer::make_perimeters()
fill_expolygons.clear();
fill_expolygons_ranges.clear();
surfaces_to_merge.clear();
//w21
fill_no_overlap_expolygons.clear();
// find compatible regions
layer_region_ids.clear();
@@ -691,7 +695,8 @@ void Layer::make_perimeters()
}
if (layer_region_ids.size() == 1) { // optimization
(*layerm)->make_perimeters((*layerm)->slices(), perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges);
//w21
(*layerm)->make_perimeters((*layerm)->slices(), perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges,fill_no_overlap_expolygons);
this->sort_perimeters_into_islands((*layerm)->slices(), region_id, perimeter_and_gapfill_ranges, std::move(fill_expolygons), fill_expolygons_ranges, layer_region_ids);
} else {
SurfaceCollection new_slices;
@@ -726,8 +731,23 @@ void Layer::make_perimeters()
}
}
// make perimeters
layerm_config->make_perimeters(new_slices, perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges);
//w21
layerm_config->make_perimeters(new_slices, perimeter_and_gapfill_ranges, fill_expolygons, fill_expolygons_ranges,fill_no_overlap_expolygons);
this->sort_perimeters_into_islands(new_slices, region_id_config, perimeter_and_gapfill_ranges, std::move(fill_expolygons), fill_expolygons_ranges, layer_region_ids);
//w21
if (!new_slices.surfaces.empty()) {
for (size_t idx : layer_region_ids) {
// Separate the fill surfaces.
LayerRegion &layer = *m_regions[idx];
ExPolygons expp = intersection_ex(new_slices.surfaces, layer.slices().surfaces);
layer.m_fill_expolygons = std::move(expp);
if (!layer.m_fill_expolygons.empty()) {
layer.m_fill_surfaces.set(std::move(layer.m_fill_expolygons), layer.slices().surfaces.front());
layer.m_fill_no_overlap_expolygons = intersection_ex(layer.slices().surfaces, fill_no_overlap_expolygons);
}
}
}
}
}
}