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

fix overlapping perimeters

Browse Source
This commit is contained in:
supermerill 2020-05-10 15:30:13 +02:00
parent e10a8c5d1f
commit ed70dddaa2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libslic3r/PerimeterGenerator.cpp
View File

@ -369,11 +369,9 @@ void PerimeterGenerator::process()
// look for thin walls // look for thin walls
if (this->config->thin_walls) { if (this->config->thin_walls) {
// detect edge case where a curve can be split in multiple small chunks. // detect edge case where a curve can be split in multiple small chunks.
ExPolygons no_thin_onion = offset_ex(last, double( - ext_perimeter_width / 2));
std::vector<float> divs = {2.2,1.75,1.5}; //don't go too far, it's not possible to print thinw wall after that std::vector<float> divs = {2.2,1.75,1.5}; //don't go too far, it's not possible to print thinw wall after that
size_t idx_div = 0; size_t idx_div = 0;
while (no_thin_onion.size() > 0 && next_onion.size() > no_thin_onion.size() && next_onion.size() > 2 while (next_onion.size() > last.size() && idx_div < divs.size()) {
&& idx_div < divs.size() ) {
float div = divs[idx_div]; float div = divs[idx_div];
//use a sightly bigger spacing to try to drastically improve the split, that can lead to very thick gapfill //use a sightly bigger spacing to try to drastically improve the split, that can lead to very thick gapfill
ExPolygons next_onion_secondTry = offset2_ex( ExPolygons next_onion_secondTry = offset2_ex(
@ -438,9 +436,13 @@ void PerimeterGenerator::process()
// it's a bit like re-add thin area in to perimeter area. // it's a bit like re-add thin area in to perimeter area.
// it can over-extrude a bit, but it's for a better good. // it can over-extrude a bit, but it's for a better good.
{ {
next_onion = offset2_ex(diff_ex(last, thins, true), if(config->thin_perimeters)
-(float)((ext_perimeter_width / 2) + (ext_min_spacing / 4)), next_onion = union_ex(next_onion, offset_ex(diff_ex(last, thins, true),
(float)(ext_min_spacing / 4)); -(float)(ext_perimeter_width / 2)));
else
next_onion = union_ex(next_onion, offset2_ex(diff_ex(last, thins, true),
-(float)((ext_perimeter_width / 2) + (ext_min_spacing / 4)),
(float)(ext_min_spacing / 4)));
} }
} }
} else { } else {
@ -694,17 +696,20 @@ void PerimeterGenerator::process()
if (expoly_after_shrink_test.size() > 1) { if (expoly_after_shrink_test.size() > 1) {
//remove too small bits //remove too small bits
for (int i = 0; i < expoly_after_shrink_test.size(); i++) for (int i = 0; i < expoly_after_shrink_test.size(); i++)
if (offset_ex(ExPolygons{ expoly_after_shrink_test[i] }, min*0.5)[0].area() < minarea) { if (expoly_after_shrink_test[i].area() < (SCALED_EPSILON*SCALED_EPSILON * 4)
|| offset_ex(ExPolygons{ expoly_after_shrink_test[i] }, min*0.5)[0].area() < minarea) {
expoly_after_shrink_test.erase(expoly_after_shrink_test.begin() + i); expoly_after_shrink_test.erase(expoly_after_shrink_test.begin() + i);
i--; i--;
} }
//maybe some areas are a just bit too thin, try with just a little more offset to remove them. //maybe some areas are a just bit too thin, try with just a little more offset to remove them.
ExPolygons expoly_after_shrink_test2 = offset_ex(ExPolygons{ expoly }, double(-min *0.8)); ExPolygons expoly_after_shrink_test2 = offset_ex(ExPolygons{ expoly }, double(-min *0.8));
for (int i = 0; i < expoly_after_shrink_test2.size(); i++) for (int i = 0; i < expoly_after_shrink_test2.size(); i++) {
if (offset_ex(ExPolygons{ expoly_after_shrink_test2[i] }, min*0.5)[0].area() < minarea) { if (expoly_after_shrink_test2[i].area() < (SCALED_EPSILON*SCALED_EPSILON * 4)
|| offset_ex(ExPolygons{ expoly_after_shrink_test2[i] }, min*0.5)[0].area() < minarea) {
expoly_after_shrink_test2.erase(expoly_after_shrink_test2.begin() + i); expoly_after_shrink_test2.erase(expoly_after_shrink_test2.begin() + i);
i--; i--;
} }
}
//it's better if there are significantly less extrusions //it's better if there are significantly less extrusions
if (expoly_after_shrink_test.size()/1.42 > expoly_after_shrink_test2.size()) { if (expoly_after_shrink_test.size()/1.42 > expoly_after_shrink_test2.size()) {
expoly_after_shrink_test2 = offset_ex(expoly_after_shrink_test2, double(min * 0.8)); expoly_after_shrink_test2 = offset_ex(expoly_after_shrink_test2, double(min * 0.8));