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

Ensure same order of objects when passing them to libseqarrange

Browse Source
This commit is contained in:
Lukas Matena 2025-02-10 11:01:51 +01:00
parent 3efa84f744
commit 0ac100cd2c
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libslic3r/ArrangeHelper.cpp
View File

@ -124,23 +124,38 @@ static std::vector<Sequential::ObjectToPrint> get_objects_to_print(const Model&
Slic3r::sort_remove_duplicates(heights); Slic3r::sort_remove_duplicates(heights);
// Now collect all objects and projections of convex hull above respective heights. // Now collect all objects and projections of convex hull above respective heights.
std::vector<Sequential::ObjectToPrint> objects; std::vector<std::pair<Sequential::ObjectToPrint, std::vector<Sequential::ObjectToPrint>>> objects; // first = object id, the vector = ids of its instances
for (const ModelObject* mo : model.objects) { for (const ModelObject* mo : model.objects) {
size_t inst_id = 0; size_t inst_id = 0;
const TriangleMesh& raw_mesh = mo->raw_mesh(); const TriangleMesh& raw_mesh = mo->raw_mesh();
for (const ModelInstance* mi : mo->instances) { for (const ModelInstance* mi : mo->instances) {
objects.emplace_back(Sequential::ObjectToPrint{int(inst_id == 0 ? mo->id().id : mi->id().id), inst_id + 1 < mo->instances.size(), coord_t height = scaled(mo->instance_bounding_box(inst_id).size().z());
scaled(mo->instance_bounding_box(inst_id).size().z()), {}}); Sequential::ObjectToPrint* new_object =
(inst_id == 0 ? &objects.emplace_back(std::make_pair(Sequential::ObjectToPrint{int(mo->id().id), inst_id + 1 < mo->instances.size(), height, {}}, std::vector<Sequential::ObjectToPrint>())).first
: &objects.back().second.emplace_back(Sequential::ObjectToPrint{int(mi->id().id), inst_id + 1 < mo->instances.size(), height, {}}));
for (double height : heights) { for (double height : heights) {
// It seems that zero level in the object instance is mi->get_offset().z(), however need to have bed as zero level, // It seems that zero level in the object instance is mi->get_offset().z(), however need to have bed as zero level,
// hence substracting mi->get_offset().z() from height seems to be an easy hack // hence substracting mi->get_offset().z() from height seems to be an easy hack
Polygon pgn = its_convex_hull_2d_above(raw_mesh.its, mi->get_matrix_no_offset().cast<float>(), height - mi->get_offset().z()); Polygon pgn = its_convex_hull_2d_above(raw_mesh.its, mi->get_matrix_no_offset().cast<float>(), height - mi->get_offset().z());
objects.back().pgns_at_height.emplace_back(std::make_pair(scaled(height), pgn)); new_object->pgns_at_height.emplace_back(std::make_pair(scaled(height), pgn));
} }
++inst_id; ++inst_id;
} }
} }
return objects;
// Now order the objects so that the are always passed in the order of increasing id.
// That way, the algorithm will give the same result when called repeatedly.
// However, there is an exception: instances cannot be separated from their objects.
std::sort(objects.begin(), objects.end(), [](const auto& a, const auto& b) { return a.first.id < b.first.id; });
std::vector<Sequential::ObjectToPrint> objects_out;
for (const auto& o : objects) {
objects_out.emplace_back(o.first);
for (const auto& i : o.second)
objects_out.emplace_back(i);
}
return objects_out;
} }