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

Avoid crossing perimeters bugfix

Browse source
This commit is contained in:
Lukáš Hejl 2020-10-08 03:54:03 +02:00
parent a4fc435f75
commit 39e3358af5
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libslic3r/GCode.cpp
View file

@ -263,6 +263,12 @@ namespace Slic3r {
visitor.pt_current = &current_point; visitor.pt_current = &current_point;
for (size_t point_idx_2 = point_idx + 1; point_idx_2 < travel.size(); point_idx_2++) { for (size_t point_idx_2 = point_idx + 1; point_idx_2 < travel.size(); point_idx_2++) {
if (travel.points[point_idx_2] == current_point) {
next = travel.points[point_idx_2];
point_idx = point_idx_2;
continue;
}
visitor.pt_next = &travel.points[point_idx_2]; visitor.pt_next = &travel.points[point_idx_2];
m_grid.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor); m_grid.visit_cells_intersecting_line(*visitor.pt_current, *visitor.pt_next, visitor);
// Check if deleting point causes crossing a boundary // Check if deleting point causes crossing a boundary
@ -282,6 +288,9 @@ namespace Slic3r {
{ {
m_boundaries.clear(); m_boundaries.clear();
BoundingBox bbox = get_extents(layer.lslices); BoundingBox bbox = get_extents(layer.lslices);
// The path could start in the previous layer. Because of it, we need to extend bounding box by the previous layer
if (layer.lower_layer != nullptr) bbox.merge(get_extents(layer.lower_layer->lslices));
bbox.offset(SCALED_EPSILON); bbox.offset(SCALED_EPSILON);
ExPolygons boundaries = get_boundary(layer); ExPolygons boundaries = get_boundary(layer);
@ -292,7 +301,7 @@ namespace Slic3r {
} }
m_grid.set_bbox(bbox); m_grid.set_bbox(bbox);
m_grid.create(m_boundaries, scale_(10.)); m_grid.create(m_boundaries, scale_(1.));
} }
ExPolygons AvoidCrossingPerimeters2::get_boundary(const Layer &layer) ExPolygons AvoidCrossingPerimeters2::get_boundary(const Layer &layer)
@ -317,12 +326,12 @@ namespace Slic3r {
ExPolygons perimeter_boundary = offset_ex(boundary, -offset); ExPolygons perimeter_boundary = offset_ex(boundary, -offset);
ExPolygons final_boundary; ExPolygons final_boundary;
if (perimeter_boundary.size() != boundary.size()) { if (perimeter_boundary.size() != boundary.size()) {
// If any part of the polygon is missing after shrinking, the boundary os slice is used instead. // If any part of the polygon is missing after shrinking, the boundary of slice is used instead.
ExPolygons missing_perimeter_boundary = offset_ex(diff_ex(boundary, offset_ex(perimeter_boundary, offset + SCALED_EPSILON)), ExPolygons missing_perimeter_boundary = offset_ex(diff_ex(boundary, offset_ex(perimeter_boundary, offset + SCALED_EPSILON / 2)),
offset + SCALED_EPSILON); offset + SCALED_EPSILON);
perimeter_boundary = offset_ex(perimeter_boundary, offset + SCALED_EPSILON); perimeter_boundary = offset_ex(perimeter_boundary, offset);
perimeter_boundary.insert(perimeter_boundary.begin(), missing_perimeter_boundary.begin(), missing_perimeter_boundary.end()); perimeter_boundary.insert(perimeter_boundary.begin(), missing_perimeter_boundary.begin(), missing_perimeter_boundary.end());
final_boundary = union_ex(perimeter_boundary); final_boundary = offset_ex(union_ex(perimeter_boundary), -offset);
} else { } else {
final_boundary = std::move(perimeter_boundary); final_boundary = std::move(perimeter_boundary);
} }