Skip to content

perf: avoid copying rvalue meshes when adding model volumes #12116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VailElla wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −0
Open

perf: avoid copying rvalue meshes when adding model volumes #12116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/libslic3r/Model.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,12 @@ class ModelVolume final : public ObjectBase
if (mesh.facets_count() > 1)
calculate_convex_hull();
}
ModelVolume(ModelObject *object, TriangleMesh &&mesh, ModelVolumeType type = ModelVolumeType::MODEL_PART) :
ModelVolume(object, std::make_shared<const TriangleMesh>(std::move(mesh)), type)
{
if (m_mesh->facets_count() > 1)
calculate_convex_hull();
}
ModelVolume(ModelObject *object, const std::shared_ptr<const TriangleMesh> &mesh, ModelVolumeType type = ModelVolumeType::MODEL_PART) : m_mesh(mesh), m_type(type), object(object)
{
assert(this->id().valid());
Expand Down
18 changes: 18 additions & 0 deletions tests/fff_print/test_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include <boost/nowide/cstdio.hpp>
#include <boost/filesystem.hpp>

#include <utility>

#include "test_data.hpp"

using namespace Slic3r;
Expand Down Expand Up @@ -59,3 +61,19 @@ SCENARIO("Model construction", "[Model]") {
}
}
}

TEST_CASE("ModelObject moves rvalue mesh storage into a volume", "[Model]")
{
Model model;
ModelObject *object = model.add_object();
TriangleMesh mesh = make_cube(20, 20, 20);

const Vec3f *vertices = mesh.its.vertices.data();
const Vec3i *indices = mesh.its.indices.data();

const ModelVolume *volume = object->add_volume(std::move(mesh), ModelVolumeType::MODEL_PART, false);

REQUIRE(volume->mesh().its.vertices.data() == vertices);
REQUIRE(volume->mesh().its.indices.data() == indices);
REQUIRE(!volume->get_convex_hull().empty());
}