mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: the slicing result is incorrect in multi-color case 

jira: udesk: https://bblcs.s5.udesk.cn/entry/ticket/show/7173936
Change-Id: I183a45448b6cc5cff094c2d0567797e7220485f5
This commit is contained in:
zhimin.zeng 2024-09-19 14:06:06 +08:00 committed by Lane.Wei
parent a1f70ff27e
commit 63d59f0104
2 changed files with 189 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
src/libslic3r/EdgeGrid.hpp
View File

@ -169,7 +169,126 @@ public:
std::vector<std::pair<ContourEdge, ContourEdge>> intersecting_edges() const; std::vector<std::pair<ContourEdge, ContourEdge>> intersecting_edges() const;
bool has_intersecting_edges() const; bool has_intersecting_edges() const;
template<typename VISITOR> void visit_cells_intersecting_line(Slic3r::Point p1, Slic3r::Point p2, VISITOR &visitor) const template<typename VISITOR>
void visit_intersect_line_impl(coord_t ix, coord_t iy, Point p1, coord_t ixb, coord_t iyb, Point p2, VISITOR &visitor) const
{
// Account for the end points.
if (!visitor(iy, ix) || (ix == ixb && iy == iyb))
// Both ends fall into the same cell.
return;
// Raster the centeral part of the line.
coord_t dx = std::abs(p2(0) - p1(0));
coord_t dy = std::abs(p2(1) - p1(1));
if (p1(0) < p2(0)) {
int64_t ex = int64_t((ix + 1) * m_resolution - p1(0)) * int64_t(dy);
if (p1(1) < p2(1)) {
// x positive, y positive
int64_t ey = int64_t((iy + 1) * m_resolution - p1(1)) * int64_t(dx);
do {
assert(ix <= ixb && iy <= iyb);
if (ex < ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix += 1;
assert(ix <= ixb);
} else if (ex == ey) {
ex = int64_t(dy) * m_resolution;
ey = int64_t(dx) * m_resolution;
ix += 1;
iy += 1;
assert(ix <= ixb);
assert(iy <= iyb);
} else {
assert(ex > ey);
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy += 1;
assert(iy <= iyb);
}
if (!visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
} else {
// x positive, y non positive
int64_t ey = int64_t(p1(1) - iy * m_resolution) * int64_t(dx);
do {
assert(ix <= ixb && iy >= iyb);
if (ex <= ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix += 1;
assert(ix <= ixb);
} else {
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy -= 1;
assert(iy >= iyb);
}
if (!visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
}
} else {
int64_t ex = int64_t(p1(0) - ix * m_resolution) * int64_t(dy);
if (p1(1) < p2(1)) {
// x non positive, y positive
int64_t ey = int64_t((iy + 1) * m_resolution - p1(1)) * int64_t(dx);
do {
assert(ix >= ixb && iy <= iyb);
if (ex < ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
} else {
assert(ex >= ey);
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy += 1;
assert(iy <= iyb);
}
if (!visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
} else {
// x non positive, y non positive
int64_t ey = int64_t(p1(1) - iy * m_resolution) * int64_t(dx);
do {
assert(ix >= ixb && iy >= iyb);
if (ex < ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
} else if (ex == ey) {
// The lower edge of a grid cell belongs to the cell.
// Handle the case where the ray may cross the lower left corner of a cell in a general case,
// or a left or lower edge in a degenerate case (horizontal or vertical line).
if (dx > 0) {
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
}
if (dy > 0) {
ey = int64_t(dx) * m_resolution;
iy -= 1;
assert(iy >= iyb);
}
} else {
assert(ex > ey);
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy -= 1;
assert(iy >= iyb);
}
if (!visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
}
}
}
template<typename VISITOR> void visit_cells_intersecting_line(Slic3r::Point p1, Slic3r::Point p2, VISITOR &visitor, bool need_consider_eps = false) const
{ {
// End points of the line segment. // End points of the line segment.
assert(m_bbox.contains(p1)); assert(m_bbox.contains(p1));
@ -189,127 +308,59 @@ public:
assert(iy >= 0 && size_t(iy) < m_rows); assert(iy >= 0 && size_t(iy) < m_rows);
assert(ixb >= 0 && size_t(ixb) < m_cols); assert(ixb >= 0 && size_t(ixb) < m_cols);
assert(iyb >= 0 && size_t(iyb) < m_rows); assert(iyb >= 0 && size_t(iyb) < m_rows);
// Account for the end points.
if (! visitor(iy, ix) || (ix == ixb && iy == iyb)) std::vector<std::tuple<float, float, Slic3r::Point>> start_pos;
// Both ends fall into the same cell. std::vector<std::tuple<float, float, Slic3r::Point>> end_pos;
return; start_pos.push_back(std::make_tuple(ix, iy, p1));
// Raster the centeral part of the line. end_pos.push_back(std::make_tuple(ixb, iyb, p2));
coord_t dx = std::abs(p2(0) - p1(0));
coord_t dy = std::abs(p2(1) - p1(1)); if (need_consider_eps) {
if (p1(0) < p2(0)) { auto calculate_upper = [&](coord_t value, double eps) {
int64_t ex = int64_t((ix + 1)*m_resolution - p1(0)) * int64_t(dy); return coord_t((value + eps) / m_resolution);
if (p1(1) < p2(1)) { };
// x positive, y positive auto calculate_lower = [&](coord_t value, double eps) {
int64_t ey = int64_t((iy + 1)*m_resolution - p1(1)) * int64_t(dx); return coord_t((value - eps) / m_resolution);
do { };
assert(ix <= ixb && iy <= iyb); const double eps = scale_(10 * EPSILON);
if (ex < ey) { if (coord_t ix_u = calculate_upper(p1(0), eps);
ey -= ex; ix_u != ix) {
ex = int64_t(dy) * m_resolution; start_pos.push_back(std::make_tuple(ix_u, iy, Slic3r::Point(coord_t(p1(0) + eps), p1(1))));
ix += 1;
assert(ix <= ixb);
} }
else if (ex == ey) { if (coord_t ix_l = calculate_lower(p1(0), eps);
ex = int64_t(dy) * m_resolution; ix_l != ix) {
ey = int64_t(dx) * m_resolution; start_pos.push_back(std::make_tuple(ix_l, iy, Slic3r::Point(coord_t(p1(0) - eps), p1(1))));
ix += 1;
iy += 1;
assert(ix <= ixb);
assert(iy <= iyb);
} }
else { if (coord_t iy_u = calculate_upper(p1(1), eps);
assert(ex > ey); iy_u != iy) {
ex -= ey; start_pos.push_back(std::make_tuple(ix, iy_u, Slic3r::Point(p1(0), coord_t(p1(1) + eps))));
ey = int64_t(dx) * m_resolution;
iy += 1;
assert(iy <= iyb);
} }
if (! visitor(iy, ix)) if (coord_t iy_l = calculate_lower(p1(1), eps);
return; iy_l != iy) {
} while (ix != ixb || iy != iyb); start_pos.push_back(std::make_tuple(ix, iy_l, Slic3r::Point(p1(0), coord_t(p1(1) - eps))));
} }
else {
// x positive, y non positive if (coord_t ixb_u = calculate_upper(p2(0), eps);
int64_t ey = int64_t(p1(1) - iy*m_resolution) * int64_t(dx); ixb_u != ixb) {
do { end_pos.push_back(std::make_tuple(ixb_u, iyb, Slic3r::Point(coord_t(p2(0) + eps), p2(1))));
assert(ix <= ixb && iy >= iyb);
if (ex <= ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix += 1;
assert(ix <= ixb);
} }
else { if (coord_t ixb_l = calculate_lower(p2(0), eps);
ex -= ey; ixb_l != ixb) {
ey = int64_t(dx) * m_resolution; end_pos.push_back(std::make_tuple(ixb_l, iyb, Slic3r::Point(coord_t(p2(0) - eps), p2(1))));
iy -= 1;
assert(iy >= iyb);
} }
if (! visitor(iy, ix)) if (coord_t iyb_u = calculate_upper(p2(1), eps);
return; iyb_u != iyb) {
} while (ix != ixb || iy != iyb); end_pos.push_back(std::make_tuple(ixb, iyb_u, Slic3r::Point(p2(0), coord_t(p2(1) + eps))));
}
if (coord_t iyb_l = calculate_lower(p2(1), eps);
iyb_l != iyb) {
end_pos.push_back(std::make_tuple(ixb, iyb_l, Slic3r::Point(p2(0), coord_t(p2(1) - eps))));
} }
} }
else {
int64_t ex = int64_t(p1(0) - ix*m_resolution) * int64_t(dy); for (size_t start_idx = 0; start_idx < start_pos.size(); ++start_idx) {
if (p1(1) < p2(1)) { for (size_t end_idx = 0; end_idx < end_pos.size(); ++end_idx) {
// x non positive, y positive visit_intersect_line_impl(std::get<0>(start_pos[start_idx]), std::get<1>(start_pos[start_idx]), std::get<2>(start_pos[start_idx]),
int64_t ey = int64_t((iy + 1)*m_resolution - p1(1)) * int64_t(dx); std::get<0>(end_pos[end_idx]), std::get<1>(end_pos[end_idx]), std::get<2>(end_pos[end_idx]), visitor);
do {
assert(ix >= ixb && iy <= iyb);
if (ex < ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
}
else {
assert(ex >= ey);
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy += 1;
assert(iy <= iyb);
}
if (! visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
}
else {
// x non positive, y non positive
int64_t ey = int64_t(p1(1) - iy*m_resolution) * int64_t(dx);
do {
assert(ix >= ixb && iy >= iyb);
if (ex < ey) {
ey -= ex;
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
}
else if (ex == ey) {
// The lower edge of a grid cell belongs to the cell.
// Handle the case where the ray may cross the lower left corner of a cell in a general case,
// or a left or lower edge in a degenerate case (horizontal or vertical line).
if (dx > 0) {
ex = int64_t(dy) * m_resolution;
ix -= 1;
assert(ix >= ixb);
}
if (dy > 0) {
ey = int64_t(dx) * m_resolution;
iy -= 1;
assert(iy >= iyb);
}
}
else {
assert(ex > ey);
ex -= ey;
ey = int64_t(dx) * m_resolution;
iy -= 1;
assert(iy >= iyb);
}
if (! visitor(iy, ix))
return;
} while (ix != ixb || iy != iyb);
} }
} }
} }

15
src/libslic3r/MultiMaterialSegmentation.cpp
View File

@ -16,6 +16,7 @@
#include <mutex> #include <mutex>
#include <boost/thread/lock_guard.hpp> #include <boost/thread/lock_guard.hpp>
//#define MM_SEGMENTATION_DEBUG_PAINT_LINE
//#define MM_SEGMENTATION_DEBUG_GRAPH //#define MM_SEGMENTATION_DEBUG_GRAPH
//#define MM_SEGMENTATION_DEBUG_REGIONS //#define MM_SEGMENTATION_DEBUG_REGIONS
//#define MM_SEGMENTATION_DEBUG_INPUT //#define MM_SEGMENTATION_DEBUG_INPUT
@ -2161,16 +2162,24 @@ std::vector<std::vector<ExPolygons>> multi_material_segmentation_by_painting(con
BOOST_LOG_TRIVIAL(debug) << "MM segmentation - projection of painted triangles - begin"; BOOST_LOG_TRIVIAL(debug) << "MM segmentation - projection of painted triangles - begin";
for (const ModelVolume *mv : print_object.model_object()->volumes) { for (const ModelVolume *mv : print_object.model_object()->volumes) {
#ifndef MM_SEGMENTATION_DEBUG_PAINT_LINE
tbb::parallel_for(tbb::blocked_range<size_t>(1, num_extruders + 1), [&mv, &print_object, &layers, &edge_grids, &painted_lines, &painted_lines_mutex, &input_expolygons, &throw_on_cancel_callback](const tbb::blocked_range<size_t> &range) { tbb::parallel_for(tbb::blocked_range<size_t>(1, num_extruders + 1), [&mv, &print_object, &layers, &edge_grids, &painted_lines, &painted_lines_mutex, &input_expolygons, &throw_on_cancel_callback](const tbb::blocked_range<size_t> &range) {
for (size_t extruder_idx = range.begin(); extruder_idx < range.end(); ++extruder_idx) { for (size_t extruder_idx = range.begin(); extruder_idx < range.end(); ++extruder_idx) {
#else
for (size_t extruder_idx = 1; extruder_idx < num_extruders + 1; ++extruder_idx) {
#endif
throw_on_cancel_callback(); throw_on_cancel_callback();
const indexed_triangle_set custom_facets = mv->mmu_segmentation_facets.get_facets(*mv, EnforcerBlockerType(extruder_idx)); const indexed_triangle_set custom_facets = mv->mmu_segmentation_facets.get_facets(*mv, EnforcerBlockerType(extruder_idx));
if (!mv->is_model_part() || custom_facets.indices.empty()) if (!mv->is_model_part() || custom_facets.indices.empty())
continue; continue;
const Transform3f tr = print_object.trafo().cast<float>() * mv->get_matrix().cast<float>(); const Transform3f tr = print_object.trafo().cast<float>() * mv->get_matrix().cast<float>();
#ifndef MM_SEGMENTATION_DEBUG_PAINT_LINE
tbb::parallel_for(tbb::blocked_range<size_t>(0, custom_facets.indices.size()), [&tr, &custom_facets, &print_object, &layers, &edge_grids, &input_expolygons, &painted_lines, &painted_lines_mutex, &extruder_idx](const tbb::blocked_range<size_t> &range) { tbb::parallel_for(tbb::blocked_range<size_t>(0, custom_facets.indices.size()), [&tr, &custom_facets, &print_object, &layers, &edge_grids, &input_expolygons, &painted_lines, &painted_lines_mutex, &extruder_idx](const tbb::blocked_range<size_t> &range) {
for (size_t facet_idx = range.begin(); facet_idx < range.end(); ++facet_idx) { for (size_t facet_idx = range.begin(); facet_idx < range.end(); ++facet_idx) {
#else
for (size_t facet_idx = 0; facet_idx < custom_facets.indices.size(); ++facet_idx) {
#endif
float min_z = std::numeric_limits<float>::max(); float min_z = std::numeric_limits<float>::max();
float max_z = std::numeric_limits<float>::lowest(); float max_z = std::numeric_limits<float>::lowest();
@ -2243,12 +2252,16 @@ std::vector<std::vector<ExPolygons>> multi_material_segmentation_by_painting(con
PaintedLineVisitor visitor(edge_grids[layer_idx], painted_lines[layer_idx], painted_lines_mutex[mutex_idx], 16); PaintedLineVisitor visitor(edge_grids[layer_idx], painted_lines[layer_idx], painted_lines_mutex[mutex_idx], 16);
visitor.line_to_test = line_to_test; visitor.line_to_test = line_to_test;
visitor.color = int(extruder_idx); visitor.color = int(extruder_idx);
edge_grids[layer_idx].visit_cells_intersecting_line(line_to_test.a, line_to_test.b, visitor); edge_grids[layer_idx].visit_cells_intersecting_line(line_to_test.a, line_to_test.b, visitor, true);
} }
} }
#ifndef MM_SEGMENTATION_DEBUG_PAINT_LINE
}); // end of parallel_for }); // end of parallel_for
#endif
} }
#ifndef MM_SEGMENTATION_DEBUG_PAINT_LINE
}); // end of parallel_for }); // end of parallel_for
#endif
} }
BOOST_LOG_TRIVIAL(debug) << "MM segmentation - projection of painted triangles - end"; BOOST_LOG_TRIVIAL(debug) << "MM segmentation - projection of painted triangles - end";
BOOST_LOG_TRIVIAL(debug) << "MM segmentation - painted layers count: " BOOST_LOG_TRIVIAL(debug) << "MM segmentation - painted layers count: "