mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-12 09:17:52 -06:00
Fix CGAL import with shared boost
This commit is contained in:
parent
c6223e5d7c
commit
c8a088e652
2 changed files with 11 additions and 5 deletions
|
@ -1,5 +1,9 @@
|
||||||
|
if (SLIC3R_STATIC)
|
||||||
|
set(CGAL_Boost_USE_STATIC_LIBS ON)
|
||||||
|
endif ()
|
||||||
|
|
||||||
find_package(CGAL REQUIRED)
|
find_package(CGAL REQUIRED)
|
||||||
|
|
||||||
add_executable(meshboolean MeshBoolean.cpp)
|
add_executable(meshboolean MeshBoolean.cpp)
|
||||||
|
|
||||||
target_link_libraries(meshboolean libslic3r CGAL::CGAL)
|
target_link_libraries(meshboolean libslic3r CGAL::CGAL)
|
|
@ -46,11 +46,14 @@ void mesh_boolean_test(const std::string &fname)
|
||||||
//igl::copyleft::cgal::mesh_boolean(VA,FA,VB,FB,boolean_type,VC,FC,J);
|
//igl::copyleft::cgal::mesh_boolean(VA,FA,VB,FB,boolean_type,VC,FC,J);
|
||||||
|
|
||||||
|
|
||||||
|
std::cout << fname.c_str() << std::endl;
|
||||||
TriangleMesh mesh;
|
TriangleMesh mesh;
|
||||||
|
|
||||||
mesh.ReadSTLFile(fname.c_str());
|
mesh.ReadSTLFile(fname.c_str());
|
||||||
mesh.repair(true);
|
mesh.repair(true);
|
||||||
its_write_obj(mesh.its, (fname + "-imported0.obj").c_str());
|
its_write_obj(mesh.its, (fname + "-imported0.obj").c_str());
|
||||||
|
|
||||||
|
|
||||||
Eigen::MatrixXd VA,VB,VC;
|
Eigen::MatrixXd VA,VB,VC;
|
||||||
Eigen::VectorXi J,I;
|
Eigen::VectorXi J,I;
|
||||||
Eigen::MatrixXi FA,FB,FC;
|
Eigen::MatrixXi FA,FB,FC;
|
||||||
|
@ -64,7 +67,6 @@ void mesh_boolean_test(const std::string &fname)
|
||||||
Eigen::MatrixXi F = MapMatrixXiUnaligned(mesh.its.indices.front().data(), mesh.its.indices.size(), 3);
|
Eigen::MatrixXi F = MapMatrixXiUnaligned(mesh.its.indices.front().data(), mesh.its.indices.size(), 3);
|
||||||
|
|
||||||
its_write_obj(V, F, (fname + "-imported.obj").c_str());
|
its_write_obj(V, F, (fname + "-imported.obj").c_str());
|
||||||
|
|
||||||
// Self-union to clean up
|
// Self-union to clean up
|
||||||
igl::copyleft::cgal::mesh_boolean(V, F, Eigen::MatrixXd(), Eigen::MatrixXi(), boolean_type, VC, FC);
|
igl::copyleft::cgal::mesh_boolean(V, F, Eigen::MatrixXd(), Eigen::MatrixXi(), boolean_type, VC, FC);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue