From 12ef6913d52d068b8bc1298a0f7ea330909a3933 Mon Sep 17 00:00:00 2001 From: Enrico Turri <enricoturri@seznam.cz> Date: Fri, 9 Nov 2018 10:31:58 +0100 Subject: [PATCH] ModelObject::instance_bounding_box() fixed to take in account for volumes' transforms --- src/libslic3r/Model.cpp | 18 +++++++++++++++--- src/libslic3r/Model.hpp | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 71b9dc492..792b84812 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -787,7 +787,7 @@ BoundingBoxf3 ModelObject::raw_bounding_box() const if (v->is_model_part()) { if (this->instances.empty()) throw std::invalid_argument("Can't call raw_bounding_box() with no instances"); - bb.merge(this->instances.front()->transform_mesh_bounding_box(&v->mesh, true)); + bb.merge(this->instances.front()->transform_mesh_bounding_box(v->mesh, true)); } return bb; } @@ -796,9 +796,21 @@ BoundingBoxf3 ModelObject::raw_bounding_box() const BoundingBoxf3 ModelObject::instance_bounding_box(size_t instance_idx, bool dont_translate) const { BoundingBoxf3 bb; +#if ENABLE_MODELVOLUME_TRANSFORM + for (ModelVolume *v : this->volumes) + { + if (v->is_model_part()) + { + TriangleMesh mesh(v->mesh); + mesh.transform(v->get_matrix()); + bb.merge(this->instances[instance_idx]->transform_mesh_bounding_box(mesh, dont_translate)); + } + } +#else for (ModelVolume *v : this->volumes) if (v->is_model_part()) bb.merge(this->instances[instance_idx]->transform_mesh_bounding_box(&v->mesh, dont_translate)); +#endif // ENABLE_MODELVOLUME_TRANSFORM return bb; } @@ -1368,10 +1380,10 @@ void ModelInstance::transform_mesh(TriangleMesh* mesh, bool dont_translate) cons mesh->transform(get_matrix(dont_translate)); } -BoundingBoxf3 ModelInstance::transform_mesh_bounding_box(const TriangleMesh* mesh, bool dont_translate) const +BoundingBoxf3 ModelInstance::transform_mesh_bounding_box(const TriangleMesh& mesh, bool dont_translate) const { // Rotate around mesh origin. - TriangleMesh copy(*mesh); + TriangleMesh copy(mesh); copy.transform(get_matrix(true, false, true, true)); BoundingBoxf3 bbox = copy.bounding_box(); diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp index 4da4d1542..f1b7dc15a 100644 --- a/src/libslic3r/Model.hpp +++ b/src/libslic3r/Model.hpp @@ -516,7 +516,7 @@ public: // To be called on an external mesh void transform_mesh(TriangleMesh* mesh, bool dont_translate = false) const; // Calculate a bounding box of a transformed mesh. To be called on an external mesh. - BoundingBoxf3 transform_mesh_bounding_box(const TriangleMesh* mesh, bool dont_translate = false) const; + BoundingBoxf3 transform_mesh_bounding_box(const TriangleMesh& mesh, bool dont_translate = false) const; // Transform an external bounding box. BoundingBoxf3 transform_bounding_box(const BoundingBoxf3 &bbox, bool dont_translate = false) const; // Transform an external vector.