upgrade to 5.6 and changed fillBoundaryHole

stla · Oct 9, 2023 · 5f22581 · 5f22581
1 parent bc1f0f4
commit 5f22581
Show file tree

Hide file tree

Showing 3 changed files with 610 additions and 23 deletions.
diff --git a/inst/essais/Enneper-checkerboard2/Enneper-checkerboard2.html b/inst/essais/Enneper-checkerboard2/Enneper-checkerboard2.html
diff --git a/src/MODULE.cpp b/src/MODULE.cpp
@@ -5,7 +5,7 @@
 #include "MODULE.h"
 
 RCPP_MODULE(class_CGALmesh) {
-  using namespace Rcpp;
+  using namespace Rcpp; 
   class_<CGALmesh>("CGALmesh")
     .constructor<
       const NumericMatrix, const List, bool,

diff --git a/src/MODULE.h b/src/MODULE.h
@@ -1069,13 +1069,31 @@ class CGALmesh {
     halfedge_descriptor h = border_cycles[border];
     std::vector<face_descriptor>   patch_faces;
     std::vector<vertex_descriptor> patch_vertices;
+    if(fairhole) {
+      const bool success = std::get<0>(
+        PMP::triangulate_refine_and_fair_hole(
+          mesh, h,
+          CGAL::parameters::face_output_iterator(
+            std::back_inserter(patch_faces))
+            .vertex_output_iterator(std::back_inserter(patch_vertices))
+        )
+      );
+      if(!success) {
+        Message("Fairing failed.");
+      }
+    } else {
+      PMP::triangulate_and_refine_hole(
+        mesh, h,
+        CGAL::parameters::face_output_iterator(
+          std::back_inserter(patch_faces))
+          .vertex_output_iterator(std::back_inserter(patch_vertices))
+      );
+    }
     // if(fairhole) {
     //   const bool success = std::get<0>(
     //     PMP::triangulate_refine_and_fair_hole(
     //       mesh, h, 
-    //       CGAL::parameters::face_output_iterator(
-    //         std::back_inserter(patch_faces))
-    //         .vertex_output_iterator(std::back_inserter(patch_vertices)) 
+    //       std::back_inserter(patch_faces), std::back_inserter(patch_vertices)
     //     )
     //   );
     //   if(!success) {
@@ -1084,27 +1102,9 @@ class CGALmesh {
     // } else {
     //   PMP::triangulate_and_refine_hole(
     //     mesh, h, 
-    //     CGAL::parameters::face_output_iterator(
-    //       std::back_inserter(patch_faces))
-    //       .vertex_output_iterator(std::back_inserter(patch_vertices))  
+    //     std::back_inserter(patch_faces), std::back_inserter(patch_vertices)
     //   );
     // }
-    if(fairhole) {
-      const bool success = std::get<0>(
-        PMP::triangulate_refine_and_fair_hole(
-          mesh, h, 
-          std::back_inserter(patch_faces), std::back_inserter(patch_vertices)
-        )
-      );
-      if(!success) {
-        Message("Fairing failed.");
-      }
-    } else {
-      PMP::triangulate_and_refine_hole(
-        mesh, h, 
-        std::back_inserter(patch_faces), std::back_inserter(patch_vertices)
-      );
-    }
     //    
     Face_index_map fimap = mesh.add_property_map<face_descriptor, std::size_t>(
       "f:i", 0