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

Separate 'extrude_perimeters.'

Browse Source
This commit is contained in:
Martin Šach 2024-05-14 12:58:27 +02:00 committed by Lukas Matena
parent cee83a0894
commit 4e7d5453f6
2 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/libslic3r/GCode.cpp
View File

@ -2745,6 +2745,40 @@ std::vector<const ExtrusionEntity *> extract_perimeter_extrusions(
return result;
}
std::string GCodeGenerator::extrude_perimeters(
const Print &print,
const Layer *layer,
const LayerIsland &island,
const std::vector<const ExtrusionEntity *> &perimeters,
const InstanceToPrint &print_instance,
const GCode::SmoothPathCache &smooth_path_cache
) {
const LayerRegion &layerm = *layer->get_region(island.perimeters.region());
// PrintObjects own the PrintRegions, thus the pointer to PrintRegion would be
// unique to a PrintObject, they would not identify the content of PrintRegion
// accross the whole print uniquely. Translate to a Print specific PrintRegion.
const PrintRegion &region = print.get_print_region(
layerm.region().print_region_id()
);
if (!perimeters.empty()) {
m_config.apply(region.config());
}
std::string gcode{};
for (const ExtrusionEntity *ee : perimeters) {
// Don't reorder, don't flip.
gcode += this->extrude_entity(
{*ee, false}, smooth_path_cache, comment_perimeter, -1.
);
this->m_travel_obstacle_tracker.mark_extruded(
ee, print_instance.object_layer_to_print_id, print_instance.instance_id
);
}
return gcode;
};
void GCodeGenerator::process_layer_single_object(
// output
std::string &gcode,
@ -2877,37 +2911,6 @@ void GCodeGenerator::process_layer_single_object(
//FIXME order islands?
// Sequential tool path ordering of multiple parts within the same object, aka. perimeter tracking (#5511)
for (const LayerIsland &island : lslice.islands) {
auto process_perimeters = [&]() {
const LayerRegion &layerm = *layer->get_region(island.perimeters.region());
// PrintObjects own the PrintRegions, thus the pointer to PrintRegion would be
// unique to a PrintObject, they would not identify the content of PrintRegion
// accross the whole print uniquely. Translate to a Print specific PrintRegion.
const PrintRegion &region = print.get_print_region(
layerm.region().print_region_id()
);
bool first = true;
std::vector<const ExtrusionEntity *> perimeters{extract_perimeter_extrusions(
print, layer, island, layer_tools, print_instance.instance_id, extruder_id,
print_wipe_extrusions
)};
for (const ExtrusionEntity *ee : perimeters) {
// This may not apply to Arachne, but maybe the Arachne gap fill should
// disable reverse as well? assert(! eec->can_reverse());
if (first) {
first = false;
init_layer_delayed();
m_config.apply(region.config());
}
// Don't reorder, don't flip.
gcode += this->extrude_entity(
{*ee, false}, smooth_path_cache, comment_perimeter, -1.
);
m_travel_obstacle_tracker.mark_extruded(
ee, print_instance.object_layer_to_print_id, print_instance.instance_id
);
}
};
auto process_infill = [&]() {
for (auto it = island.fills.begin(); it != island.fills.end();) {
// Gather range of fill ranges with the same region.
@ -2918,11 +2921,27 @@ void GCodeGenerator::process_layer_single_object(
it = it_end;
}
};
const std::vector<const ExtrusionEntity *> perimeters{extract_perimeter_extrusions(
print, layer, island, layer_tools, print_instance.instance_id, extruder_id,
print_wipe_extrusions
)};
if (!perimeters.empty()) {
init_layer_delayed();
}
if (print.config().infill_first) {
process_infill();
process_perimeters();
if (!perimeters.empty()) {
init_layer_delayed();
}
gcode += this->extrude_perimeters(print, layer, island, perimeters, print_instance, smooth_path_cache);
} else {
process_perimeters();
if (!perimeters.empty()) {
init_layer_delayed();
}
gcode += this->extrude_perimeters(print, layer, island, perimeters, print_instance, smooth_path_cache);
process_infill();
}
}

9
src/libslic3r/GCode.hpp
View File

@ -305,6 +305,15 @@ private:
// For sequential print, the instance of the object to be printing has to be defined.
const size_t single_object_instance_idx);
std::string extrude_perimeters(
const Print &print,
const Layer *layer,
const LayerIsland &island,
const std::vector<const ExtrusionEntity *> &perimeters,
const InstanceToPrint &print_instance,
const GCode::SmoothPathCache &smooth_path_cache
);
// This function will be called for each printing extruder, possibly twice: First for wiping extrusions, second for normal extrusions.
void process_layer_single_object(
// output