GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-02 05:40:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call needs_retraction at the right time

Browse Source 
supermerill/SuperSlicer#1967
This commit is contained in:
supermerill 2021-12-01 19:52:36 +01:00
parent d49193dcca
commit 0c49de940e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/GCode.cpp
View File

@ -4149,9 +4149,8 @@ Polyline GCode::travel_to(std::string &gcode, const Point &point, ExtrusionRole
this->origin in order to get G-code coordinates. */ this->origin in order to get G-code coordinates. */
Polyline travel { this->last_pos(), point }; Polyline travel { this->last_pos(), point };
// check whether a straight travel move would need retraction // check / compute avoid_crossing_perimeters
bool will_cross_perimeter = this->can_cross_perimeter(travel); bool will_cross_perimeter = this->can_cross_perimeter(travel);
bool needs_retraction = will_cross_perimeter && this->needs_retraction(travel, role);
// check whether wipe could be disabled without causing visible stringing // check whether wipe could be disabled without causing visible stringing
bool could_be_wipe_disabled = false; bool could_be_wipe_disabled = false;
@ -4163,11 +4162,11 @@ Polyline GCode::travel_to(std::string &gcode, const Point &point, ExtrusionRole
&& m_avoid_crossing_perimeters.is_init() && m_avoid_crossing_perimeters.is_init()
&& !(m_config.avoid_crossing_not_first_layer && this->on_first_layer())) { && !(m_config.avoid_crossing_not_first_layer && this->on_first_layer())) {
travel = m_avoid_crossing_perimeters.travel_to(*this, point, &could_be_wipe_disabled); travel = m_avoid_crossing_perimeters.travel_to(*this, point, &could_be_wipe_disabled);
// check again whether the new travel path still needs a retraction
needs_retraction = this->needs_retraction(travel, role);
//if (needs_retraction && m_layer_index > 1) exit(0);
} }
// check whether a straight travel move would need retraction
bool needs_retraction = this->needs_retraction(travel, role);
// Re-allow avoid_crossing_perimeters for the next travel moves // Re-allow avoid_crossing_perimeters for the next travel moves
m_avoid_crossing_perimeters.reset_once_modifiers(); m_avoid_crossing_perimeters.reset_once_modifiers();