3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: increase conflict threshold to 1mm for both support lines

Browse source 
Little overlap of support lines from two objects are allowed.

Change-Id: I738874ee71fc9787abbef764dbad762c76bc5731
(cherry picked from commit a5f7a53dc818d598523149d675fd0310f5d22f86)
This commit is contained in:
manch1n 2023-05-06 16:53:06 +08:00 • committed by Lane.Wei
parent 8c1dce19d3
commit 352f4222b1
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/GCode/ConflictChecker.cpp
View file

@ -263,14 +263,24 @@ ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectP
ConflictComputeOpt ConflictChecker::line_intersect(const LineWithID &l1, const LineWithID &l2)
{
constexpr double SUPPORT_THRESHOLD = 1.0;
constexpr double OTHER_THRESHOLD = 0.01;
if (l1._id == l2._id) { return {}; } // return true if lines are from same object
Point inter;
bool intersect = l1._line.intersection(l2._line, &inter);
if (intersect) {
auto dist1 = std::min(unscale(Point(l1._line.a - inter)).norm(), unscale(Point(l1._line.b - inter)).norm());
auto dist2 = std::min(unscale(Point(l2._line.a - inter)).norm(), unscale(Point(l2._line.b - inter)).norm());
auto dist = std::min(dist1, dist2);
if (dist > 0.01) { return std::make_optional<ConflictComputeResult>(l1._id, l2._id); } // the two lines intersects if dist>0.01mm
ExtrusionRole r1 = l1._role;
ExtrusionRole r2 = l2._role;
bool both_support = r1 == ExtrusionRole::erSupportMaterial || r1 == ExtrusionRole::erSupportMaterialInterface || r1 == ExtrusionRole::erSupportTransition;
both_support &= r2 == ExtrusionRole::erSupportMaterial || r2 == ExtrusionRole::erSupportMaterialInterface || r2 == ExtrusionRole::erSupportTransition;
if (dist > (both_support ? SUPPORT_THRESHOLD:OTHER_THRESHOLD)) {
// the two lines intersects if dist>0.01mm for regular lines, and if dist>1mm for both supports
return std::make_optional<ConflictComputeResult>(l1._id, l2._id);
}
}
return {};
}

4
src/libslic3r/GCode/ConflictChecker.hpp
View file

@ -16,9 +16,9 @@ struct LineWithID
{
Line _line;
int _id;
int _role;
ExtrusionRole _role;
LineWithID(const Line &line, int id, int role) : _line(line), _id(id), _role(role) {}
LineWithID(const Line &line, int id, ExtrusionRole role) : _line(line), _id(id), _role(role) {}
};
using LineWithIDs = std::vector<LineWithID>;