From f60ff1c7ce02a577003910902a27414612b8de14 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 13 Dec 2019 15:08:44 +0100 Subject: [PATCH] Fixup of previous commit: actually adding new source files --- src/libslic3r/MeshBoolean.cpp | 63 +++++++++++++++++++++++++++++++++++ src/libslic3r/MeshBoolean.hpp | 17 ++++++++++ 2 files changed, 80 insertions(+) create mode 100644 src/libslic3r/MeshBoolean.cpp create mode 100644 src/libslic3r/MeshBoolean.hpp diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp new file mode 100644 index 000000000..e639319a2 --- /dev/null +++ b/src/libslic3r/MeshBoolean.cpp @@ -0,0 +1,63 @@ +#include "MeshBoolean.hpp" + +// Include igl first. It defines "L" macro which then clashes with our localization +#include +#undef L + +#include "libslic3r/TriangleMesh.hpp" + + +namespace Slic3r { +namespace MeshBoolean { + +typedef Eigen::Map> MapMatrixXfUnaligned; +typedef Eigen::Map> MapMatrixXiUnaligned; + +static TriangleMesh eigen_to_triangle_mesh(const Eigen::MatrixXd& VC, const Eigen::MatrixXi& FC) +{ + Pointf3s vertices; + for (size_t i=0; i facets; + for (size_t i=0; i(); + Eigen::MatrixXi FA = MapMatrixXiUnaligned(A.its.indices.front().data(), A.its.indices.size(), 3); + Eigen::MatrixXd VB = MapMatrixXfUnaligned(B.its.vertices.front().data(), B.its.vertices.size(), 3).cast(); + Eigen::MatrixXi FB = MapMatrixXiUnaligned(B.its.indices.front().data(), B.its.indices.size(), 3); + + Eigen::MatrixXd VC; + Eigen::MatrixXi FC; + igl::MeshBooleanType boolean_type(igl::MESH_BOOLEAN_TYPE_MINUS); + igl::copyleft::cgal::mesh_boolean(VA, FA, VB, FB, boolean_type, VC, FC); + + A = eigen_to_triangle_mesh(VC, FC); +} + + +void self_union(TriangleMesh& mesh) +{ + Eigen::MatrixXd V = MapMatrixXfUnaligned(mesh.its.vertices.front().data(), mesh.its.vertices.size(), 3).cast(); + Eigen::MatrixXi F = MapMatrixXiUnaligned(mesh.its.indices.front().data(), mesh.its.indices.size(), 3); + + Eigen::MatrixXd VC; + Eigen::MatrixXi FC; + + igl::MeshBooleanType boolean_type(igl::MESH_BOOLEAN_TYPE_UNION); + igl::copyleft::cgal::mesh_boolean(V, F, Eigen::MatrixXd(), Eigen::MatrixXi(), boolean_type, VC, FC); + mesh = eigen_to_triangle_mesh(VC, FC); +} + + + +} // namespace MeshBoolean +} // namespace Slic3r diff --git a/src/libslic3r/MeshBoolean.hpp b/src/libslic3r/MeshBoolean.hpp new file mode 100644 index 000000000..783bde3f5 --- /dev/null +++ b/src/libslic3r/MeshBoolean.hpp @@ -0,0 +1,17 @@ +#ifndef libslic3r_MeshBoolean_hpp_ +#define libslic3r_MeshBoolean_hpp_ + + +namespace Slic3r { + +class TriangleMesh; + +namespace MeshBoolean { + +void minus(TriangleMesh& A, const TriangleMesh& B); +void self_union(TriangleMesh& mesh); + + +} // namespace MeshBoolean +} // namespace Slic3r +#endif // libslic3r_MeshBoolean_hpp_