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

precision for round perimeter reduced to nozzle_diameter / 10

Browse Source
This commit is contained in:
remi durand 2021-06-01 18:14:12 +02:00
parent dc95440c3d
commit 653c8bdf95
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libslic3r/PerimeterGenerator.cpp
View File

@ -70,6 +70,8 @@ void PerimeterGenerator::process()
// infill gap to add vs perimeter (useful if using perimeter bonding) // infill gap to add vs perimeter (useful if using perimeter bonding)
coord_t infill_gap = 0; coord_t infill_gap = 0;
bool round_peri = this->config->perimeter_round_corners.value;
coord_t min_round_spacing = perimeter_width / 10;
// nozzle diameter // nozzle diameter
const double nozzle_diameter = this->print_config->nozzle_diameter.get_at(this->config->perimeter_extruder - 1); const double nozzle_diameter = this->print_config->nozzle_diameter.get_at(this->config->perimeter_extruder - 1);
@ -432,13 +434,15 @@ void PerimeterGenerator::process()
next_onion = offset_ex( next_onion = offset_ex(
last, last,
-(float)(ext_perimeter_width / 2), -(float)(ext_perimeter_width / 2),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter)); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3));
else else
next_onion = offset2_ex( next_onion = offset2_ex(
last, last,
-(float)(ext_perimeter_width / 2 + ext_min_spacing / 2 - 1), -(float)(ext_perimeter_width / 2 + ext_min_spacing / 2 - 1),
+(float)(ext_min_spacing / 2 - 1), +(float)(ext_min_spacing / 2 - 1),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter)); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3));
// look for thin walls // look for thin walls
if (this->config->thin_walls) { if (this->config->thin_walls) {
@ -513,12 +517,14 @@ void PerimeterGenerator::process()
if (thin_perimeter) if (thin_perimeter)
next_onion = union_ex(next_onion, offset_ex(diff_ex(last, thins, true), next_onion = union_ex(next_onion, offset_ex(diff_ex(last, thins, true),
-(float)(ext_perimeter_width / 2), -(float)(ext_perimeter_width / 2),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter))); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3)));
else else
next_onion = union_ex(next_onion, offset2_ex(diff_ex(last, thins, true), next_onion = union_ex(next_onion, offset2_ex(diff_ex(last, thins, true),
-(float)((ext_perimeter_width / 2) + (ext_min_spacing / 4)), -(float)((ext_perimeter_width / 2) + (ext_min_spacing / 4)),
(float)(ext_min_spacing / 4), (float)(ext_min_spacing / 4),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter))); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3)));
} }
} }
if (m_spiral_vase && next_onion.size() > 1) { if (m_spiral_vase && next_onion.size() > 1) {
@ -539,7 +545,8 @@ void PerimeterGenerator::process()
next_onion = offset2_ex(last, next_onion = offset2_ex(last,
-(float)(good_spacing + min_spacing / 2 - 1), -(float)(good_spacing + min_spacing / 2 - 1),
+(float)(min_spacing / 2 - 1), +(float)(min_spacing / 2 - 1),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter)); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3));
ExPolygons no_thin_onion = offset_ex(last, double(-good_spacing)); ExPolygons no_thin_onion = offset_ex(last, double(-good_spacing));
std::vector<float> divs { 1.8f, 1.6f }; //don't over-extrude, so don't use divider >2 std::vector<float> divs { 1.8f, 1.6f }; //don't over-extrude, so don't use divider >2
@ -561,7 +568,8 @@ void PerimeterGenerator::process()
// If "overlapping_perimeters" is enabled, this paths will be entered, which // If "overlapping_perimeters" is enabled, this paths will be entered, which
// leads to overflows, as in prusa3d/Slic3r GH #32 // leads to overflows, as in prusa3d/Slic3r GH #32
next_onion = offset_ex(last, double( - good_spacing), next_onion = offset_ex(last, double( - good_spacing),
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter)); (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3));
} }
// look for gaps // look for gaps
if (this->config->gap_fill if (this->config->gap_fill
@ -573,7 +581,8 @@ void PerimeterGenerator::process()
append(gaps, diff_ex( append(gaps, diff_ex(
offset(last, -0.5f * gap_fill_spacing), offset(last, -0.5f * gap_fill_spacing),
offset(next_onion, 0.5f * good_spacing + 10, offset(next_onion, 0.5f * good_spacing + 10,
(config->perimeter_round_corners.value ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter)))); // safety offset (round_peri ? ClipperLib::JoinType::jtRound : ClipperLib::JoinType::jtMiter),
(round_peri ? min_round_spacing : 3)))); // safety offset
} }
if (next_onion.empty()) { if (next_onion.empty()) {