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

#7906 - Port of 296041da38273fbf0053d6e338bf5a2bb51d030d 'Fixed 'Export as .stl' scaling not applied on scaled object instances'

Browse Source
This commit is contained in:
enricoturri1966 2022-02-14 13:58:43 +01:00
parent 5ac0e124e4
commit 14b7d36070
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/slic3r/GUI/Plater.cpp
View File

@ -5770,23 +5770,26 @@ void Plater::export_stl(bool extended, bool selection_only)
return; return;
// Following lambda generates a combined mesh for export with normals pointing outwards. // Following lambda generates a combined mesh for export with normals pointing outwards.
auto mesh_to_export = [](const ModelObject* mo, bool instances) -> TriangleMesh { auto mesh_to_export = [](const ModelObject& mo, int instance_id) {
TriangleMesh mesh; TriangleMesh mesh;
for (const ModelVolume *v : mo->volumes) for (const ModelVolume* v : mo.volumes)
if (v->is_model_part()) { if (v->is_model_part()) {
TriangleMesh vol_mesh(v->mesh()); TriangleMesh vol_mesh(v->mesh());
vol_mesh.transform(v->get_matrix(), true); vol_mesh.transform(v->get_matrix(), true);
mesh.merge(vol_mesh); mesh.merge(vol_mesh);
} }
if (instances) { if (instance_id == -1) {
TriangleMesh vols_mesh(mesh); TriangleMesh vols_mesh(mesh);
mesh = TriangleMesh(); mesh = TriangleMesh();
for (const ModelInstance *i : mo->instances) { for (const ModelInstance* i : mo.instances) {
TriangleMesh m = vols_mesh; TriangleMesh m = vols_mesh;
m.transform(i->get_matrix(), true); m.transform(i->get_matrix(), true);
mesh.merge(m); mesh.merge(m);
} }
} }
else if (0 <= instance_id && instance_id < mo.instances.size())
mesh.transform(mo.instances[instance_id]->get_matrix(), true);
return mesh; return mesh;
}; };
@ -5795,7 +5798,7 @@ void Plater::export_stl(bool extended, bool selection_only)
if (selection_only) { if (selection_only) {
const ModelObject* model_object = p->model.objects[obj_idx]; const ModelObject* model_object = p->model.objects[obj_idx];
if (selection.get_mode() == Selection::Instance) if (selection.get_mode() == Selection::Instance)
mesh = mesh_to_export(model_object, selection.is_single_full_object() && model_object->instances.size() > 1); mesh = selection.is_single_full_object() ? mesh_to_export(*model_object, -1) : mesh_to_export(*model_object, selection.get_instance_idx());
else { else {
const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin()); const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
mesh = model_object->volumes[volume->volume_idx()]->mesh(); mesh = model_object->volumes[volume->volume_idx()]->mesh();
@ -5807,7 +5810,7 @@ void Plater::export_stl(bool extended, bool selection_only)
} }
else { else {
for (const ModelObject* o : p->model.objects) { for (const ModelObject* o : p->model.objects) {
mesh.merge(mesh_to_export(o, true)); mesh.merge(mesh_to_export(*o, -1));
} }
} }
} }
@ -5823,18 +5826,18 @@ void Plater::export_stl(bool extended, bool selection_only)
if (model_object->id() != p->model.objects[obj_idx]->id()) if (model_object->id() != p->model.objects[obj_idx]->id())
continue; continue;
} }
Transform3d mesh_trafo_inv = object->trafo().inverse(); const Transform3d mesh_trafo_inv = object->trafo().inverse();
bool is_left_handed = object->is_left_handed(); const bool is_left_handed = object->is_left_handed();
TriangleMesh pad_mesh; TriangleMesh pad_mesh;
bool has_pad_mesh = extended && object->has_mesh(slaposPad); const bool has_pad_mesh = extended && object->has_mesh(slaposPad);
if (has_pad_mesh) { if (has_pad_mesh) {
pad_mesh = object->get_mesh(slaposPad); pad_mesh = object->get_mesh(slaposPad);
pad_mesh.transform(mesh_trafo_inv); pad_mesh.transform(mesh_trafo_inv);
} }
TriangleMesh supports_mesh; TriangleMesh supports_mesh;
bool has_supports_mesh = extended && object->has_mesh(slaposSupportTree); const bool has_supports_mesh = extended && object->has_mesh(slaposSupportTree);
if (has_supports_mesh) { if (has_supports_mesh) {
supports_mesh = object->get_mesh(slaposSupportTree); supports_mesh = object->get_mesh(slaposSupportTree);
supports_mesh.transform(mesh_trafo_inv); supports_mesh.transform(mesh_trafo_inv);
@ -5846,7 +5849,7 @@ void Plater::export_stl(bool extended, bool selection_only)
assert(it != model_object->instances.end()); assert(it != model_object->instances.end());
if (it != model_object->instances.end()) { if (it != model_object->instances.end()) {
bool one_inst_only = selection_only && ! selection.is_single_full_object(); const bool one_inst_only = selection_only && !selection.is_single_full_object();
int instance_idx = it - model_object->instances.begin(); int instance_idx = it - model_object->instances.begin();
const Transform3d& inst_transform = one_inst_only const Transform3d& inst_transform = one_inst_only