add free functions for both versions

Author: amaldevp

Ball_merge_surface_reconstruction/examples/Ball_merge_surface_reconstruction/ball_merge_reconstruction.cpp

@@ -15,38 +15,29 @@ typedef K::Point_3 Point;
 
 int main(int argc, char **argv)
 {
-  double tlen;
   const char *inFilename = argv[1];//Filename
   std::ifstream inStream(inFilename);//Read the file
   std::vector<std::array<unsigned char, 3>> meshVertexColors;//Variable to hold if the input has textures
   Point p;
   double par = atof(argv[2]);//Parameter to check IR
   int option = atoi(argv[3]);//Option to select global and local variants - 1 for global and 0 for local
-  if (argc >= 5)//If local, there is an option to give extra optional parameter to filter long triangles
-    tlen = atof(argv[4]);
-  else
-    tlen = 200.0;//If not provided, default 200 will be taken
+
 
   std::vector<Point> points;
   CGAL::IO::read_points(argv[1], std::back_inserter(points));
 
-  CGAL::Ball_merge_surface_reconstruction<K, CGAL::Parallel_tag> bmsr;
-  bmsr.option=option;
-  bmsr(points, par, tlen);
-
-  // AF: In case of duplicated points the colors of vertices will be wrong
-
-  std::vector<std::vector<int>> meshFaceIndices;
-  bmsr.set_triangle_indices_hull1(meshFaceIndices);
-  std::string st = "BMOut1.ply";
-
-  CGAL::IO::write_polygon_soup(st, points, meshFaceIndices);
-  meshFaceIndices.clear();
-
-  if (option == 1){//Sometimes, in the gloabl case, the largest group would be a mould created by the convex hull, just to avoid it, we will write the second largest group as well
-    bmsr.set_triangle_indices_hull2(meshFaceIndices);
-    st="BMOut2.ply";
-    CGAL::IO::write_polygon_soup(st, points, meshFaceIndices);
+  if (option == 0)
+  {
+    double tlen = (argc >= 5) ? atof(argv[4]) : 200.;
+    std::vector<std::array<int,3>> meshFaceIndices;
+    CGAL::ball_merge_surface_reconstruction_local<CGAL::Parallel_if_available_tag>(points, meshFaceIndices, par, tlen);
+    CGAL::IO::write_polygon_soup("BMOut1.ply", points, meshFaceIndices);
+  }
+  else{
+    std::vector<std::array<int,3>> meshFaceIndices1, meshFaceIndices2;
+    CGAL::ball_merge_surface_reconstruction_global<CGAL::Parallel_if_available_tag>(points, meshFaceIndices1, meshFaceIndices2, par);
+    CGAL::IO::write_polygon_soup("BMOut1.ply", points, meshFaceIndices1);
+    CGAL::IO::write_polygon_soup("BMOut2.ply", points, meshFaceIndices2);
   }
 
   return 0;

Ball_merge_surface_reconstruction/include/CGAL/Ball_merge_surface_reconstruction.h

@@ -168,7 +168,7 @@ class Ball_merge_surface_reconstruction {
 //     }
 // }
 
-void set_triangle_indices_hull1(std::vector<std::vector<int>>& meshFaceIndices) const
+void set_triangle_indices_hull1(std::vector<std::array<int,3>>& meshFaceIndices) const
 {
   std::vector<bool> visited(dt3.number_of_cells(),false);
   for (Cell_handle cell : dt3.finite_cell_handles()){
@@ -177,7 +177,7 @@ void set_triangle_indices_hull1(std::vector<std::vector<int>>& meshFaceIndices)
         //If global, write the cell details of the largest group to the PLY file
         if (cell_groups[cell->info()] == maingroup && (cell_groups[cell->neighbor(i)->info()] != maingroup || dt3.is_infinite(cell->neighbor(i)))){
           //Write the triangles between cells if they have have different labels and one of them is labeled as the same as the largest group
-          std::vector<int> indices(3);
+          std::array<int, 3> indices;
           for (int j = 0; j < 3; ++j){
             indices[j] = cell->vertex((i + 1 + j) % 4)->info();
           }
@@ -193,7 +193,7 @@ void set_triangle_indices_hull1(std::vector<std::vector<int>>& meshFaceIndices)
           if (dt3.is_infinite(cell->neighbor(i))||!_function(cell, cell->neighbor(i)) == 1){
             //If the cells cannot be merged, then write the triangle between these two cells to the PLY file
             visited[cell->info()]=true;
-            std::vector<int> indices(3);
+            std::array<int,3> indices;
             for (int j = 0; j < 3; ++j){
               indices[j] = cell->vertex((i + 1 + j) % 4)->info();
             }
@@ -205,15 +205,15 @@ void set_triangle_indices_hull1(std::vector<std::vector<int>>& meshFaceIndices)
   }
 }
 
-  void set_triangle_indices_hull2(std::vector<std::vector<int>>& meshFaceIndices) const
+  void set_triangle_indices_hull2(std::vector<std::array<int,3>>& meshFaceIndices) const
   {
   for (Cell_handle cell : dt3.finite_cell_handles())
     {
       for (int i = 0; i < 4; ++i)
         if (cell_groups[cell->info()] == secondgroup && (dt3.is_infinite(cell->neighbor(i)) || cell_groups[cell->neighbor(i)->info()] != secondgroup))
         {
           //Write the triangles between cells if they have have different labels and one of them is labeled as the same as the second largest group
-          std::vector<int> indices(3);
+          std::array<int,3> indices;
           for (int j = 0; j < 3; j++)
             indices[j] = cell->vertex((i + 1 + j) % 4)->info();
           if (i%2==1)
@@ -224,6 +224,32 @@ void set_triangle_indices_hull1(std::vector<std::vector<int>>& meshFaceIndices)
   }
 };
 
+/// \ingroup PkgBallMergeRef
+template <class Concurrency_tag, class Traits>
+void ball_merge_surface_reconstruction_local(const std::vector<CGAL::Point_3<Traits>>& points,
+                                             std::vector<std::array<int, 3> >& out_triangles,
+                                             double parameter, double tlen=200.)
+{
+  CGAL::Ball_merge_surface_reconstruction<Traits, Concurrency_tag> bmsr;
+  bmsr.option=0;
+  bmsr(points, parameter, tlen);
+  bmsr.set_triangle_indices_hull1(out_triangles);
+}
+
+/// \ingroup PkgBallMergeRef
+template <class Concurrency_tag, class Traits>
+void ball_merge_surface_reconstruction_global(const std::vector<CGAL::Point_3<Traits>>& points,
+                                              std::vector<std::array<int, 3> >& out_triangles1,
+                                              std::vector<std::array<int, 3> >& out_triangles2,
+                                              double parameter)
+{
+  CGAL::Ball_merge_surface_reconstruction<Traits, Concurrency_tag> bmsr;
+  bmsr.option=1;
+  bmsr(points, parameter, 0);
+  bmsr.set_triangle_indices_hull1(out_triangles1);
+  bmsr.set_triangle_indices_hull2(out_triangles2);
+}
+
 
 } // namespace CGAL