GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 07:30:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scarft seam 0 length issue and external perimeters first issue

Browse Source
This commit is contained in:
Martin Šach 2024-09-20 15:25:58 +02:00 committed by Lukas Matena
parent 5033d18824
commit 601e59516b
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/libslic3r/GCode/SeamPlacer.cpp
View File

@ -289,6 +289,10 @@ boost::variant<Point, Scarf::Scarf> finalize_seam_position(
place_scarf_seam = false; place_scarf_seam = false;
} }
if (region->config().scarf_seam_length.value <= std::numeric_limits<double>::epsilon()) {
place_scarf_seam = false;
}
if (place_scarf_seam) { if (place_scarf_seam) {
Scarf::Scarf scarf{}; Scarf::Scarf scarf{};
scarf.entire_loop = region->config().scarf_seam_entire_loop; scarf.entire_loop = region->config().scarf_seam_entire_loop;
@ -317,20 +321,43 @@ boost::variant<Point, Scarf::Scarf> finalize_seam_position(
scarf.end_point_previous_index = loop_line_index; scarf.end_point_previous_index = loop_line_index;
return scarf; return scarf;
} else { } else {
Geometry::PointOnLine inner_scarf_end_point{
*outter_scarf_start_point
};
if (region->config().external_perimeters_first.value) {
const auto external_first_offset_direction{
offset_direction == Geometry::Direction1D::forward ?
Geometry::Direction1D::backward :
Geometry::Direction1D::forward
};
if (auto result{Geometry::offset_along_lines(
seam_choice.position,
seam_choice.previous_index,
perimeter_lines,
offset,
external_first_offset_direction
)}) {
inner_scarf_end_point = *result;
} else {
return scaled(seam_choice.position);
}
}
if (!region->config().scarf_seam_on_inner_perimeters) { if (!region->config().scarf_seam_on_inner_perimeters) {
return scaled(outter_scarf_start_point->point); return scaled(inner_scarf_end_point.point);
} }
const std::optional<Geometry::PointOnLine> inner_scarf_start_point{Geometry::offset_along_lines( const std::optional<Geometry::PointOnLine> inner_scarf_start_point{Geometry::offset_along_lines(
outter_scarf_start_point->point, inner_scarf_end_point.point,
outter_scarf_start_point->line_index, inner_scarf_end_point.line_index,
perimeter_lines, perimeter_lines,
offset, offset,
offset_direction offset_direction
)}; )};
if (!inner_scarf_start_point) { if (!inner_scarf_start_point) {
return scaled(outter_scarf_start_point->point); return scaled(inner_scarf_end_point.point);
} }
scarf.start_point = scaled(project_to_extrusion_loop( scarf.start_point = scaled(project_to_extrusion_loop(
@ -338,8 +365,14 @@ boost::variant<Point, Scarf::Scarf> finalize_seam_position(
perimeter, perimeter,
distancer distancer
).second); ).second);
scarf.end_point = scaled(outter_scarf_start_point->point);
scarf.end_point_previous_index = outter_scarf_start_point->line_index; const auto [end_point_previous_index, end_point]{project_to_extrusion_loop(
to_seam_choice(inner_scarf_end_point, perimeter),
perimeter,
distancer
)};
scarf.end_point = scaled(end_point);
scarf.end_point_previous_index = end_point_previous_index;
return scarf; return scarf;
} }
} }