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

Apply 'small perimeter' slowdown at the right time, after 0 was replaced.

Browse Source 
Also added some safeguards
supermerill/SuperSlicer#1948
This commit is contained in:
supermerill 2021-12-04 00:51:07 +01:00
parent 769b5de64d
commit 519e78abf3
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/libslic3r/GCode.cpp
View File

@ -2959,14 +2959,17 @@ std::string GCode::extrude_loop_vase(const ExtrusionLoop &original_loop, const s
if (paths.empty()) return ""; if (paths.empty()) return "";
// apply the small/external? perimeter speed // apply the small/external? perimeter speed
if (speed == -1 && is_perimeter(paths.front().role()) && loop.length() <= if (speed == -1 && is_perimeter(paths.front().role())){
scale_(this->m_config.small_perimeter_max_length.get_abs_value(EXTRUDER_CONFIG_WITH_DEFAULT(nozzle_diameter, 0)))) {
coordf_t min_length = scale_d(this->m_config.small_perimeter_min_length.get_abs_value(EXTRUDER_CONFIG_WITH_DEFAULT(nozzle_diameter, 0))); coordf_t min_length = scale_d(this->m_config.small_perimeter_min_length.get_abs_value(EXTRUDER_CONFIG_WITH_DEFAULT(nozzle_diameter, 0)));
coordf_t max_length = scale_d(this->m_config.small_perimeter_max_length.get_abs_value(EXTRUDER_CONFIG_WITH_DEFAULT(nozzle_diameter, 0))); coordf_t max_length = scale_d(this->m_config.small_perimeter_max_length.get_abs_value(EXTRUDER_CONFIG_WITH_DEFAULT(nozzle_diameter, 0)));
if (loop.length() <= min_length) { max_length = std::max(min_length, max_length);
speed = m_config.small_perimeter_speed.get_abs_value(m_config.perimeter_speed); if (loop.length() < max_length) {
} else { if (loop.length() <= min_length) {
speed = - (loop.length() - min_length) / (max_length - min_length); speed = m_config.small_perimeter_speed.get_abs_value(m_config.perimeter_speed);
} else if (max_length > min_length) {
//use a negative speed: it will be use as a ratio when computing the real speed
speed = -(loop.length() - min_length) / (max_length - min_length);
}
} }
} }
@ -3840,11 +3843,12 @@ std::string GCode::_extrude(const ExtrusionPath &path, const std::string &descri
double_t GCode::_compute_speed_mm_per_sec(const ExtrusionPath& path, double speed) { double_t GCode::_compute_speed_mm_per_sec(const ExtrusionPath& path, double speed) {
float factor = 1;
// set speed // set speed
if (speed < 0) { if (speed < 0) {
//if speed == -1, then it's means "choose yourself, but if it's -1 < speed <0 , then it's a scaling from small_periemter. //if speed == -1, then it's means "choose yourself, but if it's -1 < speed <0 , then it's a scaling from small_perimeter.
factor = float(-speed);
//it's a bit hacky, so if you want to rework it, help yourself. //it's a bit hacky, so if you want to rework it, help yourself.
float factor = float(-speed);
if (path.role() == erPerimeter) { if (path.role() == erPerimeter) {
speed = m_config.get_computed_value("perimeter_speed"); speed = m_config.get_computed_value("perimeter_speed");
} else if (path.role() == erExternalPerimeter) { } else if (path.role() == erExternalPerimeter) {
@ -3874,12 +3878,6 @@ double_t GCode::_compute_speed_mm_per_sec(const ExtrusionPath& path, double spee
} else { } else {
throw Slic3r::InvalidArgument("Invalid speed"); throw Slic3r::InvalidArgument("Invalid speed");
} }
//don't modify bridge speed
if (factor < 1 && !(is_bridge(path.role()))) {
float small_speed = (float)m_config.small_perimeter_speed.get_abs_value(m_config.perimeter_speed);
//apply factor between feature speed and small speed
speed = (speed * factor) + double((1.f - factor) * small_speed);
}
} }
if (m_volumetric_speed != 0. && speed == 0) { if (m_volumetric_speed != 0. && speed == 0) {
//if m_volumetric_speed, use the max size for thinwall & gapfill, to avoid variations //if m_volumetric_speed, use the max size for thinwall & gapfill, to avoid variations
@ -3904,6 +3902,14 @@ double_t GCode::_compute_speed_mm_per_sec(const ExtrusionPath& path, double spee
} }
if (speed == 0) // this code shouldn't trigger as if it's 0, you have to get a m_volumetric_speed if (speed == 0) // this code shouldn't trigger as if it's 0, you have to get a m_volumetric_speed
speed = m_config.max_print_speed.value; speed = m_config.max_print_speed.value;
// Apply small perimeter 'modifier
// don't modify bridge speed
if (factor < 1 && !(is_bridge(path.role()))) {
float small_speed = (float)m_config.small_perimeter_speed.get_abs_value(m_config.perimeter_speed);
//apply factor between feature speed and small speed
speed = (speed * factor) + double((1.f - factor) * small_speed);
}
// Apply first layer modifier
if (this->on_first_layer()) { if (this->on_first_layer()) {
const double base_speed = speed; const double base_speed = speed;
if (path.role() == erInternalInfill || path.role() == erSolidInfill) { if (path.role() == erInternalInfill || path.role() == erSolidInfill) {