From cb1bc0aaf830352bc63618a5f25f5f2d13d1dfde Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 18 Aug 2017 13:32:35 +0200 Subject: [PATCH] CMake build system, initial placeholder for slic3r C binary. --- src/slic3r.cpp | 182 ++++++++++++++++++++++++++++++++++++++++++++++ xs/CMakeLists.txt | 33 ++++++++- 2 files changed, 211 insertions(+), 4 deletions(-) create mode 100644 src/slic3r.cpp diff --git a/src/slic3r.cpp b/src/slic3r.cpp new file mode 100644 index 000000000..4cff9b38b --- /dev/null +++ b/src/slic3r.cpp @@ -0,0 +1,182 @@ +#include "Config.hpp" +#include "Geometry.hpp" +#include "Model.hpp" +#include "TriangleMesh.hpp" +#include "libslic3r.h" +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace Slic3r; + +void confess_at(const char *file, int line, const char *func, const char *pat, ...){} + +int +main(int argc, char **argv) +{ + // Convert arguments to UTF-8 (needed on Windows). + // argv then points to memory owned by a. + boost::nowide::args a(argc, argv); + +#if 0 + // parse all command line options into a DynamicConfig + ConfigDef config_def; + config_def.merge(cli_config_def); + config_def.merge(print_config_def); + DynamicConfig config(&config_def); + t_config_option_keys input_files; + config.read_cli(argc, argv, &input_files); + + // apply command line options to a more handy CLIConfig + CLIConfig cli_config; + cli_config.apply(config, true); + + DynamicPrintConfig print_config; + + // load config files supplied via --load + for (const std::string &file : cli_config.load.values) { + if (!boost::filesystem::exists(file)) { + boost::nowide::cout << "No such file: " << file << std::endl; + exit(1); + } + + DynamicPrintConfig c; + try { + c.load(file); + } catch (std::exception &e) { + boost::nowide::cout << "Error while reading config file: " << e.what() << std::endl; + exit(1); + } + c.normalize(); + print_config.apply(c); + } + + // apply command line options to a more specific DynamicPrintConfig which provides normalize() + // (command line options override --load files) + print_config.apply(config, true); + print_config.normalize(); + + // write config if requested + if (!cli_config.save.value.empty()) print_config.save(cli_config.save.value); + + // read input file(s) if any + std::vector models; + for (const t_config_option_key &file : input_files) { + if (!boost::filesystem::exists(file)) { + boost::nowide::cerr << "No such file: " << file << std::endl; + exit(1); + } + + Model model; + try { + model = Model::read_from_file(file); + } catch (std::exception &e) { + boost::nowide::cerr << file << ": " << e.what() << std::endl; + exit(1); + } + + if (model.objects.empty()) { + boost::nowide::cerr << "Error: file is empty: " << file << std::endl; + continue; + } + + model.add_default_instances(); + + // apply command line transform options + for (ModelObject* o : model.objects) { + if (cli_config.scale_to_fit.is_positive_volume()) + o->scale_to_fit(cli_config.scale_to_fit.value); + + // TODO: honor option order? + o->scale(cli_config.scale.value); + o->rotate(Geometry::deg2rad(cli_config.rotate_x.value), X); + o->rotate(Geometry::deg2rad(cli_config.rotate_y.value), Y); + o->rotate(Geometry::deg2rad(cli_config.rotate.value), Z); + } + + // TODO: handle --merge + models.push_back(model); + } + + for (Model &model : models) { + if (cli_config.info) { + // --info works on unrepaired model + model.print_info(); + } else if (cli_config.export_obj) { + std::string outfile = cli_config.output.value; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".obj"; + + TriangleMesh mesh = model.mesh(); + mesh.repair(); + IO::OBJ::write(mesh, outfile); + boost::nowide::cout << "File exported to " << outfile << std::endl; + } else if (cli_config.export_pov) { + std::string outfile = cli_config.output.value; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".pov"; + + TriangleMesh mesh = model.mesh(); + mesh.repair(); + IO::POV::write(mesh, outfile); + boost::nowide::cout << "File exported to " << outfile << std::endl; + } else if (cli_config.export_svg) { + std::string outfile = cli_config.output.value; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".svg"; + + SLAPrint print(&model); + print.config.apply(print_config, true); + print.slice(); + print.write_svg(outfile); + boost::nowide::cout << "SVG file exported to " << outfile << std::endl; + } else if (cli_config.cut_x > 0 || cli_config.cut_y > 0 || cli_config.cut > 0) { + model.repair(); + model.translate(0, 0, -model.bounding_box().min.z); + + if (!model.objects.empty()) { + // FIXME: cut all objects + Model out; + if (cli_config.cut_x > 0) { + model.objects.front()->cut(X, cli_config.cut_x, &out); + } else if (cli_config.cut_y > 0) { + model.objects.front()->cut(Y, cli_config.cut_y, &out); + } else { + model.objects.front()->cut(Z, cli_config.cut, &out); + } + + ModelObject &upper = *out.objects[0]; + ModelObject &lower = *out.objects[1]; + + if (upper.facets_count() > 0) { + TriangleMesh m = upper.mesh(); + IO::STL::write(m, upper.input_file + "_upper.stl"); + } + if (lower.facets_count() > 0) { + TriangleMesh m = lower.mesh(); + IO::STL::write(m, lower.input_file + "_lower.stl"); + } + } + } else if (cli_config.cut_grid.value.x > 0 && cli_config.cut_grid.value.y > 0) { + TriangleMesh mesh = model.mesh(); + mesh.repair(); + + TriangleMeshPtrs meshes = mesh.cut_by_grid(cli_config.cut_grid.value); + size_t i = 0; + for (TriangleMesh* m : meshes) { + std::ostringstream ss; + ss << model.objects.front()->input_file << "_" << i++ << ".stl"; + IO::STL::write(*m, ss.str()); + delete m; + } + } else { + boost::nowide::cerr << "error: command not supported" << std::endl; + return 1; + } + } +#endif + + return 0; +} diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index ec2bf57d0..e31914542 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -295,15 +295,22 @@ configure_file(main.xs.in ${XS_MAIN_XS} @ONLY) # Insert INCLUDE_COMMANDS into ma set(XS_MAIN_CPP ${CMAKE_CURRENT_BINARY_DIR}/XS.cpp) add_custom_command( OUTPUT ${XS_MAIN_CPP} - DEPENDS ${MyTemplate} ${MyTypemap} + DEPENDS ${MyTypemap} ${CMAKE_CURRENT_LIST_DIR}/xsp/typemap.xspt COMMAND COMMAND xsubpp -typemap typemap -output ${XS_MAIN_CPP} -hiertype ${XS_MAIN_XS} ) # Define the Perl XS shared library. add_library(XS SHARED ${XS_MAIN_CPP} - ${LIBDIR}/perlglue.cpp ${LIBDIR}/libslic3r/utils.cpp + ${LIBDIR}/perlglue.cpp + ${LIBDIR}/ppport.h + ${LIBDIR}/xsinit.h + ${CMAKE_CURRENT_LIST_DIR}/xsp/my.map + # mytype.map is empty. Is it required by Build.PL or the Perl xspp module? + ${CMAKE_CURRENT_LIST_DIR}/xsp/mytype.map + # Used by Perl xsubpp to generate XS.cpp + ${CMAKE_CURRENT_LIST_DIR}/xsp/typemap.xspt ) target_link_libraries(XS libslic3r libslic3r_gui admesh clipper nowide polypartition poly2tri) if(SLIC3R_DEBUG) @@ -418,13 +425,13 @@ if (SLIC3R_PRUSACONTROL) include_directories(${AlienWx_INCLUDE_DIRS}) #add_compile_options(${AlienWx_CXX_FLAGS}) add_definitions(${AlienWx_DEFINITIONS}) - target_link_libraries(XS ${AlienWx_LIBRARIES}) + set(wxWidgets_LIBRARIES, ${AlienWx_LIBRARIES}) else () find_package(wxWidgets REQUIRED COMPONENTS base) include(${wxWidgets_USE_FILE}) - target_link_libraries(XS ${wxWidgets_LIBRARIES}) endif () target_compile_definitions(XS PRIVATE -DSLIC3R_GUI -DSLIC3R_PRUS) + target_link_libraries(XS ${wxWidgets_LIBRARIES}) endif() ## OPTIONAL packages @@ -472,6 +479,24 @@ endif () include_directories(${GLEW_INCLUDE_DIRS}) target_link_libraries(XS ${GLEW_LIBRARIES}) + +# Create a slic3r executable +add_executable(slic3r ${PROJECT_SOURCE_DIR}/src/slic3r.cpp) +target_include_directories(XS PRIVATE src src/libslic3r) +target_link_libraries(slic3r libslic3r libslic3r_gui admesh ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) +if(SLIC3R_DEBUG) + target_link_libraries(Shiny) +endif() +target_compile_definitions(slic3r PRIVATE -DBOOST_ASIO_DISABLE_KQUEUE -DBOOST_LIBS -DBOOST_ALL_NO_LIB) +if(NOT SLIC3R_STATIC) + target_compile_definitions(slic3r PRIVATE -DBOOST_LOG_DYN_LINK) +endif() +if (APPLE) + target_link_libraries(slic3r -framework IOKit -framework CoreFoundation -lc++) +elseif (NOT MSVC) + target_link_libraries(slic3r -lstdc++) +endif () + # Installation install(TARGETS XS DESTINATION lib/slic3r-prusa3d/auto/Slic3r/XS) install(FILES lib/Slic3r/XS.pm DESTINATION lib/slic3r-prusa3d/Slic3r)