Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CURA-10410]-ii Infill crossing redux. #1944

Merged
merged 2 commits into from
Sep 4, 2023
Merged

[CURA-10410]-ii Infill crossing redux. #1944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18abd19
Don't resolve crossing after all in certain cases.
rburema Sep 1, 2023
a77182e
Large wasn't large enough.
rburema Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions src/infill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,30 +793,44 @@ void Infill::resolveIntersection(const coord_t at_distance, const Point& interse
auto& end_a = forward_line_a ? a->altered_end : a->altered_start;
auto& end_b = forward_line_b ? b->altered_start : b->altered_end;

// Set values ('pre existing' values are needed when feeging these as reference parameters to functions that need a value).
// Set values ('pre existing' values are needed when feeding these as reference parameters to functions that need a value).
assert(! bend_a.has_value());
assert(! bend_b.has_value());
bend_a.emplace(0, 0);
bend_b.emplace(0, 0);

// Find a bisector of the intersection; specifically, the one that crosses the connection & offset it by 1/2 distance to each side.
constexpr auto large_enough_vec_len = 0xFFFF;
constexpr auto large_enough_vec_len = 0xFFFFFFFF;
const auto bisect = LinearAlg2D::getBisectorVector(intersect, connect_start, connect_end, large_enough_vec_len);
const auto offset = ((at_distance / 2) * Point(-bisect.Y, bisect.X)) / large_enough_vec_len;
const auto q = intersect + offset;
const auto r = q + bisect;
const auto s = intersect - offset;
const auto t = s + bisect;

// In certain rare conditions, the lines do not actually intersect in a way that we can solve with the current algorithm.
bool is_resolved = true;

// Use both of the resulting lines to place the 'bends' by intersecting with the original line-segments.
LinearAlg2D::lineLineIntersection(q, r, a->start, a->end, bend_a.value());
LinearAlg2D::lineLineIntersection(s, t, b->start, b->end, bend_b.value());
is_resolved &= LinearAlg2D::lineLineIntersection(q, r, a->start, a->end, bend_a.value());
is_resolved &= LinearAlg2D::lineLineIntersection(s, t, b->start, b->end, bend_b.value());

// Also set the new end-points.
LinearAlg2D::lineLineIntersection(connect_start, connect_end, q, r, end_a);
LinearAlg2D::lineLineIntersection(connect_start, connect_end, s, t, end_b);
is_resolved &= LinearAlg2D::lineLineIntersection(connect_start, connect_end, q, r, end_a);
is_resolved &= LinearAlg2D::lineLineIntersection(connect_start, connect_end, s, t, end_b);

// The connecting line will be made from the end-points.
connect_start = end_a;
connect_end = end_b;
if (is_resolved)
{
// The connecting line will be made from the end-points.
connect_start = end_a;
connect_end = end_b;
}
else
{
// Put everything that has now potentially become messed up, back.
bend_a.reset();
bend_b.reset();
}
}

void Infill::connectLines(Polygons& result_lines)
Expand Down
Loading