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

thin_wall bugfix & improvements

Browse Source
This commit is contained in:
supermerill 2018-12-10 17:41:58 +01:00
parent 301d52a072
commit 792627a95d
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
xs/src/libslic3r/MedialAxis.cpp
View File

@ -301,13 +301,14 @@ remove_point_too_near(ThickPolyline* to_reduce)
to_reduce->points.erase(to_reduce->points.begin() + id); to_reduce->points.erase(to_reduce->points.begin() + id);
to_reduce->width.erase(to_reduce->width.begin() + id); to_reduce->width.erase(to_reduce->width.begin() + id);
newdist = to_reduce->points[id].distance_to(to_reduce->points[id - 1]); newdist = to_reduce->points[id].distance_to(to_reduce->points[id - 1]);
//if you removed a point, it check if the next one isn't too near from the previous one.
// if not, it bypass it.
if (newdist > smallest) {
++id;
}
} }
//go to next one //go to next one
//if you removed a point, it check if the next one isn't too near from the previous one. else ++id;
// if not, it byepass it.
if (newdist > smallest) {
++id;
}
} }
} }
@ -620,20 +621,33 @@ MedialAxis::extends_line(ThickPolyline& polyline, const ExPolygons& anchors, con
line.a = *(polyline.points.begin() + first_idx); line.a = *(polyline.points.begin() + first_idx);
} }
// prevent the line from touching on the other side, otherwise intersection() might return that solution // prevent the line from touching on the other side, otherwise intersection() might return that solution
if (polyline.points.size() == 2) line.a = line.midpoint(); if (polyline.points.size() == 2 && this->expolygon.contains(line.midpoint())) line.a = line.midpoint();
line.extend_end(max_width); line.extend_end(max_width);
Point new_back; Point new_back;
if (this->expolygon.contour.has_boundary_point(polyline.points.back())) { if (this->expolygon.contour.has_boundary_point(polyline.points.back())) {
new_back = polyline.points.back(); new_back = polyline.points.back();
} else { } else {
//TODO: verify also for holes. bool finded = this->expolygon.contour.first_intersection(line, &new_back);
(void)this->expolygon.contour.first_intersection(line, &new_back); //verify also for holes.
Point new_back_temp;
for (Polygon hole : this->expolygon.holes) {
if (hole.first_intersection(line, &new_back_temp)) {
if (!finded || line.a.distance_to(new_back_temp) < line.a.distance_to(new_back)) {
finded = true;
new_back = new_back_temp;
}
}
}
// safety check if no intersection // safety check if no intersection
if (new_back.x == 0 && new_back.y == 0) { if (!finded) {
if (!this->expolygon.contains(line.b)) { if (!this->expolygon.contains(line.b)) {
//it's outside!!! //it's outside!!!
std::cout << "Error, a line is formed that start in a polygon, end outside of it can don't cross it!\n"; if (!this->expolygon.contains(line.a)) {
std::cout << "Error, a line is formed that start outside a polygon, end outside of it and don't cross it!\n";
} else {
std::cout << "Error, a line is formed that start in a polygon, end outside of it and don't cross it!\n";
}
} }
new_back = line.b; new_back = line.b;
} }
@ -641,10 +655,19 @@ MedialAxis::extends_line(ThickPolyline& polyline, const ExPolygons& anchors, con
polyline.width.push_back(polyline.width.back()); polyline.width.push_back(polyline.width.back());
} }
Point new_bound; Point new_bound;
//TODO: verify also for holes. bool finded = bounds.contour.first_intersection(line, &new_bound);
(void)bounds.contour.first_intersection(line, &new_bound); //verify also for holes.
Point new_bound_temp;
for (Polygon hole : bounds.holes) {
if (hole.first_intersection(line, &new_bound_temp)) {
if (!finded || line.a.distance_to(new_bound_temp) < line.a.distance_to(new_bound)) {
finded = true;
new_bound = new_bound_temp;
}
}
}
// safety check if no intersection // safety check if no intersection
if (new_bound.x == 0 && new_bound.y == 0) { if (!finded) {
if (line.b.coincides_with_epsilon(polyline.points.back())) { if (line.b.coincides_with_epsilon(polyline.points.back())) {
return; return;
} }

3
xs/src/libslic3r/PerimeterGenerator.cpp
View File

@ -282,6 +282,7 @@ void PerimeterGenerator::process()
no_thin_zone = diff_ex(last, offset_ex(half_thins, (float)(min_width / 2) - SCALED_EPSILON), true); no_thin_zone = diff_ex(last, offset_ex(half_thins, (float)(min_width / 2) - SCALED_EPSILON), true);
} }
// compute a bit of overlap to anchor thin walls inside the print. // compute a bit of overlap to anchor thin walls inside the print.
ExPolygons thin_zones_extruded;
for (ExPolygon &half_thin : half_thins) { for (ExPolygon &half_thin : half_thins) {
//growing back the polygon //growing back the polygon
ExPolygons thin = offset_ex(half_thin, (float)(min_width / 2)); ExPolygons thin = offset_ex(half_thin, (float)(min_width / 2));
@ -298,11 +299,13 @@ void PerimeterGenerator::process()
// the maximum thickness of our thin wall area is equal to the minimum thickness of a single loop // the maximum thickness of our thin wall area is equal to the minimum thickness of a single loop
thin[0].medial_axis(bound, ext_perimeter_width + ext_perimeter_spacing2, min_width, thin[0].medial_axis(bound, ext_perimeter_width + ext_perimeter_spacing2, min_width,
&thin_walls, this->layer_height); &thin_walls, this->layer_height);
thin_zones_extruded.emplace_back(thin[0]);
} }
break; break;
} }
} }
} }
next_onion = diff_ex(offset_ex(last, -(float)(ext_perimeter_width / 2)), thin_zones_extruded, true);
} }
} else { } else {
//FIXME Is this offset correct if the line width of the inner perimeters differs //FIXME Is this offset correct if the line width of the inner perimeters differs