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

Prepare skirt, brim, overriden extrusions and normal extrusions before gcode export

Browse Source
This commit is contained in:
Martin Šach 2024-05-16 15:28:42 +02:00 committed by Lukas Matena
parent bee25a4652
commit 09453c3a1e
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libslic3r/GCode.cpp
View File

@ -3032,6 +3032,8 @@ LayerResult GCodeGenerator::process_layer(
gcode += ProcessLayer::emit_custom_gcode_per_print_z(*this, *layer_tools.custom_gcode, m_writer.extruder()->id(), first_extruder_id, print.config()); gcode += ProcessLayer::emit_custom_gcode_per_print_z(*this, *layer_tools.custom_gcode, m_writer.extruder()->id(), first_extruder_id, print.config());
} }
std::optional<Point> previous_position{this->last_position};
std::vector<std::pair<std::size_t, const ExtrusionEntity *>> skirt; std::vector<std::pair<std::size_t, const ExtrusionEntity *>> skirt;
if (auto loops_it = skirt_loops_per_extruder.find(extruder_id); loops_it != skirt_loops_per_extruder.end()) { if (auto loops_it = skirt_loops_per_extruder.find(extruder_id); loops_it != skirt_loops_per_extruder.end()) {
const std::pair<size_t, size_t> loops = loops_it->second; const std::pair<size_t, size_t> loops = loops_it->second;
@ -3039,6 +3041,25 @@ LayerResult GCodeGenerator::process_layer(
skirt.emplace_back(i, print.skirt().entities[i]); skirt.emplace_back(i, print.skirt().entities[i]);
} }
} }
ExtrusionEntitiesPtr brim;
if (!m_brim_done) {
brim = print.brim().entities;
previous_position = get_last_position(brim);
}
bool is_anything_overridden = layer_tools.wiping_extrusions().is_anything_overridden();
std::vector<std::vector<SliceExtrusions>> overriden_extrusions;
if (is_anything_overridden) {
overriden_extrusions = get_overriden_extrusions(
print, layers, layer_tools, instances_to_print, this->m_seam_placer,
this->m_config.spiral_vase, extruder_id, previous_position
);
}
const std::vector<NormalExtrusions> normal_extrusions{get_normal_extrusions(
print, layers, layer_tools, instances_to_print, this->m_seam_placer,
this->m_config.spiral_vase, extruder_id, previous_position
)};
if (!skirt.empty()) { if (!skirt.empty()) {
if (!this->m_config.complete_objects.value) { if (!this->m_config.complete_objects.value) {
@ -3064,8 +3085,9 @@ LayerResult GCodeGenerator::process_layer(
m_avoid_crossing_perimeters.disable_once(); m_avoid_crossing_perimeters.disable_once();
} }
// Extrude brim with the extruder of the 1st region. // Extrude brim with the extruder of the 1st region.
if (! m_brim_done) { if (!brim.empty()) {
if (!this->m_config.complete_objects.value) { if (!this->m_config.complete_objects.value) {
gcode += this->m_label_objects.maybe_stop_instance(); gcode += this->m_label_objects.maybe_stop_instance();
@ -3074,8 +3096,9 @@ LayerResult GCodeGenerator::process_layer(
this->set_origin(0., 0.); this->set_origin(0., 0.);
m_avoid_crossing_perimeters.use_external_mp(); m_avoid_crossing_perimeters.use_external_mp();
for (const ExtrusionEntity *ee : print.brim().entities) for (const ExtrusionEntity *ee : brim) {
gcode += this->extrude_entity({ *ee, false }, smooth_path_caches.global(), "brim"sv, m_config.support_material_speed.value); gcode += this->extrude_entity({ *ee, false }, smooth_path_caches.global(), "brim"sv, m_config.support_material_speed.value);
}
m_brim_done = true; m_brim_done = true;
m_avoid_crossing_perimeters.use_external_mp(false); m_avoid_crossing_perimeters.use_external_mp(false);
// Allow a straight travel move to the first object point. // Allow a straight travel move to the first object point.
@ -3083,22 +3106,6 @@ LayerResult GCodeGenerator::process_layer(
} }
this->m_label_objects.update(first_instance); this->m_label_objects.update(first_instance);
std::optional<Point> previous_position{this->last_position};
bool is_anything_overridden = layer_tools.wiping_extrusions().is_anything_overridden();
std::vector<std::vector<SliceExtrusions>> overriden_extrusions;
if (is_anything_overridden) {
overriden_extrusions = get_overriden_extrusions(
print, layers, layer_tools, instances_to_print, this->m_seam_placer,
this->m_config.spiral_vase, extruder_id, previous_position
);
}
const std::vector<NormalExtrusions> normal_extrusions{get_normal_extrusions(
print, layers, layer_tools, instances_to_print, this->m_seam_placer,
this->m_config.spiral_vase, extruder_id, previous_position
)};
// We are almost ready to print. However, we must go through all the objects twice to print the the overridden extrusions first (infill/perimeter wiping feature): // We are almost ready to print. However, we must go through all the objects twice to print the the overridden extrusions first (infill/perimeter wiping feature):
if (!overriden_extrusions.empty()) { if (!overriden_extrusions.empty()) {
// Extrude wipes. // Extrude wipes.