3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issues in inner_offset() in the avoid crossing perimeters that caused in some cases travels to follow the first perimeter instead of the second one.

Browse Source
This commit is contained in:
Lukáš Hejl 2021-12-16 08:57:04 +01:00
parent 729ffc9dd6
commit 285e2a32a2
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/libslic3r/GCode/AvoidCrossingPerimeters.cpp
View File

@ -731,34 +731,50 @@ static bool need_wipe(const GCode &gcodegen,
} }
// Adds points around all vertices so that the offset affects only small sections around these vertices. // Adds points around all vertices so that the offset affects only small sections around these vertices.
static void resample_polygon(Polygon &polygon, double dist_from_vertex) static void resample_polygon(Polygon &polygon, double dist_from_vertex, double max_allowed_distance)
{ {
Points resampled_poly; Points resampled_poly;
resampled_poly.reserve(3 * polygon.size()); resampled_poly.reserve(3 * polygon.size());
resampled_poly.emplace_back(polygon.first_point()); for (size_t pt_idx = 0; pt_idx < polygon.size(); ++pt_idx) {
for (size_t pt_idx = 1; pt_idx < polygon.size(); ++pt_idx) {
const Point &p1 = polygon[pt_idx - 1];
const Point &p2 = polygon[pt_idx];
double line_length = (p2 - p1).cast<double>().norm();
Vector line_vec = ((p2 - p1).cast<double>().normalized() * dist_from_vertex).cast<coord_t>();
if (line_length > 2 * dist_from_vertex) {
resampled_poly.emplace_back(p1 + line_vec);
resampled_poly.emplace_back(p2 - line_vec);
}
resampled_poly.emplace_back(polygon[pt_idx]); resampled_poly.emplace_back(polygon[pt_idx]);
const Point &p1 = polygon[pt_idx];
const Point &p2 = polygon[next_idx_modulo(pt_idx, polygon.size())];
const Vec2d line_vec = (p2 - p1).cast<double>();
double line_length = line_vec.norm();
const Vector vertex_offset_vec = (line_vec.normalized() * dist_from_vertex).cast<coord_t>();
if (line_length > 2 * dist_from_vertex && vertex_offset_vec != Vector(0, 0)) {
resampled_poly.emplace_back(p1 + vertex_offset_vec);
const Vec2d new_vertex_vec = (p2 - p1 - 2 * vertex_offset_vec).cast<double>();
const double new_vertex_vec_length = new_vertex_vec.norm();
if (new_vertex_vec_length > max_allowed_distance) {
const Vec2d &prev_point = resampled_poly.back().cast<double>();
const size_t parts_count = size_t(ceil(new_vertex_vec_length / max_allowed_distance));
for (size_t part_idx = 1; part_idx < parts_count; ++part_idx) {
const double part_param = double(part_idx) / double(parts_count);
const Vec2d new_point = prev_point + new_vertex_vec * part_param;
resampled_poly.emplace_back(new_point.cast<coord_t>());
}
}
resampled_poly.emplace_back(p2 - vertex_offset_vec);
}
} }
polygon.points = std::move(resampled_poly); polygon.points = std::move(resampled_poly);
} }
static void resample_expolygon(ExPolygon &ex_polygon, double dist_from_vertex) static void resample_expolygon(ExPolygon &ex_polygon, double dist_from_vertex, double max_allowed_distance)
{ {
resample_polygon(ex_polygon.contour, dist_from_vertex); resample_polygon(ex_polygon.contour, dist_from_vertex, max_allowed_distance);
for (Polygon &polygon : ex_polygon.holes) resample_polygon(polygon, dist_from_vertex); for (Polygon &polygon : ex_polygon.holes)
resample_polygon(polygon, dist_from_vertex, max_allowed_distance);
} }
static void resample_expolygons(ExPolygons &ex_polygons, double dist_from_vertex) static void resample_expolygons(ExPolygons &ex_polygons, double dist_from_vertex, double max_allowed_distance)
{ {
for (ExPolygon &ex_poly : ex_polygons) resample_expolygon(ex_poly, dist_from_vertex); for (ExPolygon &ex_poly : ex_polygons)
resample_expolygon(ex_poly, dist_from_vertex, max_allowed_distance);
} }
static void precompute_polygon_distances(const Polygon &polygon, std::vector<float> &polygon_distances_out) static void precompute_polygon_distances(const Polygon &polygon, std::vector<float> &polygon_distances_out)
@ -834,7 +850,7 @@ static std::vector<float> contour_distance(const EdgeGrid::Grid &grid,
double param_end = boundary_parameters.back(); double param_end = boundary_parameters.back();
const size_t ipt = it_contour_and_segment->second; const size_t ipt = it_contour_and_segment->second;
if (contour.begin() + ipt + 1 < contour.end()) if (contour.begin() + ipt + 1 < contour.end())
param_hi += boundary_parameters[ipt > 0 ? ipt - 1 : 0]; param_hi += boundary_parameters[ipt];
if (param_lo > param_hi) if (param_lo > param_hi)
std::swap(param_lo, param_hi); std::swap(param_lo, param_hi);
assert(param_lo > -SCALED_EPSILON && param_lo <= param_end + SCALED_EPSILON); assert(param_lo > -SCALED_EPSILON && param_lo <= param_end + SCALED_EPSILON);
@ -932,7 +948,7 @@ static ExPolygons inner_offset(const ExPolygons &ex_polygons, double offset)
double min_contour_width = 2. * offset + SCALED_EPSILON; double min_contour_width = 2. * offset + SCALED_EPSILON;
double search_radius = 2. * (offset + min_contour_width); double search_radius = 2. * (offset + min_contour_width);
ExPolygons ex_poly_result = ex_polygons; ExPolygons ex_poly_result = ex_polygons;
resample_expolygons(ex_poly_result, offset / 2); resample_expolygons(ex_poly_result, offset / 2, scaled<double>(0.5));
for (ExPolygon &ex_poly : ex_poly_result) { for (ExPolygon &ex_poly : ex_poly_result) {
BoundingBox bbox(get_extents(ex_poly)); BoundingBox bbox(get_extents(ex_poly));