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

Adaptive Cubic infill with anchors: Trimming anchors with not only

Browse source 
with a neighbor T-joint line, but also with other crossing lines.
This commit is contained in:
Vojtech Bubnik 2020-11-06 08:56:53 +01:00
parent 239d588c5d
commit 139b58a6f2
1 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/libslic3r/Fill/FillAdaptive.cpp
View file

@ -564,8 +564,8 @@ struct Intersection
// Point for which is computed closest line (closest_line) // Point for which is computed closest line (closest_line)
Point intersect_point; Point intersect_point;
// Index of the polyline from which is computed closest_line // Index of the source infill from which is computed closest_line
size_t intersect_pl_idx; size_t intersect_line_idx;
// Pointer to the polyline from which is computed closest_line // Pointer to the polyline from which is computed closest_line
Polyline *intersect_pl; Polyline *intersect_pl;
// The line for which is computed closest line from intersect_point to closest_line // The line for which is computed closest line from intersect_point to closest_line
@ -654,12 +654,7 @@ static void add_hook(const Intersection &intersection, const double scaled_spaci
Vector hook_vector = (hook_length * hook_vector_norm).cast<coord_t>(); Vector hook_vector = (hook_length * hook_vector_norm).cast<coord_t>();
Line hook_forward(hook_start, hook_start + hook_vector); Line hook_forward(hook_start, hook_start + hook_vector);
auto filter_itself = [&intersection](const auto &item) { auto filter_itself = [&intersection](const auto &item) { return item.second != intersection.intersect_line_idx; };
const rtree_segment_t &seg = item.first;
const Point &i_point = intersection.intersect_point;
return !((float(i_point.x()) == bg::get<0, 0>(seg) && float(i_point.y()) == bg::get<0, 1>(seg)) ||
(float(i_point.x()) == bg::get<1, 0>(seg) && float(i_point.y()) == bg::get<1, 1>(seg)));
};
std::vector<std::pair<rtree_segment_t, size_t>> hook_intersections; std::vector<std::pair<rtree_segment_t, size_t>> hook_intersections;
rtree.query(bgi::intersects(mk_rtree_seg(hook_forward)) && bgi::satisfies(filter_itself), std::back_inserter(hook_intersections)); rtree.query(bgi::intersects(mk_rtree_seg(hook_forward)) && bgi::satisfies(filter_itself), std::back_inserter(hook_intersections));
@ -792,17 +787,18 @@ static Polylines connect_lines_using_hooks(Polylines &&lines, const ExPolygon &b
auto update_merged_polyline = [&lines, &merged_with](Intersection &intersection) { auto update_merged_polyline = [&lines, &merged_with](Intersection &intersection) {
// Update the polyline index to index which is merged // Update the polyline index to index which is merged
for (size_t last = intersection.intersect_pl_idx;;) { size_t intersect_pl_idx = intersection.intersect_pl - lines.data();
for (size_t last = intersect_pl_idx;;) {
size_t lower = merged_with[last]; size_t lower = merged_with[last];
if (lower == last) { if (lower == last) {
merged_with[intersection.intersect_pl_idx] = lower; merged_with[intersect_pl_idx] = lower;
intersection.intersect_pl_idx = lower; intersect_pl_idx = lower;
break; break;
} }
last = lower; last = lower;
} }
intersection.intersect_pl = &lines[intersection.intersect_pl_idx]; intersection.intersect_pl = &lines[intersect_pl_idx];
// After polylines are merged, it is necessary to update "forward" based on if intersect_point is the first or the last point of intersect_pl. // After polylines are merged, it is necessary to update "forward" based on if intersect_point is the first or the last point of intersect_pl.
if (intersection.fresh()) if (intersection.fresh())
intersection.front = intersection.intersect_pl->points.front() == intersection.intersect_point; intersection.front = intersection.intersect_pl->points.front() == intersection.intersect_point;
@ -854,41 +850,53 @@ static Polylines connect_lines_using_hooks(Polylines &&lines, const ExPolygon &b
Point first_i_point, nearest_i_point; Point first_i_point, nearest_i_point;
if (first_i.intersect_line.intersection(offset_line, &first_i_point) && if (first_i.intersect_line.intersection(offset_line, &first_i_point) &&
nearest_i.intersect_line.intersection(offset_line, &nearest_i_point)) { nearest_i.intersect_line.intersection(offset_line, &nearest_i_point)) {
bool connected = false;
if (nearest_i.fresh() && (nearest_i_point - first_i_point).cast<double>().squaredNorm() <= Slic3r::sqr(3. * hook_length)) { if (nearest_i.fresh() && (nearest_i_point - first_i_point).cast<double>().squaredNorm() <= Slic3r::sqr(3. * hook_length)) {
// Both intersections are so close that their polylines can be connected. // Both intersections are so close that their polylines can be connected.
if (first_i.intersect_pl_idx == nearest_i.intersect_pl_idx) { // Verify that no other infill line intersects this anchor line.
// Both intersections are on the same polyline, that means a loop is being closed. std::vector<std::pair<rtree_segment_t, size_t>> hook_intersections;
if (! first_i.front) rtree.query(
std::swap(first_i_point, nearest_i_point); bgi::intersects(mk_rtree_seg(first_i_point, nearest_i_point)) &&
first_i.intersect_pl->points.front() = first_i_point; bgi::satisfies([&first_i, &nearest_i](const auto &item) { return item.second != first_i.intersect_line_idx && item.second != nearest_i.intersect_line_idx; }),
first_i.intersect_pl->points.back() = nearest_i_point; std::back_inserter(hook_intersections));
//FIXME trim the end of a closed loop a bit? if (hook_intersections.empty()) {
first_i.intersect_pl->points.emplace(first_i.intersect_pl->points.begin(), nearest_i_point); // No other infill line intersects this anchor line. Extrude it as a whole.
} else { if (first_i.intersect_pl == nearest_i.intersect_pl) {
// Both intersections are on different polylines // Both intersections are on the same polyline, that means a loop is being closed.
Points &first_points = first_i.intersect_pl->points; if (! first_i.front)
Points &second_points = nearest_i.intersect_pl->points; std::swap(first_i_point, nearest_i_point);
first_points.reserve(first_points.size() + second_points.size()); first_i.intersect_pl->points.front() = first_i_point;
if (first_i.front) first_i.intersect_pl->points.back() = nearest_i_point;
std::reverse(first_points.begin(), first_points.end()); //FIXME trim the end of a closed loop a bit?
first_points.back() = first_i_point; first_i.intersect_pl->points.emplace(first_i.intersect_pl->points.begin(), nearest_i_point);
first_points.emplace_back(nearest_i_point);
if (nearest_i.front)
first_points.insert(first_points.end(), second_points.begin() + 1, second_points.end());
else
first_points.insert(first_points.end(), second_points.rbegin() + 1, second_points.rend());
// Keep the polyline at the lower index slot.
if (first_i.intersect_pl_idx < nearest_i.intersect_pl_idx) {
second_points.clear();
merged_with[nearest_i.intersect_pl_idx] = merged_with[first_i.intersect_pl_idx];
} else { } else {
second_points = std::move(first_points); // Both intersections are on different polylines
first_points.clear(); Points &first_points = first_i.intersect_pl->points;
merged_with[first_i.intersect_pl_idx] = merged_with[nearest_i.intersect_pl_idx]; Points &second_points = nearest_i.intersect_pl->points;
first_points.reserve(first_points.size() + second_points.size());
if (first_i.front)
std::reverse(first_points.begin(), first_points.end());
first_points.back() = first_i_point;
first_points.emplace_back(nearest_i_point);
if (nearest_i.front)
first_points.insert(first_points.end(), second_points.begin() + 1, second_points.end());
else
first_points.insert(first_points.end(), second_points.rbegin() + 1, second_points.rend());
// Keep the polyline at the lower index slot.
if (first_i.intersect_pl < nearest_i.intersect_pl) {
second_points.clear();
merged_with[nearest_i.intersect_pl - lines.data()] = merged_with[first_i.intersect_pl - lines.data()];
} else {
second_points = std::move(first_points);
first_points.clear();
merged_with[first_i.intersect_pl - lines.data()] = merged_with[nearest_i.intersect_pl - lines.data()];
}
} }
nearest_i.used = true;
connected = true;
} }
nearest_i.used = true; }
} else if (! connected)
// Try to connect left or right. If not enough space for hook_length, take the longer side. // Try to connect left or right. If not enough space for hook_length, take the longer side.
add_hook(first_i, scale_(spacing), hook_length, rtree); add_hook(first_i, scale_(spacing), hook_length, rtree);
first_i.used = true; first_i.used = true;