3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: print ordering didn't consider object height

Browse source 
This may cause tall objects be printed before short ones. There are two
possible solutions:
1. do strict ordering only when y-overlap is large enough (the one
   chosen in this commit)
2. when considering vertical collision with rod, the actual expansion
   can be much smaller (because the rod is only slightly off extruder).
   But this solution requires an extra parameter. Let's hold it for a
   while.

Change-Id: Icc9a4796d49dad93cbcc20d4103e641a48886e5e
(cherry picked from commit 6a958b1fa9e58e4ca3be63b4918da77bcdc53314)
(cherry picked from commit ceff67789c27ea576afd663a2e5bae9a10241728)
This commit is contained in:
Arthur 2022-10-26 21:12:19 +08:00 • committed by Lane.Wei
parent db233c6051
commit c8c073a199
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libslic3r/Print.cpp
View file

@ -392,6 +392,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
Polygon hull_polygon; Polygon hull_polygon;
int index; int index;
double arrange_score; double arrange_score;
double height;
}; };
std::vector<struct print_instance_info> print_instance_with_bounding_box; std::vector<struct print_instance_info> print_instance_with_bounding_box;
{ {
@ -469,6 +470,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
} }
} }
struct print_instance_info print_info {&instance, convex_hull.bounding_box(), convex_hull}; struct print_instance_info print_info {&instance, convex_hull.bounding_box(), convex_hull};
print_info.height = instance.print_object->height();
print_instance_with_bounding_box.push_back(std::move(print_info)); print_instance_with_bounding_box.push_back(std::move(print_info));
convex_hulls_other.emplace_back(std::move(convex_hull)); convex_hulls_other.emplace_back(std::move(convex_hull));
} }
@ -484,6 +486,10 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
} }
// calc sort order // calc sort order
double hc1 = scale_(print.config().extruder_clearance_height_to_lid);
double hc2 = scale_(print.config().extruder_clearance_height_to_rod);
double printable_height = scale_(print.config().printable_height);
auto bed_points = get_bed_shape(print_config); auto bed_points = get_bed_shape(print_config);
float bed_width = bed_points[1].x() - bed_points[0].x(); float bed_width = bed_points[1].x() - bed_points[0].x();
// 如果扩大以后的多边形的距离小于这个值，就需要严格保证从左到右的打印顺序，否则会撞工具头右侧 // 如果扩大以后的多边形的距离小于这个值，就需要严格保证从左到右的打印顺序，否则会撞工具头右侧
@ -497,9 +503,9 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
} }
for (size_t i = 0; i < print_instance_with_bounding_box.size(); i++) { for (size_t i = 0; i < print_instance_with_bounding_box.size(); i++) {
auto &inst = print_instance_with_bounding_box[i]; auto &inst = print_instance_with_bounding_box[i];
auto &l = print_instance_with_bounding_box[i];
for (size_t j = 0; j < print_instance_with_bounding_box.size(); j++) { for (size_t j = 0; j < print_instance_with_bounding_box.size(); j++) {
if (j != i) { if (j != i) {
auto &l = print_instance_with_bounding_box[i];
auto &r = print_instance_with_bounding_box[j]; auto &r = print_instance_with_bounding_box[j];
auto ly1 = l.bounding_box.min.y(); auto ly1 = l.bounding_box.min.y();
auto ly2 = l.bounding_box.max.y(); auto ly2 = l.bounding_box.max.y();
@ -516,22 +522,30 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
inter_max = std::min(lx2, rx2); inter_max = std::min(lx2, rx2);
auto inter_x = inter_max - inter_min; auto inter_x = inter_max - inter_min;
// 如果y方向有重合，说明两个物体在一行，应该先打左边的物体，即先比较二者的x坐标。 // 如果y方向的重合超过轮廓的膨胀量，说明两个物体在一行，应该先打左边的物体，即先比较二者的x坐标。
if (inter_y > 0) { if (inter_y > scale_(0.5 * print.config().extruder_clearance_radius.value)) {
if (std::max(rx1 - lx2, lx1 - rx2) < unsafe_dist) { if (std::max(rx1 - lx2, lx1 - rx2) < unsafe_dist) {
std::string dir = "left"; std::string dir = "left";
if (lx1 > rx1) { if (lx1 > rx1) {
left_right_pair.emplace_back(j, i); left_right_pair.emplace_back(j, i);
print_instance_with_bounding_box[i].arrange_score = std::max(inst.arrange_score, r.arrange_score + bed_width); l.arrange_score = std::max(l.arrange_score, r.arrange_score + bed_width);
} else { } else {
left_right_pair.emplace_back(i, j); left_right_pair.emplace_back(i, j);
print_instance_with_bounding_box[j].arrange_score = std::max(r.arrange_score, l.arrange_score + bed_width); r.arrange_score = std::max(r.arrange_score, l.arrange_score + bed_width);
dir = "right"; dir = "right";
} }
BOOST_LOG_TRIVIAL(debug) << "print_instance " << inst.print_instance->model_instance->get_object()->name BOOST_LOG_TRIVIAL(debug) << "print_instance " << inst.print_instance->model_instance->get_object()->name
<< ", right=" << r.print_instance->model_instance->get_object()->name << ", l.score: " << l.arrange_score << ", right=" << r.print_instance->model_instance->get_object()->name << ", l.score: " << l.arrange_score
<< ", r.score: " << r.arrange_score << ", dist:" << std::max(rx1 - lx2, lx1 - rx2) << ", dir: " << dir; << ", r.score: " << r.arrange_score << ", dist:" << std::max(rx1 - lx2, lx1 - rx2) << ", dir: " << dir;
} }
}
if (l.height>hc2) {
// 如果当前物体的高度超过滑杆，且比r高，就给它加一点代价
if (l.height > r.height)
l.arrange_score = std::max(l.arrange_score, r.arrange_score + bed_width);
BOOST_LOG_TRIVIAL(debug) << "height print_instance " << inst.print_instance->model_instance->get_object()->name
<< ", right=" << r.print_instance->model_instance->get_object()->name << ", l.score: " << l.arrange_score
<< ", r.score: " << r.arrange_score;
} }
} }
} }
@ -549,6 +563,10 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
else else
return l.arrange_score < r.arrange_score;}); return l.arrange_score < r.arrange_score;});
for (auto &inst : print_instance_with_bounding_box)
BOOST_LOG_TRIVIAL(debug) << "after sorting print_instance " << inst.print_instance->model_instance->get_object()->name << ", score: " << inst.arrange_score
<< ", height:"<< inst.height;
// sequential_print_vertical_clearance_valid // sequential_print_vertical_clearance_valid
{ {
// Ignore the last instance printed. // Ignore the last instance printed.
@ -578,9 +596,6 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
break; break;
}*/ }*/
double hc1 = scale_(print.config().extruder_clearance_height_to_lid);
double hc2 = scale_(print.config().extruder_clearance_height_to_rod);
double printable_height = scale_(print.config().printable_height);
// if objects are not overlapped on y-axis, they will not collide even if they are taller than extruder_clearance_height_to_rod // if objects are not overlapped on y-axis, they will not collide even if they are taller than extruder_clearance_height_to_rod
int print_instance_count = print_instance_with_bounding_box.size(); int print_instance_count = print_instance_with_bounding_box.size();