From e96b1802c28ebdb0a98d41cec16afdaf7599e374 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 3 Nov 2023 16:54:35 +0100 Subject: [PATCH] use only const ref to sizing function --- .../tetrahedral_adaptive_remeshing_impl.h | 14 ++------ .../include/CGAL/tetrahedral_remeshing.h | 34 ++----------------- 2 files changed, 5 insertions(+), 43 deletions(-) diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h index cb1c7a0a0bf..8954f582281 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h @@ -30,8 +30,6 @@ #include #include -#include - #include namespace CGAL @@ -103,7 +101,7 @@ class Adaptive_remesher private: C3t3 m_c3t3; - SizingFunction& m_sizing; + const SizingFunction& m_sizing; const bool m_protect_boundaries; CellSelector m_cell_selector; Visitor& m_visitor; @@ -114,7 +112,7 @@ private: public: Adaptive_remesher(Triangulation& tr - , SizingFunction& sizing + , const SizingFunction& sizing , const bool protect_boundaries , EdgeIsConstrainedMap ecmap , FacetIsConstrainedMap fcmap @@ -143,7 +141,7 @@ public: } Adaptive_remesher(C3t3& c3t3 - , SizingFunction& sizing + , const SizingFunction& sizing , const bool protect_boundaries , EdgeIsConstrainedMap ecmap , FacetIsConstrainedMap fcmap @@ -176,12 +174,6 @@ public: return m_c3t3_pbackup != NULL; } - void update_adaptive_mode() - { - Update_sizing_field update; - update(m_sizing, tr()); - } - void split() { CGAL_assertion(check_vertex_dimensions()); diff --git a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h index 7af6697a1bf..edc6bc06bce 100644 --- a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h +++ b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h @@ -198,7 +198,7 @@ template void tetrahedral_isotropic_remeshing( CGAL::Triangulation_3& tr, - SizingFunction& sizing, + const SizingFunction& sizing, const NamedParameters& np) { CGAL_assertion(tr.is_valid()); @@ -254,10 +254,6 @@ void tetrahedral_isotropic_remeshing( , cell_select , visitor); - bool adaptive = choose_parameter(get_parameter(np, internal_np::adaptive_sizing_field), false); - if(adaptive) - remesher.update_adaptive_mode(); - #ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE std::cout << "done." << std::endl; #endif @@ -369,7 +365,7 @@ template void tetrahedral_isotropic_remeshing( CGAL::Mesh_complex_3_in_triangulation_3& c3t3, - SizingFunction& sizing, + const SizingFunction& sizing, const NamedParameters& np = parameters::default_values()) { CGAL_assertion(c3t3.triangulation().tds().is_valid()); @@ -447,32 +443,6 @@ void tetrahedral_isotropic_remeshing( #endif } -/*! -* \ingroup PkgTetrahedralRemeshingRef -* remeshes a tetrahedral mesh with an adaptive si -*/ -template -void tetrahedral_adaptive_remeshing( - CGAL::Triangulation_3& tr, - const NamedParameters& np = parameters::default_values()) -{ - using Tr = CGAL::Triangulation_3; - CGAL::Mesh_3::Mesh_sizing_field sizing(tr); - tetrahedral_isotropic_remeshing(tr, sizing, np.adaptive_sizing_field(true)); -} - -template -void tetrahedral_adaptive_remeshing( - CGAL::Mesh_complex_3_in_triangulation_3& c3t3, - const NamedParameters& np = parameters::default_values()) -{ - CGAL::Mesh_3::Mesh_sizing_field sizing(c3t3.triangulation()); - tetrahedral_isotropic_remeshing(c3t3, sizing, np.adaptive_sizing_field(true)); -} - }//end namespace CGAL #endif //TETRAHEDRAL_REMESHING_H