GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 13:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix inside brim going inside raft

Browse Source 
also better sorting
supermerill/SuperSlicer#1526
This commit is contained in:
supermerill 2021-09-05 01:31:38 +02:00
parent ca995447fb
commit 53be240a75
3 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Polyline.hpp
View File

@ -25,6 +25,8 @@ public:
explicit Polyline(Points &&points) : MultiPoint(std::move(points)) {} explicit Polyline(Points &&points) : MultiPoint(std::move(points)) {}
Polyline& operator=(const Polyline &other) { points = other.points; return *this; } Polyline& operator=(const Polyline &other) { points = other.points; return *this; }
Polyline& operator=(Polyline&& other) { points = std::move(other.points); return *this; } Polyline& operator=(Polyline&& other) { points = std::move(other.points); return *this; }
bool operator==(const Polyline& other) const { return points == other.points; }
bool operator!=(const Polyline& other) const { return points != other.points; }
static Polyline new_scale(const std::vector<Vec2d> &points) { static Polyline new_scale(const std::vector<Vec2d> &points) {
Polyline pl; Polyline pl;
pl.points.reserve(points.size()); pl.points.reserve(points.size());

83
src/libslic3r/Print.cpp
View File

@ -2095,8 +2095,8 @@ void Print::_extrude_brim_from_tree(std::vector<std::vector< BrimLoop>>& loops,
for (size_t j = 0; j < loops[t].size(); ++j) { for (size_t j = 0; j < loops[t].size(); ++j) {
BrimLoop& candidate_parent = loops[t][j]; BrimLoop& candidate_parent = loops[t][j];
bool test = reversed bool test = reversed
? loop.polygon().contains(candidate_parent.line.first_point()) ? loop.polygon().contains(candidate_parent.lines.front().first_point())
: candidate_parent.polygon().contains(loop.line.first_point()); : candidate_parent.polygon().contains(loop.lines.front().first_point());
if (test) { if (test) {
candidate_parent.children.push_back(loop); candidate_parent.children.push_back(loop);
contours_d.erase(contours_d.begin() + i); contours_d.erase(contours_d.begin() + i);
@ -2112,28 +2112,35 @@ void Print::_extrude_brim_from_tree(std::vector<std::vector< BrimLoop>>& loops,
NEXT_CONTOUR:; NEXT_CONTOUR:;
} }
} }
for (int i = loops.size() - 1; i > 0; --i) {
if (loops[i].empty()) {
loops.erase(loops.begin() + i);
}
}
//def //def
//cut loops if they go inside a forbidden region //cut loops if they go inside a forbidden region
std::function<void(BrimLoop&)> cut_loop = [&frontiers](BrimLoop& to_cut) { std::function<void(BrimLoop&)> cut_loop = [&frontiers, reversed](BrimLoop& to_cut) {
Polylines result; Polylines result;
if (to_cut.is_loop) if (to_cut.is_loop) {
result = intersection_pl(Polygons{ to_cut.polygon() }, frontiers, true); result = intersection_pl(Polygons{ to_cut.polygon() }, frontiers, true);
else } else {
result = intersection_pl(Polylines{ to_cut.line }, frontiers, true); result = intersection_pl(to_cut.lines, frontiers, true);
if (result.empty()) }
to_cut.line.points.clear(); if (result.empty()) {
else { to_cut.lines.clear();
if (to_cut.line.points != result[0].points) { } else {
to_cut.line.points = result[0].points; if (to_cut.lines != result) {
to_cut.lines = result;
if (reversed) {
std::reverse(to_cut.lines.begin(), to_cut.lines.end());
}
to_cut.is_loop = false; to_cut.is_loop = false;
} }
for (int i = 1; i < result.size(); i++)
to_cut.children.insert(to_cut.children.begin() + i - 1, BrimLoop(std::move(result[i])));
} }
}; };
//calls //calls, deep-first
std::list< std::pair<BrimLoop*,int>> cut_child_first; std::list< std::pair<BrimLoop*,int>> cut_child_first;
for (std::vector<BrimLoop>& loops : loops) { for (std::vector<BrimLoop>& loops : loops) {
for (BrimLoop& loop : loops) { for (BrimLoop& loop : loops) {
@ -2164,24 +2171,27 @@ void Print::_extrude_brim_from_tree(std::vector<std::vector< BrimLoop>>& loops,
std::function<void(BrimLoop&, ExtrusionEntityCollection*)>* extrude_ptr; std::function<void(BrimLoop&, ExtrusionEntityCollection*)>* extrude_ptr;
std::function<void(BrimLoop&, ExtrusionEntityCollection*) > extrude = [&mm3_per_mm, &width, &height, &extrude_ptr, &nextIdx](BrimLoop& to_cut, ExtrusionEntityCollection* parent) { std::function<void(BrimLoop&, ExtrusionEntityCollection*) > extrude = [&mm3_per_mm, &width, &height, &extrude_ptr, &nextIdx](BrimLoop& to_cut, ExtrusionEntityCollection* parent) {
int idx = nextIdx++; int idx = nextIdx++;
bool i_have_line = !to_cut.line.points.empty() && to_cut.line.is_valid(); //bool i_have_line = !to_cut.line.points.empty() && to_cut.line.is_valid();
bool i_have_line = to_cut.lines.size() > 0 && to_cut.lines.front().size() > 0 && to_cut.lines.front().is_valid();
if (!i_have_line && to_cut.children.empty()) { if (!i_have_line && to_cut.children.empty()) {
//nothing //nothing
} else if (i_have_line && to_cut.children.empty()) { } else if (i_have_line && to_cut.children.empty()) {
if (to_cut.line.points.back() == to_cut.line.points.front()) { for(Polyline& line : to_cut.lines)
if (line.points.back() == line.points.front()) {
ExtrusionPath path(erSkirt, mm3_per_mm, width, height); ExtrusionPath path(erSkirt, mm3_per_mm, width, height);
path.polyline.points = to_cut.line.points; path.polyline.points = line.points;
parent->entities.emplace_back(new ExtrusionLoop(std::move(path), elrSkirt)); parent->entities.emplace_back(new ExtrusionLoop(std::move(path), elrSkirt));
} else { } else {
ExtrusionPath* extrusion_path = new ExtrusionPath(erSkirt, mm3_per_mm, width, height); ExtrusionPath* extrusion_path = new ExtrusionPath(erSkirt, mm3_per_mm, width, height);
parent->entities.push_back(extrusion_path); parent->entities.push_back(extrusion_path);
extrusion_path->polyline = to_cut.line; extrusion_path->polyline = line;
} }
} else if (!i_have_line && !to_cut.children.empty()) { } else if (!i_have_line && !to_cut.children.empty()) {
if (to_cut.children.size() == 1) { if (to_cut.children.size() == 1) {
(*extrude_ptr)(to_cut.children[0], parent); (*extrude_ptr)(to_cut.children[0], parent);
} else { } else {
ExtrusionEntityCollection* mycoll = new ExtrusionEntityCollection(); ExtrusionEntityCollection* mycoll = new ExtrusionEntityCollection();
//mycoll->no_sort = true;
parent->entities.push_back(mycoll); parent->entities.push_back(mycoll);
for (BrimLoop& child : to_cut.children) for (BrimLoop& child : to_cut.children)
(*extrude_ptr)(child, mycoll); (*extrude_ptr)(child, mycoll);
@ -2190,19 +2200,21 @@ void Print::_extrude_brim_from_tree(std::vector<std::vector< BrimLoop>>& loops,
ExtrusionEntityCollection* print_me_first = new ExtrusionEntityCollection(); ExtrusionEntityCollection* print_me_first = new ExtrusionEntityCollection();
parent->entities.push_back(print_me_first); parent->entities.push_back(print_me_first);
print_me_first->no_sort = true; print_me_first->no_sort = true;
if (to_cut.line.points.back() == to_cut.line.points.front()) { for (Polyline& line : to_cut.lines)
if (line.points.back() == line.points.front()) {
ExtrusionPath path(erSkirt, mm3_per_mm, width, height); ExtrusionPath path(erSkirt, mm3_per_mm, width, height);
path.polyline.points = to_cut.line.points; path.polyline.points = line.points;
print_me_first->entities.emplace_back(new ExtrusionLoop(std::move(path), elrSkirt)); print_me_first->entities.emplace_back(new ExtrusionLoop(std::move(path), elrSkirt));
} else { } else {
ExtrusionPath* extrusion_path = new ExtrusionPath(erSkirt, mm3_per_mm, width, height); ExtrusionPath* extrusion_path = new ExtrusionPath(erSkirt, mm3_per_mm, width, height);
print_me_first->entities.push_back(extrusion_path); print_me_first->entities.push_back(extrusion_path);
extrusion_path->polyline = to_cut.line; extrusion_path->polyline = line;
} }
if (to_cut.children.size() == 1) { if (to_cut.children.size() == 1) {
(*extrude_ptr)(to_cut.children[0], print_me_first); (*extrude_ptr)(to_cut.children[0], print_me_first);
} else { } else {
ExtrusionEntityCollection* children = new ExtrusionEntityCollection(); ExtrusionEntityCollection* children = new ExtrusionEntityCollection();
//children->no_sort = true;
print_me_first->entities.push_back(children); print_me_first->entities.push_back(children);
for (BrimLoop& child : to_cut.children) for (BrimLoop& child : to_cut.children)
(*extrude_ptr)(child, children); (*extrude_ptr)(child, children);
@ -2238,13 +2250,7 @@ void Print::_make_brim(const Flow &flow, const PrintObjectPtrs &objects, ExPolyg
if (!object->support_layers().empty()) { if (!object->support_layers().empty()) {
Polygons polys = object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON)); Polygons polys = object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON));
for (Polygon poly : polys) { for (Polygon poly : polys) {
for (ExPolygon& expoly2 : union_ex(Polygons{ poly })) { object_islands.emplace_back(brim_offset == 0 ? ExPolygon{ poly } : offset_ex(poly, brim_offset)[0]);
if (brim_config.brim_inside_holes || brim_config.brim_width_interior > 0) {
object_islands.emplace_back(brim_offset == 0 ? expoly2 : offset_ex(expoly2, brim_offset)[0]);
} else {
object_islands.emplace_back(brim_offset == 0 ? to_expolygon(expoly2.contour) : offset_ex(to_expolygon(expoly2.contour), brim_offset)[0]);
}
}
} }
} }
islands.reserve(islands.size() + object_islands.size() * object->m_instances.size()); islands.reserve(islands.size() + object_islands.size() * object->m_instances.size());
@ -2358,16 +2364,13 @@ void Print::_make_brim_ears(const Flow &flow, const PrintObjectPtrs &objects, Ex
if (!object->support_layers().empty()) { if (!object->support_layers().empty()) {
Polygons polys = object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON)); Polygons polys = object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON));
for (Polygon poly : polys) for (Polygon poly : polys) {
for (ExPolygon& expoly2 : union_ex(Polygons{ poly }))
//don't put ears over supports unless it's 100% fill //don't put ears over supports unless it's 100% fill
if (object->config().support_material_solid_first_layer) { if (object->config().support_material_solid_first_layer) {
if (brim_config.brim_inside_holes || brim_config.brim_width_interior > 0) object_islands.push_back(brim_offset == 0 ? ExPolygon{ poly } : offset_ex(poly, brim_offset)[0]);
object_islands.push_back(brim_offset == 0 ? expoly2 : offset_ex(expoly2, brim_offset)[0]);
else
object_islands.emplace_back(brim_offset == 0 ? to_expolygon(expoly2.contour) : offset_ex(to_expolygon(expoly2.contour), brim_offset)[0]);
} else { } else {
unbrimmable_with_support.push_back(expoly2); unbrimmable_with_support.push_back(ExPolygon{ poly });
}
} }
} }
islands.reserve(islands.size() + object_islands.size() * object->m_instances.size()); islands.reserve(islands.size() + object_islands.size() * object->m_instances.size());
@ -2514,15 +2517,17 @@ void Print::_make_brim_interior(const Flow &flow, const PrintObjectPtrs &objects
const PrintObjectConfig &brim_config = objects.front()->config(); const PrintObjectConfig &brim_config = objects.front()->config();
coord_t brim_offset = scale_(brim_config.brim_offset.value); coord_t brim_offset = scale_(brim_config.brim_offset.value);
ExPolygons islands; ExPolygons islands;
coordf_t spacing;
for (PrintObject *object : objects) { for (PrintObject *object : objects) {
ExPolygons object_islands; ExPolygons object_islands;
for (ExPolygon &expoly : object->m_layers.front()->lslices) for (ExPolygon &expoly : object->m_layers.front()->lslices)
object_islands.push_back(brim_offset == 0 ? expoly : offset_ex(expoly, brim_offset)[0]); object_islands.push_back(brim_offset == 0 ? expoly : offset_ex(expoly, brim_offset)[0]);
if (!object->support_layers().empty()) { if (!object->support_layers().empty()) {
Polygons polys = object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON)); spacing = scaled(object->config().support_material_interface_spacing.value) + support_material_flow(object, float(this->skirt_first_layer_height())).scaled_width() * 1.5;
for (Polygon poly : polys) Polygons polys = offset2(object->support_layers().front()->support_fills.polygons_covered_by_spacing(float(SCALED_EPSILON)), spacing, -spacing);
for (ExPolygon& expoly2 : union_ex(Polygons{ poly })) for (Polygon poly : polys) {
object_islands.push_back(brim_offset == 0 ? expoly2 : offset_ex(expoly2, brim_offset)[0]); object_islands.push_back(brim_offset == 0 ? ExPolygon{ poly } : offset_ex(poly, brim_offset)[0]);
}
} }
islands.reserve(islands.size() + object_islands.size() * object->instances().size()); islands.reserve(islands.size() + object_islands.size() * object->instances().size());
for (const PrintInstance &instance : object->instances()) for (const PrintInstance &instance : object->instances())

11
src/libslic3r/Print.hpp
View File

@ -369,13 +369,14 @@ struct PrintStatistics
class BrimLoop { class BrimLoop {
public: public:
BrimLoop(const Polygon& p) : line(p.split_at_first_point()), is_loop(true) {} BrimLoop(const Polygon& p) : lines(Polylines{ p.split_at_first_point() }), is_loop(true) {}
BrimLoop(const Polyline& l) : line(l), is_loop(false) {} BrimLoop(const Polyline& l) : lines(Polylines{l}), is_loop(false) {}
Polyline line; Polylines lines;
std::vector<BrimLoop> children; std::vector<BrimLoop> children;
bool is_loop; bool is_loop; // has only one polyline stored and front == back
Polygon polygon() const{ Polygon polygon() const{
Polygon poly = Polygon(line.points); assert(is_loop);
Polygon poly = Polygon(lines.front().points);
if (poly.points.front() == poly.points.back()) if (poly.points.front() == poly.points.back())
poly.points.resize(poly.points.size() - 1); poly.points.resize(poly.points.size() - 1);
return poly; return poly;