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

Evaluate maybe change instance lazily

Browse Source
This commit is contained in:
Martin Šach 2024-03-06 18:03:29 +01:00 committed by Lukas Matena
parent f850433e2b
commit 0894ac6d72
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libslic3r/GCode.cpp
View File

@ -1250,7 +1250,7 @@ void GCodeGenerator::_do_export(Print& print, GCodeOutputStream &file, Thumbnail
file.write(m_label_objects.maybe_stop_instance()); file.write(m_label_objects.maybe_stop_instance());
const double last_z{this->writer().get_position().z()}; const double last_z{this->writer().get_position().z()};
file.write(this->writer().get_travel_to_z_gcode(last_z, "ensure z position")); file.write(this->writer().get_travel_to_z_gcode(last_z, "ensure z position"));
file.write(this->travel_to(*this->last_position, Point(0, 0), ExtrusionRole::None, "move to origin position for next object", "")); file.write(this->travel_to(*this->last_position, Point(0, 0), ExtrusionRole::None, "move to origin position for next object", [](){return "";}));
m_enable_cooling_markers = true; m_enable_cooling_markers = true;
// Disable motion planner when traveling to first object point. // Disable motion planner when traveling to first object point.
m_avoid_crossing_perimeters.disable_once(); m_avoid_crossing_perimeters.disable_once();
@ -3090,7 +3090,7 @@ void GCodeGenerator::GCodeOutputStream::write_format(const char* format, ...)
va_end(args); va_end(args);
} }
std::string GCodeGenerator::travel_to_first_position(const Vec3crd& point, const double from_z, const std::string& gcode_to_insert) { std::string GCodeGenerator::travel_to_first_position(const Vec3crd& point, const double from_z, const std::function<std::string()>& insert_gcode) {
std::string gcode; std::string gcode;
const Vec3d gcode_point = to_3d(this->point_to_gcode(point.head<2>()), unscaled(point.z())); const Vec3d gcode_point = to_3d(this->point_to_gcode(point.head<2>()), unscaled(point.z()));
@ -3114,7 +3114,7 @@ std::string GCodeGenerator::travel_to_first_position(const Vec3crd& point, const
this->last_position = point.head<2>(); this->last_position = point.head<2>();
this->writer().update_position(gcode_point); this->writer().update_position(gcode_point);
gcode += gcode_to_insert; gcode += insert_gcode();
std::string comment{"move to first layer point"}; std::string comment{"move to first layer point"};
gcode += this->writer().get_travel_to_xy_gcode(gcode_point.head<2>(), comment); gcode += this->writer().get_travel_to_xy_gcode(gcode_point.head<2>(), comment);
@ -3152,22 +3152,18 @@ std::string GCodeGenerator::_extrude(
gcode += m_label_objects.maybe_change_instance(); gcode += m_label_objects.maybe_change_instance();
} }
std::string instance_change_gcode{this->m_label_objects.maybe_change_instance()};
const std::string delayed_instance_change_gcode{instance_change_gcode};
if (m_writer.multiple_extruders) {
instance_change_gcode = "";
}
if (!m_current_layer_first_position) { if (!m_current_layer_first_position) {
const Vec3crd point = to_3d(path.front().point, scaled(this->m_last_layer_z)); const Vec3crd point = to_3d(path.front().point, scaled(this->m_last_layer_z));
gcode += this->travel_to_first_position(point, unscaled(point.z()), instance_change_gcode); gcode += this->travel_to_first_position(point, unscaled(point.z()), [&](){
return m_writer.multiple_extruders ? "" : m_label_objects.maybe_change_instance();
});
} else { } else {
// go to first point of extrusion path // go to first point of extrusion path
if (!this->last_position) { if (!this->last_position) {
const double z = this->m_last_layer_z; const double z = this->m_last_layer_z;
const std::string comment{"move to print after unknown position"}; const std::string comment{"move to print after unknown position"};
gcode += this->retract_and_wipe(); gcode += this->retract_and_wipe();
gcode += instance_change_gcode; gcode += m_writer.multiple_extruders ? "" : m_label_objects.maybe_change_instance();
gcode += this->m_writer.travel_to_xy(this->point_to_gcode(path.front().point), comment); gcode += this->m_writer.travel_to_xy(this->point_to_gcode(path.front().point), comment);
gcode += this->m_writer.get_travel_to_z_gcode(z, comment); gcode += this->m_writer.get_travel_to_z_gcode(z, comment);
} else if ( this->last_position != path.front().point) { } else if ( this->last_position != path.front().point) {
@ -3175,7 +3171,9 @@ std::string GCodeGenerator::_extrude(
comment += description; comment += description;
comment += description_bridge; comment += description_bridge;
comment += " point"; comment += " point";
const std::string travel_gcode{this->travel_to(*this->last_position, path.front().point, path_attr.role, comment, instance_change_gcode)}; const std::string travel_gcode{this->travel_to(*this->last_position, path.front().point, path_attr.role, comment, [&](){
return m_writer.multiple_extruders ? "" : m_label_objects.maybe_change_instance();
})};
gcode += travel_gcode; gcode += travel_gcode;
} }
} }
@ -3189,7 +3187,7 @@ std::string GCodeGenerator::_extrude(
} }
if (m_writer.multiple_extruders && !has_active_instance) { if (m_writer.multiple_extruders && !has_active_instance) {
gcode += delayed_instance_change_gcode; gcode += m_label_objects.maybe_change_instance();
} }
if (!m_pending_pre_extrusion_gcode.empty()) { if (!m_pending_pre_extrusion_gcode.empty()) {
@ -3406,7 +3404,7 @@ std::string GCodeGenerator::_extrude(
std::string GCodeGenerator::generate_travel_gcode( std::string GCodeGenerator::generate_travel_gcode(
const Points3& travel, const Points3& travel,
const std::string& comment, const std::string& comment,
const std::string& insert_before_end const std::function<std::string()>& insert_gcode
) { ) {
std::string gcode; std::string gcode;
@ -3427,7 +3425,7 @@ std::string GCodeGenerator::generate_travel_gcode(
const Vec3d gcode_point{this->point_to_gcode(point)}; const Vec3d gcode_point{this->point_to_gcode(point)};
if (travel.size() - i <= 2 && !already_inserted) { if (travel.size() - i <= 2 && !already_inserted) {
gcode += insert_before_end; gcode += insert_gcode();
already_inserted = true; already_inserted = true;
} }
@ -3530,7 +3528,7 @@ std::string GCodeGenerator::travel_to(
const Point &end_point, const Point &end_point,
ExtrusionRole role, ExtrusionRole role,
const std::string &comment, const std::string &comment,
const std::string &gcode_to_insert const std::function<std::string()>& insert_gcode
) { ) {
// check whether a straight travel move would need retraction // check whether a straight travel move would need retraction
@ -3588,7 +3586,7 @@ std::string GCodeGenerator::travel_to(
) )
); );
return wipe_retract_gcode + generate_travel_gcode(travel, comment, gcode_to_insert); return wipe_retract_gcode + generate_travel_gcode(travel, comment, insert_gcode);
} }
std::string GCodeGenerator::retract_and_wipe(bool toolchange) std::string GCodeGenerator::retract_and_wipe(bool toolchange)

6
src/libslic3r/GCode.hpp
View File

@ -320,7 +320,7 @@ private:
std::string generate_travel_gcode( std::string generate_travel_gcode(
const Points3& travel, const Points3& travel,
const std::string& comment, const std::string& comment,
const std::string& insert_before_end const std::function<std::string()>& insert_gcode
); );
Polyline generate_travel_xy_path( Polyline generate_travel_xy_path(
const Point& start, const Point& start,
@ -333,10 +333,10 @@ private:
const Point &end_point, const Point &end_point,
ExtrusionRole role, ExtrusionRole role,
const std::string &comment, const std::string &comment,
const std::string &gcode_to_insert const std::function<std::string()>& insert_gcode
); );
std::string travel_to_first_position(const Vec3crd& point, const double from_z, const std::string& gcode_to_insert); std::string travel_to_first_position(const Vec3crd& point, const double from_z, const std::function<std::string()>& insert_gcode);
bool needs_retraction(const Polyline &travel, ExtrusionRole role = ExtrusionRole::None); bool needs_retraction(const Polyline &travel, ExtrusionRole role = ExtrusionRole::None);

6
src/libslic3r/GCode/WipeTowerIntegration.cpp
View File

@ -65,7 +65,7 @@ std::string WipeTowerIntegration::append_tcr(GCodeGenerator &gcodegen, const Wip
if (gcodegen.m_current_layer_first_position) { if (gcodegen.m_current_layer_first_position) {
if (gcodegen.last_position) { if (gcodegen.last_position) {
gcode += gcodegen.travel_to( gcode += gcodegen.travel_to(
*gcodegen.last_position, xy_point, ExtrusionRole::Mixed, comment, "" *gcodegen.last_position, xy_point, ExtrusionRole::Mixed, comment, [](){return "";}
); );
} else { } else {
gcode += gcodegen.writer().travel_to_xy(gcodegen.point_to_gcode(xy_point), comment); gcode += gcodegen.writer().travel_to_xy(gcodegen.point_to_gcode(xy_point), comment);
@ -73,7 +73,7 @@ std::string WipeTowerIntegration::append_tcr(GCodeGenerator &gcodegen, const Wip
} }
} else { } else {
const Vec3crd point = to_3d(xy_point, scaled(z)); const Vec3crd point = to_3d(xy_point, scaled(z));
gcode += gcodegen.travel_to_first_position(point, current_z, ""); gcode += gcodegen.travel_to_first_position(point, current_z, [](){return "";});
} }
gcode += gcodegen.unretract(); gcode += gcodegen.unretract();
} else { } else {
@ -269,7 +269,7 @@ std::string WipeTowerIntegration::finalize(GCodeGenerator &gcodegen)
if (std::abs(gcodegen.writer().get_position().z() - m_final_purge.print_z) > EPSILON) if (std::abs(gcodegen.writer().get_position().z() - m_final_purge.print_z) > EPSILON)
gcode += gcodegen.generate_travel_gcode( gcode += gcodegen.generate_travel_gcode(
{{gcodegen.last_position->x(), gcodegen.last_position->y(), scaled(m_final_purge.print_z)}}, {{gcodegen.last_position->x(), gcodegen.last_position->y(), scaled(m_final_purge.print_z)}},
"move to safe place for purging", "" "move to safe place for purging", [](){return "";}
); );
gcode += append_tcr(gcodegen, m_final_purge, -1); gcode += append_tcr(gcodegen, m_final_purge, -1);
return gcode; return gcode;