diff --git a/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp b/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp index db5acf0417f..5519e387a8c 100644 --- a/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp +++ b/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp @@ -59,8 +59,9 @@ int main(int argc, char* argv[]) //! [move ccdt to tr] namespace np = CGAL::parameters; - Tr tr = CGAL::convert_to_triangulation_3(std::move(ccdt), - np::edge_is_constrained_map(constraints_pmap)); + namespace Tet_remesh = CGAL::Tetrahedral_remeshing; + Tr tr = Tet_remesh::get_remeshing_triangulation(std::move(ccdt), + np::edge_is_constrained_map(constraints_pmap)); //! [move ccdt to tr] std::cout << "Number of vertices in tr: " << tr.number_of_vertices() << std::endl; diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h index 0444b9367f2..3375ec6513c 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h @@ -3977,6 +3977,8 @@ protected: #endif // DOXYGEN_RUNNING +namespace Tetrahedral_remeshing { + /*! * \ingroup PkgConstrainedTriangulation3Functions * creates a triangulation that can be used for \ref Chapter_Tetrahedral_Remeshing "tetrahedral remeshing". @@ -4015,7 +4017,7 @@ protected: * \return a triangulation of type `CGAL::Triangulation_3` that can be used for tetrahedral remeshing */ template -auto convert_to_triangulation_3(Conforming_constrained_Delaunay_triangulation_3 ccdt, +auto get_remeshing_triangulation(Conforming_constrained_Delaunay_triangulation_3 ccdt, const CGAL_NP_CLASS& np = parameters::default_values()) -> CGAL::Triangulation_3::Triangulation:: @@ -4127,6 +4129,8 @@ auto convert_to_triangulation_3(Conforming_constrained_Delaunay_triangulation_3< return tr; } +} // end namespace Tetrahedral_remeshing + } // end CGAL #endif // CGAL_CONSTRAINED_DELAUNAY_TRIANGULATION_3_H diff --git a/Constrained_triangulation_3/test/Constrained_triangulation_3/test_ccdt_remeshing.cpp b/Constrained_triangulation_3/test/Constrained_triangulation_3/test_ccdt_remeshing.cpp index 8747503a1d1..e799250049e 100644 --- a/Constrained_triangulation_3/test/Constrained_triangulation_3/test_ccdt_remeshing.cpp +++ b/Constrained_triangulation_3/test/Constrained_triangulation_3/test_ccdt_remeshing.cpp @@ -46,7 +46,8 @@ int main(int argc, char* argv[]) assert(cdt.number_of_constrained_facets() == cdt2.number_of_constrained_facets()); assert(cdt.number_of_constrained_facets() > mesh.num_faces()); - Tr tr = CGAL::convert_to_triangulation_3(std::move(cdt)); + namespace Tet_remesh = CGAL::Tetrahedral_remeshing; + Tr tr = Tet_remesh::get_remeshing_triangulation(std::move(cdt)); CGAL::tetrahedral_isotropic_remeshing(tr, 2., CGAL::parameters::number_of_iterations(3) diff --git a/Lab/demo/Lab/Plugins/CDT_3/CDT_3_plugin.cpp b/Lab/demo/Lab/Plugins/CDT_3/CDT_3_plugin.cpp index 06923ddf72f..42fad3518f0 100644 --- a/Lab/demo/Lab/Plugins/CDT_3/CDT_3_plugin.cpp +++ b/Lab/demo/Lab/Plugins/CDT_3/CDT_3_plugin.cpp @@ -145,7 +145,8 @@ class CDT_3_plugin : public QObject, public CGAL_Lab_plugin_interface auto triangulation_item = std::make_unique(); auto& item_tr = triangulation_item->triangulation(); - const auto cdt_tr = CGAL::convert_to_triangulation_3(std::move(cdt)); + namespace Tet_remesh = CGAL::Tetrahedral_remeshing; + const auto cdt_tr = Tet_remesh::get_remeshing_triangulation(std::move(cdt)); auto inf_v = item_tr.tds().copy_tds(cdt_tr.tds(), cdt_tr.infinite_vertex(), Vertex_converter(&cdt), Cell_converter()); item_tr.set_infinite_vertex(inf_v);