From eb4b24e13652f38b1def020753f5b28ee0840e1e Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 7 Feb 2020 16:33:04 +0100
Subject: [PATCH] Hollowing: randomize hole mesh translations before
 unification.

To prevent self intersections in the output mesh.
---
 src/libslic3r/MeshBoolean.cpp   |  3 +++
 src/libslic3r/MeshBoolean.hpp   |  1 -
 src/libslic3r/SLAPrintSteps.cpp | 35 ++++++++++++++++++---------------
 src/libslic3r/SLAPrintSteps.hpp |  3 +++
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
index 6db1493ec..6c5418fd4 100644
--- a/src/libslic3r/MeshBoolean.cpp
+++ b/src/libslic3r/MeshBoolean.cpp
@@ -113,6 +113,9 @@ struct CGALMesh { _EpicMesh m; };
 template<class _Mesh> void triangle_mesh_to_cgal(const TriangleMesh &M, _Mesh &out)
 {
     using Index3 = std::array<size_t, 3>;
+    
+    if (M.empty()) return;
+    
     std::vector<typename _Mesh::Point> points;
     std::vector<Index3> indices;
     points.reserve(M.its.vertices.size());
diff --git a/src/libslic3r/MeshBoolean.hpp b/src/libslic3r/MeshBoolean.hpp
index 5298906b4..ce17a1328 100644
--- a/src/libslic3r/MeshBoolean.hpp
+++ b/src/libslic3r/MeshBoolean.hpp
@@ -25,7 +25,6 @@ void self_union(TriangleMesh& mesh);
 namespace cgal {
 
 struct CGALMesh;
-
 struct CGALMeshDeleter { void operator()(CGALMesh *ptr); };
 
 std::unique_ptr<CGALMesh, CGALMeshDeleter> triangle_mesh_to_cgal(const TriangleMesh &M);
diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp
index 2d98c82c2..07d9a7a44 100644
--- a/src/libslic3r/SLAPrintSteps.cpp
+++ b/src/libslic3r/SLAPrintSteps.cpp
@@ -49,7 +49,7 @@ std::string OBJ_STEP_LABELS(size_t idx)
     }
     assert(false);
     return "Out of bounds!";
-};
+}
 
 const std::array<unsigned, slapsCount> PRINT_STEP_LEVELS = {
     10, // slapsMergeSlicesAndEval
@@ -64,12 +64,13 @@ std::string PRINT_STEP_LABELS(size_t idx)
     default:;
     }
     assert(false); return "Out of bounds!";
-};
+}
 
 }
 
 SLAPrint::Steps::Steps(SLAPrint *print)
     : m_print{print}
+    , m_rng{std::random_device{}()}
     , objcount{m_print->m_objects.size()}
     , ilhd{m_print->m_material_config.initial_layer_height.getFloat()}
     , ilh{float(ilhd)}
@@ -137,28 +138,30 @@ void SLAPrint::Steps::drill_holes(SLAPrintObject &po)
     BOOST_LOG_TRIVIAL(info) << "Drilling drainage holes.";
     sla::DrainHoles drainholes = po.transformed_drainhole_points();
     
-    TriangleMesh holes_mesh;
-    
-    for (const sla::DrainHole &holept : drainholes)
-        holes_mesh.merge(sla::to_triangle_mesh(holept.to_mesh()));
-    
-    holes_mesh.require_shared_vertices();
-    if (!holes_mesh.is_manifold() || MeshBoolean::cgal::does_self_intersect(holes_mesh)) {
-        MeshBoolean::self_union(holes_mesh);
-        
-        if (MeshBoolean::cgal::does_self_intersect(holes_mesh))
-            throw std::runtime_error(L("Too much overlapping holes."));
+    std::uniform_real_distribution<float> dist(1., float(EPSILON));
+    auto holes_mesh_cgal = MeshBoolean::cgal::triangle_mesh_to_cgal({});
+    for (const sla::DrainHole &holept : drainholes) {
+        auto &&m = sla::to_triangle_mesh(holept.to_mesh());
+        float t = dist(m_rng);
+        m.translate(t, t, t);
+        m.require_shared_vertices();
+        auto cgal_m = MeshBoolean::cgal::triangle_mesh_to_cgal(m);
+        MeshBoolean::cgal::plus(*holes_mesh_cgal, *cgal_m);
     }
     
+    if (MeshBoolean::cgal::does_self_intersect(*holes_mesh_cgal))
+        throw std::runtime_error(L("Too much overlapping holes."));
+    
+    auto hollowed_mesh_cgal = MeshBoolean::cgal::triangle_mesh_to_cgal(hollowed_mesh);
+    
     try {
-        MeshBoolean::cgal::minus(hollowed_mesh, holes_mesh);
+        MeshBoolean::cgal::minus(*hollowed_mesh_cgal, *holes_mesh_cgal);
+        hollowed_mesh = MeshBoolean::cgal::cgal_to_triangle_mesh(*hollowed_mesh_cgal);
     } catch (const std::runtime_error &) {
         throw std::runtime_error(L(
             "Drilling holes into the mesh failed. "
             "This is usually caused by broken model. Try to fix it first."));
     }
-
-    hollowed_mesh.require_shared_vertices();
 }
 
 // The slicing will be performed on an imaginary 1D grid which starts from
diff --git a/src/libslic3r/SLAPrintSteps.hpp b/src/libslic3r/SLAPrintSteps.hpp
index ad099e0e7..0418072cf 100644
--- a/src/libslic3r/SLAPrintSteps.hpp
+++ b/src/libslic3r/SLAPrintSteps.hpp
@@ -1,6 +1,8 @@
 #ifndef SLAPRINTSTEPS_HPP
 #define SLAPRINTSTEPS_HPP
 
+#include <random>
+
 #include <libslic3r/SLAPrint.hpp>
 
 #include <libslic3r/SLA/Hollowing.hpp>
@@ -12,6 +14,7 @@ class SLAPrint::Steps
 {
 private:
     SLAPrint *m_print = nullptr;
+    std::mt19937 m_rng;
     
 public:    
     // where the per object operations start and end