From 7cee4d53f9400a4dba17344147c4937e4ac2fa7e Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 28 Aug 2018 10:52:18 +0200 Subject: [PATCH 1/2] added max merge distance parameter --- xs/src/libslic3r/SLABasePool.cpp | 25 +++++++++++++++---------- xs/src/libslic3r/SLABasePool.hpp | 5 +++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/xs/src/libslic3r/SLABasePool.cpp b/xs/src/libslic3r/SLABasePool.cpp index 17cc251a5..adf43eaf2 100644 --- a/xs/src/libslic3r/SLABasePool.cpp +++ b/xs/src/libslic3r/SLABasePool.cpp @@ -294,6 +294,8 @@ inline Contour3D inner_bed(const ExPolygon& poly, double depth_mm, /// Unification of polygons (with clipper) preserving holes as well. inline ExPolygons unify(const ExPolygons& shapes) { + using ClipperLib::ptSubject; + ExPolygons retv; bool closed = true; @@ -303,11 +305,15 @@ inline ExPolygons unify(const ExPolygons& shapes) { for(auto& path : shapes) { auto clipperpath = Slic3rMultiPoint_to_ClipperPath(path.contour); - valid &= clipper.AddPath(clipperpath, ClipperLib::ptSubject, closed); + + if(!clipperpath.empty()) + valid &= clipper.AddPath(clipperpath, ptSubject, closed); auto clipperholes = Slic3rMultiPoints_to_ClipperPaths(path.holes); + for(auto& hole : clipperholes) { - valid &= clipper.AddPath(hole, ClipperLib::ptSubject, closed); + if(!hole.empty()) + valid &= clipper.AddPath(hole, ptSubject, closed); } } @@ -382,7 +388,7 @@ inline Point centroid(const ExPolygon& poly) { /// with explicit bridges. Bridges are generated from each shape's centroid /// to the center of the "scene" which is the centroid calculated from the shape /// centroids (a star is created...) -inline ExPolygons concave_hull(const ExPolygons& polys, double max_dist_mm = 0) +inline ExPolygons concave_hull(const ExPolygons& polys, double max_dist_mm = 50) { if(polys.empty()) return ExPolygons(); @@ -408,8 +414,9 @@ inline ExPolygons concave_hull(const ExPolygons& polys, double max_dist_mm = 0) double dx = x(c) - x(cc), dy = y(c) - y(cc); double l = std::sqrt(dx * dx + dy * dy); double nx = dx / l, ny = dy / l; + double max_dist = mm(max_dist_mm); - if(l < max_dist_mm) return ExPolygon(); + if(l > max_dist) return ExPolygon(); ExPolygon r; auto& ctour = r.contour.points; @@ -427,9 +434,6 @@ inline ExPolygons concave_hull(const ExPolygons& polys, double max_dist_mm = 0) punion = unify(punion); - if(punion.size() != 1) - BOOST_LOG_TRIVIAL(error) << "Cannot generate correct SLA base pool!"; - return punion; } @@ -449,9 +453,10 @@ void ground_layer(const TriangleMesh &mesh, ExPolygons &output, float h) void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out, double min_wall_thickness_mm, - double min_wall_height_mm) + double min_wall_height_mm, + double max_merge_distance_mm) { - auto concavehs = concave_hull(ground_layer); + auto concavehs = concave_hull(ground_layer, max_merge_distance_mm); for(ExPolygon& concaveh : concavehs) { if(concaveh.contour.points.empty()) return; concaveh.holes.clear(); @@ -460,7 +465,7 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out, coord_t w = x(bb.max) - x(bb.min); coord_t h = y(bb.max) - y(bb.min); - auto wall_thickness = coord_t(std::pow((w+h)*0.1, 0.8)); + auto wall_thickness = coord_t((w+h)*0.01); const coord_t WALL_THICKNESS = mm(min_wall_thickness_mm) + wall_thickness; diff --git a/xs/src/libslic3r/SLABasePool.hpp b/xs/src/libslic3r/SLABasePool.hpp index 52adabfbc..55c94df07 100644 --- a/xs/src/libslic3r/SLABasePool.hpp +++ b/xs/src/libslic3r/SLABasePool.hpp @@ -20,8 +20,9 @@ void ground_layer(const TriangleMesh& mesh, /// Calculate the pool for the mesh for SLA printing void create_base_pool(const ExPolygons& ground_layer, TriangleMesh& output_mesh, - double min_wall_thickness_mm = 4, - double min_wall_height_mm = 5 + double min_wall_thickness_mm = 2, + double min_wall_height_mm = 5, + double max_merge_distance_mm = 50 ); } From 057dfa56e3e749cbf1c2c72390f32888a644d910 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 28 Aug 2018 11:35:21 +0200 Subject: [PATCH 2/2] fix build for Linux --- xs/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index 082bf1e8e..b65c56aa6 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -772,9 +772,9 @@ add_executable(slic3r EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/slic3r.cpp) target_include_directories(XS PRIVATE src src/libslic3r) target_link_libraries(slic3r libslic3r libslic3r_gui admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) -add_executable(slabasebed ${PROJECT_SOURCE_DIR}/src/slabasebed.cpp) +add_executable(slabasebed EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/slabasebed.cpp) target_include_directories(slabasebed PRIVATE src src/libslic3r) -target_link_libraries(slabasebed libslic3r libslic3r_gui qhull admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES}) +target_link_libraries(slabasebed libslic3r libslic3r_gui qhull admesh miniz ${Boost_LIBRARIES} clipper ${EXPAT_LIBRARIES} ${GLEW_LIBRARIES} polypartition poly2tri ${TBB_LIBRARIES} ${wxWidgets_LIBRARIES} ${CMAKE_DL_LIBS}) if(SLIC3R_PROFILE) target_link_libraries(Shiny)