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

Store last position locally while extruding infills

Browse Source
This commit is contained in:
Martin Šach 2024-05-14 14:23:47 +02:00 committed by Lukas Matena
parent 5a9f9946ba
commit 9174d10823
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/GCode.cpp
View File

@ -2916,6 +2916,7 @@ void GCodeGenerator::process_layer_single_object(
// Sequential tool path ordering of multiple parts within the same object, aka. perimeter tracking (#5511) // Sequential tool path ordering of multiple parts within the same object, aka. perimeter tracking (#5511)
for (const LayerIsland &island : lslice.islands) { for (const LayerIsland &island : lslice.islands) {
auto process_infill = [&]() { auto process_infill = [&]() {
std::optional<Point> previous_position{this->last_position};
for (auto it = island.fills.begin(); it != island.fills.end();) { for (auto it = island.fills.begin(); it != island.fills.end();) {
// Gather range of fill ranges with the same region. // Gather range of fill ranges with the same region.
auto it_end = it; auto it_end = it;
@ -2925,7 +2926,7 @@ void GCodeGenerator::process_layer_single_object(
// identify the content of PrintRegion accross the whole print uniquely. Translate to a Print specific PrintRegion. // 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()); const PrintRegion &region = print.get_print_region(layerm.region().print_region_id());
const Point* start_near = this->last_position ? &(*(this->last_position)) : nullptr; const Point* start_near = previous_position ? &(*(previous_position)) : nullptr;
ExtrusionEntitiesPtr temp_fill_extrusions{extract_fill_extrusions( ExtrusionEntitiesPtr temp_fill_extrusions{extract_fill_extrusions(
layer, layer,
@ -2944,6 +2945,10 @@ void GCodeGenerator::process_layer_single_object(
if (!sorted_extrusions.empty()) { if (!sorted_extrusions.empty()) {
init_layer_delayed(); init_layer_delayed();
previous_position = sorted_extrusions.back().flipped() ?
sorted_extrusions.back().extrusion_entity().first_point() :
sorted_extrusions.back().extrusion_entity().last_point();
} }
gcode += this->extrude_infill_range(sorted_extrusions, region, "infill", smooth_path_cache); gcode += this->extrude_infill_range(sorted_extrusions, region, "infill", smooth_path_cache);
@ -2979,6 +2984,7 @@ void GCodeGenerator::process_layer_single_object(
// First Ironing changes extrusion rate quickly, second single ironing may be done over multiple perimeter regions. // First Ironing changes extrusion rate quickly, second single ironing may be done over multiple perimeter regions.
// Ironing in a second phase is safer, but it may be less efficient. // Ironing in a second phase is safer, but it may be less efficient.
for (const LayerIsland &island : lslice.islands) { for (const LayerIsland &island : lslice.islands) {
std::optional<Point> previous_position{this->last_position};
for (auto it = island.fills.begin(); it != island.fills.end();) { for (auto it = island.fills.begin(); it != island.fills.end();) {
// Gather range of fill ranges with the same region. // Gather range of fill ranges with the same region.
auto it_end = it; auto it_end = it;
@ -2988,7 +2994,7 @@ void GCodeGenerator::process_layer_single_object(
// identify the content of PrintRegion accross the whole print uniquely. Translate to a Print specific PrintRegion. // 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()); const PrintRegion &region = print.get_print_region(layerm.region().print_region_id());
const Point* start_near = this->last_position ? &(*(this->last_position)) : nullptr; const Point* start_near = previous_position ? &(*(previous_position)) : nullptr;
ExtrusionEntitiesPtr temp_fill_extrusions{extract_fill_extrusions( ExtrusionEntitiesPtr temp_fill_extrusions{extract_fill_extrusions(
layer, layer,
@ -3007,6 +3013,10 @@ void GCodeGenerator::process_layer_single_object(
if (! sorted_extrusions.empty()) { if (! sorted_extrusions.empty()) {
init_layer_delayed(); init_layer_delayed();
previous_position = sorted_extrusions.back().flipped() ?
sorted_extrusions.back().extrusion_entity().first_point() :
sorted_extrusions.back().extrusion_entity().last_point();
} }
gcode += this->extrude_infill_range(sorted_extrusions, region, "ironing", smooth_path_cache); gcode += this->extrude_infill_range(sorted_extrusions, region, "ironing", smooth_path_cache);