restore is_valid parameter that is responsible to prevent bends

Author: sloriot

PMP_Mesh_repair/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h

@@ -195,7 +195,7 @@ triangulate_hole_polygon_mesh(PolygonMesh& pmesh,
   Tracer_polyhedron<PolygonMesh, OutputIterator> tracer(out, pmesh, P_edges);
 
 #ifndef CGAL_HOLE_FILLING_DO_NOT_USE_CDT2
-  if(use_cdt && triangulate_hole_polyline_with_cdt(P, tracer, visitor, k, max_squared_distance))
+  if(use_cdt && ::CGAL::internal::triangulate_hole_polyline_with_cdt(P, tracer, visitor, is_valid, k, max_squared_distance))
     return std::make_pair(tracer.out, CGAL::internal::Weight_min_max_dihedral_and_area(0,0));
 #endif
   CGAL::internal::Weight_min_max_dihedral_and_area weight =

PMP_Mesh_repair/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h

@@ -1352,12 +1352,14 @@ template <
   typename PointRange, // need size()
   typename Tracer,
   typename Visitor,
+  typename Validity_checker,
   typename Traits
 >
 bool
 triangulate_hole_polyline_with_cdt(const PointRange& points,
                                    Tracer& tracer,
                                    Visitor& visitor,
+                                   const Validity_checker& is_valid,
                                    const Traits& traits,
                                    const typename Traits::FT max_squared_distance)
 {
@@ -1467,6 +1469,12 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
     vertices[v->info()] = v;
   }
 
+  if (vertices.size()!=cdt.number_of_vertices())
+  {
+    visitor.end_planar_phase(false);
+    return false;
+  }
+
   try
   {
     for (std::size_t i = 0; i < size; ++i) {
@@ -1524,7 +1532,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
 
       std::sort(is.begin(), is.end());
       lambda.put(is[0], is[2], is[1]);
-      if (!visitor.accept_triangle(is[0], is[1], is[2]))
+      if (!is_valid(P, is[0], is[1], is[2]))
       {
         // std::cerr << "WARNING: validity, cdt 2 falls back to the original solution!" << std::endl;
         visitor.end_planar_phase(false);

PMP_Mesh_repair/include/CGAL/Polygon_mesh_processing/triangulate_hole.h

@@ -59,20 +59,6 @@ namespace Polygon_mesh_processing {
       constexpr bool accept_triangle(int,int,int) const { return true; }
     #endif
     };
-
-
-#ifndef DOXYGEN_RUNNING
-  // probably not needed if we're using c++17 constexpr
-  struct Default_user_is_face_valid
-  {
-    constexpr
-    bool accept_triangle( int /* v0 */, int /* v1 */, int /* v2 */) const
-    {
-      return true;
-    }
-  };
-#endif
-
   } // namespace Hole_filling
 
   /*!
@@ -793,6 +779,7 @@ bool use_dt3 =
            points,
            tracer,
            visitor,
+           is_valid,
            choose_parameter<Kernel>(get_parameter(np, internal_np::geom_traits)),
            max_squared_distance))
       {

PMP_Mesh_repair/test/PMP_Mesh_repair/triangulate_hole_Polyhedron_3_test.cpp

@@ -438,7 +438,7 @@ struct Hole_filling_visitor
   }
 
 
-  bool accept_face(int i0, int i1, int i2) const
+  bool accept_triangle(int i0, int i1, int i2) const
   {
     auto a =CGAL::make_array(i0,i1,i2);
     std::sort(a.begin(), a.end());
@@ -449,7 +449,7 @@ struct Hole_filling_visitor
 struct Hole_filling_visitor_reject_all
   : public CGAL::Polygon_mesh_processing::Hole_filling::Default_visitor
 {
-  bool accept_face(int , int , int ) const
+  bool accept_triangle(int , int , int ) const
   {
     return false;
   }

PMP_Remeshing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h

@@ -117,13 +117,10 @@ class Triangulate_polygon_mesh_modifier
     typedef CGAL::Triple<int, int, int> Face_indices;
     std::vector<Face_indices> patch;
 
-    auto gt_np = parameters::get_parameter(np, internal_np::geom_traits);
-    auto dt_np = parameters::get_parameter(np, internal_np::use_delaunay_triangulation);
-    auto threshold_np = parameters::get_parameter(np, internal_np::threshold_distance);
-
-    auto new_np = parameters::visitor(visitor)
-                             .use_2d_constrained_delaunay_triangulation(true)
-                             .combine(gt_np, dt_np, threshold_np);
+    // visitor and bool are "replaced" if they already exist in `np` because we will
+    // return the first one seen while unstacking the NP inheritance stack
+    auto new_np = np.visitor(visitor)
+                    .use_2d_constrained_delaunay_triangulation(true);
 
     PMP::triangulate_hole_polyline(hole_points, std::back_inserter(patch), new_np);
 

STL_Extension/include/CGAL/Named_function_parameters.h

@@ -419,19 +419,6 @@ struct Named_function_parameters
     return Named_function_parameters<OT, OTag, self>(np.v,*this).combine(nps...);
   }
 
-  template <typename ... NPS>
-  auto
-  combine(internal_np::Param_not_found, const NPS& ... nps) const
-  {
-    return this->combine(nps...);
-  }
-
-  auto
-  combine(internal_np::Param_not_found) const
-  {
-    return *this;
-  }
-
   // typedef for SFINAE
   typedef int CGAL_Named_function_parameters_class;
 };