diff --git a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp index 85d9d5dfaed0..337fc5c933a7 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp @@ -73,6 +73,7 @@ class Mesh_3_plugin : Q_PROPERTY(double edges_approx READ get_edges_approx WRITE set_edges_approx) Q_PROPERTY(double facets_sizing READ get_facets_sizing WRITE set_facets_sizing) Q_PROPERTY(double approx READ get_approx WRITE set_approx) + Q_PROPERTY(double facet_normal_angle READ get_facet_normal_angle WRITE set_facet_normal_angle) Q_PROPERTY(double tets_sizing READ get_tets_sizing WRITE set_tets_sizing) Q_PROPERTY(double tets_shape READ get_tets_shape WRITE set_tets_shape) Q_PROPERTY(bool protect_features READ get_protect_features WRITE set_protect_features) @@ -160,6 +161,7 @@ public Q_SLOTS: void set_edges_approx(const double v) { edges_approx = v; }; void set_facets_sizing(const double v) { facets_sizing = v; }; void set_approx(const double v) { approx = v; }; + void set_facet_normal_angle(const double v) { facet_normal_angle = v; }; void set_tets_sizing(const double v) { tets_sizing = v; }; void set_tets_shape(const double v) { tets_shape = v; }; void set_manifold_criterion(const bool v) { manifold_criterion = v; } @@ -174,6 +176,7 @@ public Q_SLOTS: double get_edges_approx() { return edges_approx; }; double get_facets_sizing() { return facets_sizing; }; double get_approx() { return approx; }; + double get_facet_normal_angle() { return facet_normal_angle; }; double get_tets_sizing() { return tets_sizing; }; double get_tets_shape() { return tets_shape; }; bool get_manifold_criterion() { return manifold_criterion; }; @@ -253,6 +256,7 @@ public Q_SLOTS: int sizing_decimals; double approx; int approx_decimals; + double facet_normal_angle; double edges_sizing; double edges_min_sizing; double edges_approx; @@ -486,6 +490,7 @@ void Mesh_3_plugin::set_defaults() { facets_sizing = default_sizing; facets_min_sizing = 0.1 * default_sizing; angle = 25.; + facet_normal_angle = 90.; //tetrahedra parameters tets_sizing = default_sizing; tets_min_sizing = 0.1 * default_sizing; @@ -564,10 +569,11 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, connect(ui.protect, SIGNAL(toggled(bool)), ui.noEdgeApprox, SLOT(setEnabled(bool))); //triangle parameters - Setup_ui_row s5(ui.approxLabel, ui.approx, diag * 10e-7, diag, approx, {ui.noApprox}); - Setup_ui_row s6(ui.sizingLabel, ui.facetSizing, diag * 10e-6, diag, facets_sizing, {ui.noFacetSizing}); - Setup_ui_row s7(ui.sizingMinLabel, ui.facetMinSizing, diag * 10e-6, diag, facets_min_sizing, {ui.noFacetMinSizing}); - Setup_ui_row s8(ui.angleLabel, ui.facetAngle, 0.0, 30.0, angle, {ui.noAngle}); + Setup_ui_row s5( ui.approxLabel, ui.approx, diag * 10e-7, diag, approx, {ui.noApprox}); + Setup_ui_row s6( ui.sizingLabel, ui.facetSizing, diag * 10e-6, diag, facets_sizing, {ui.noFacetSizing}); + Setup_ui_row s7( ui.sizingMinLabel, ui.facetMinSizing, diag * 10e-6, diag, facets_min_sizing, {ui.noFacetMinSizing}); + Setup_ui_row s8( ui.angleLabel, ui.facetAngle, 0.0, 30.0, angle, {ui.noAngle}); + Setup_ui_row s8b(ui.facetNormalAngleLabel, ui.facetNormalAngle, 0.0, 180., facet_normal_angle,{ui.noFacetNormalAngle}); //tetrahedra parameters Setup_ui_row s9(ui.tetSizingLabel, ui.tetSizing, diag * 10e-6, diag, tets_sizing, {ui.noTetSizing}); @@ -700,6 +706,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, facets_sizing = !ui.noFacetSizing->isChecked() ? 0 : ui.facetSizing->value(); facets_min_sizing = !ui.noFacetMinSizing->isChecked() ? 0 : ui.facetMinSizing->value(); approx = !ui.noApprox->isChecked() ? 0 : ui.approx->value(); + facet_normal_angle = !ui.noFacetNormalAngle->isChecked() ? 0 : ui.facetNormalAngle->value(); tets_shape = !ui.noTetShape->isChecked() ? 0 : ui.tetShape->value(); tets_sizing = !ui.noTetSizing->isChecked() ? 0 : ui.tetSizing->value(); tets_min_sizing = !ui.noTetMinSizing->isChecked() ? 0 : ui.tetMinSizing->value(); @@ -777,6 +784,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, facets_sizing, facets_min_sizing, approx, + facet_normal_angle, tets_sizing, tets_min_sizing, edges_sizing, @@ -800,6 +808,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, facets_sizing, facets_min_sizing, approx, + facet_normal_angle, tets_sizing, tets_min_sizing, edges_sizing, @@ -828,6 +837,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, facets_sizing, facets_min_sizing, approx, + facet_normal_angle, tets_sizing, tets_min_sizing, edges_sizing, @@ -871,6 +881,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type, facets_sizing, facets_min_sizing, approx, + facet_normal_angle, tets_sizing, tets_min_sizing, edges_sizing, diff --git a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp index d1e560c5aa7b..be5dcc14f124 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp @@ -28,6 +28,7 @@ Meshing_thread* cgal_code_mesh_3(QList pMeshes, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -48,7 +49,8 @@ Meshing_thread* cgal_code_mesh_3(QList pMeshes, << " edge min size bound: " << edge_min_size << std::endl << " edge distance bound: " << edge_distance << std::endl << " facets size bound: " << facet_sizing << std::endl - << " approximation bound: " << facet_approx << std::endl; + << " approximation bound: " << facet_approx << std::endl + << " normal angle bound: " << facet_normal_angle << std::endl; if (!surface_only) std::cerr << " tetrahedra size bound: " << tet_sizing << std::endl; @@ -99,13 +101,15 @@ Meshing_thread* cgal_code_mesh_3(QList pMeshes, "
  • Edge min size bound: %3
  • " "
  • Edge distance bound: %4
  • " "
  • Facets size bound: %5
  • " - "
  • Approximation bound: %6
  • ") + "
  • Approximation bound: %6
  • " + "
  • Normal angle bound: %7
  • ") .arg(facet_angle) .arg(edge_size) .arg(edge_min_size) .arg(edge_distance) .arg(facet_sizing) - .arg(facet_approx); + .arg(facet_approx) + .arg(facet_normal_angle); if (!surface_only) tooltip += QString("
  • Tetrahedra size bound: %1
  • " ) .arg(tet_sizing); @@ -116,6 +120,7 @@ Meshing_thread* cgal_code_mesh_3(QList pMeshes, param.facet_angle = facet_angle; param.facet_sizing = facet_sizing; param.facet_approx = facet_approx; + param.facet_normal_angle = facet_normal_angle; param.tet_sizing = tet_sizing; param.facet_min_sizing = facet_min_sizing; param.tet_min_sizing = tet_min_sizing; @@ -143,6 +148,7 @@ Meshing_thread* cgal_code_mesh_3(const QList pMeshes, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -163,7 +169,8 @@ Meshing_thread* cgal_code_mesh_3(const QList pMeshes, << " edge min size bound: " << edge_min_size << std::endl << " edge distance bound: " << edge_distance << std::endl << " facets size bound: " << facet_sizing << std::endl - << " approximation bound: " << facet_approx << std::endl; + << " approximation bound: " << facet_approx << std::endl + << " normal angle bound: " << facet_normal_angle << std::endl; if (!surface_only) std::cerr << " tetrahedra size bound: " << tet_sizing << std::endl; @@ -209,13 +216,15 @@ Meshing_thread* cgal_code_mesh_3(const QList pMeshes, "
  • Edge min size bound :%3
  • " "
  • Edge distance bound: %4
  • " "
  • Facets size bound: %5
  • " - "
  • Approximation bound: %6
  • ") + "
  • Approximation bound: %6
  • " + "
  • Normal angle bound: %7
  • ") .arg(facet_angle) .arg(edge_size) .arg(edge_min_size) .arg(edge_distance) .arg(facet_sizing) - .arg(facet_approx); + .arg(facet_approx) + .arg(facet_normal_angle); if (!surface_only) tooltip += QString("
  • Tetrahedra size bound: %1
  • ") .arg(tet_sizing); @@ -226,6 +235,7 @@ Meshing_thread* cgal_code_mesh_3(const QList pMeshes, param.facet_angle = facet_angle; param.facet_sizing = facet_sizing; param.facet_approx = facet_approx; + param.facet_normal_angle = facet_normal_angle; param.tet_sizing = tet_sizing; param.facet_min_sizing = facet_min_sizing; param.tet_min_sizing = tet_min_sizing; @@ -254,6 +264,7 @@ Meshing_thread* cgal_code_mesh_3(const Implicit_function_interface* pfunction, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -286,6 +297,7 @@ Meshing_thread* cgal_code_mesh_3(const Implicit_function_interface* pfunction, param.facet_sizing = facet_sizing; param.facet_min_sizing = facet_min_sizing; param.facet_approx = facet_approx; + param.facet_normal_angle = facet_normal_angle; param.tet_sizing = tet_sizing; param.tet_min_sizing = tet_min_sizing; param.tet_shape = tet_shape; @@ -319,6 +331,7 @@ Meshing_thread* cgal_code_mesh_3(const Image* pImage, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -348,6 +361,7 @@ Meshing_thread* cgal_code_mesh_3(const Image* pImage, param.facet_sizing = facet_sizing; param.facet_min_sizing = facet_min_sizing; param.facet_approx = facet_approx; + param.facet_normal_angle = facet_normal_angle; param.tet_sizing = tet_sizing; param.tet_min_sizing = tet_min_sizing; param.facet_min_sizing = facet_min_sizing; @@ -368,13 +382,15 @@ Meshing_thread* cgal_code_mesh_3(const Image* pImage, "
  • Edge min size bound: %3
  • " "
  • Edge distance bound: %4
  • " "
  • Facets size bound: %5
  • " - "
  • Approximation bound: %6
  • ") + "
  • Approximation bound: %6
  • " + "
  • Normal angle bound: %7
  • ") .arg(facet_angle) .arg(edge_size) .arg(edge_min_size) .arg(edge_distance) .arg(facet_sizing) - .arg(facet_approx); + .arg(facet_approx) + .arg(facet_normal_angle); if (!surface_only) tooltip += QString("
  • Tetrahedra size bound: %1
  • ") .arg(tet_sizing); diff --git a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h index fbc12778783f..def0a5bd558e 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h @@ -28,6 +28,7 @@ Meshing_thread* cgal_code_mesh_3(QList pMeshes, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -47,6 +48,7 @@ Meshing_thread* cgal_code_mesh_3(const QList pMeshes, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -65,6 +67,7 @@ Meshing_thread* cgal_code_mesh_3(const Implicit_function_interface* pfunction, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, @@ -82,6 +85,7 @@ Meshing_thread* cgal_code_mesh_3(const CGAL::Image_3* pImage, const double facet_sizing, const double facet_min_sizing, const double facet_approx, + const double facet_normal_angle, const double tet_sizing, const double tet_min_sizing, const double edge_size, diff --git a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h index 6c3717c6560b..425426295ee3 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h @@ -60,6 +60,7 @@ struct Mesh_parameters double facet_sizing; double facet_min_sizing; double facet_approx; + double facet_normal_angle; double tet_shape; double tet_sizing; @@ -175,6 +176,8 @@ log() const res << QString("facet min size: %1").arg(facet_min_sizing); if(is_valid(facet_approx)) res << QString("facet approx error: %1").arg(facet_approx); + if(is_valid(facet_normal_angle)) + res << QString("facet normal angle: %1").arg(facet_normal_angle); if(is_valid(tet_shape)) res << QString("tet shape (radius-edge): %1").arg(tet_shape); if(is_valid(tet_sizing)) @@ -394,7 +397,8 @@ launch() p_.facet_sizing, p_.facet_approx, CGAL::FACET_VERTICES_ON_SURFACE, - p_.facet_min_sizing), + p_.facet_min_sizing, + p_.facet_normal_angle), Cell_criteria(p_.tet_shape, p_.tet_sizing, p_.tet_min_sizing)); diff --git a/Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui index 0b61973d3394..795182bdef3b 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui +++ b/Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui @@ -24,7 +24,7 @@ - QLayout::SetFixedSize + QLayout::SizeConstraint::SetFixedSize @@ -55,13 +55,13 @@ - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight &Detect all connected components - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter detectComponents @@ -78,7 +78,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -94,7 +94,7 @@ - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight Sharp features @@ -106,7 +106,7 @@ Edge min size - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -116,7 +116,7 @@ &Protect sharp edges - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter protect @@ -146,7 +146,7 @@ Edge approximation error - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -156,7 +156,7 @@ Edge &size - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter edgeSizing @@ -172,7 +172,7 @@ Angle bound for &sharp edges (deg) - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter sharpEdgesAngle @@ -238,10 +238,10 @@ false - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Plain + QFrame::Shadow::Plain @@ -263,7 +263,7 @@ - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft &manifold @@ -283,7 +283,7 @@ - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft force facets vertices on same surface patch @@ -299,7 +299,7 @@ Approximation &error - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter approx @@ -325,7 +325,7 @@ Facet min. &angle (deg) - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter facetAngle @@ -362,7 +362,7 @@ &Facet max. size - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter facetSizing @@ -395,7 +395,7 @@ - + Facet min. size @@ -416,6 +416,33 @@ + + + + Facet normal angle + + + false + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + 90.00 + + + + + + + + + + @@ -445,7 +472,7 @@ &Tetrahedron max. size - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter tetSizing @@ -484,11 +511,11 @@ Tetrahedron shape (radius-edge ratio) - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - + Tetrahedron min. size @@ -530,7 +557,7 @@ if unchecked, value inside the domain is greater than isovalue - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight @@ -546,26 +573,26 @@ image value outside the image bounding box - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight Value outside - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight Iso value - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -575,7 +602,7 @@ Value inside is less than iso value - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -605,20 +632,20 @@ - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft Use Weighted Image - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight @@ -640,7 +667,7 @@ Sigma - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -664,10 +691,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h index d650b6bea15e..587942e48bd0 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h +++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h @@ -100,6 +100,9 @@ class Refine_facets_manifold_base std::optional m_squared_facet_min_size ; private: + const C3t3& c3t3() const { return this->r_c3t3_; } + const Tr& tr() const { return this->r_tr_; } + // computes and return an ordered pair of Vertex EdgeVV make_edgevv(const Vertex_handle vh1, const Vertex_handle vh2) const { @@ -120,7 +123,7 @@ class Refine_facets_manifold_base int index1=0, index2=0; // initialize to avoid g++ 4.8 -Wmaybe-uninitialized CGAL_assume_code(bool is_edge =) - this->r_tr_.is_edge(v1, v2, c, index1, index2); + tr().is_edge(v1, v2, c, index1, index2); CGAL_assume(is_edge); return make_triple( c, index1, index2 ); @@ -132,33 +135,49 @@ class Refine_facets_manifold_base arete.first->vertex(arete.third) ); } + bool is_bad_edge(const Edge& e) const + { + const auto face_status = c3t3().face_status(e); + if(face_status != C3t3::SINGULAR && (m_with_boundary || face_status != C3t3::BOUNDARY)) + return false; + return !c3t3().is_in_complex(e); // protected feature edge: non-manifold by design + } + + bool is_bad_vertex(const Vertex_handle v) const + { + if(v->in_dimension() <= 1) + return false; // on a protected curve or corner + return c3t3().has_incident_facets_in_complex(v) + && c3t3().face_status(v) == C3t3::SINGULAR; + } + FT compute_sq_distance_to_facet_center(const Facet& f, const Vertex_handle v) const { - typename GT::Compute_weight_3 cw = this->r_tr_.geom_traits().compute_weight_3_object(); - typename GT::Construct_point_3 cp = this->r_tr_.geom_traits().construct_point_3_object(); + typename GT::Compute_weight_3 cw = tr().geom_traits().compute_weight_3_object(); + typename GT::Construct_point_3 cp = tr().geom_traits().construct_point_3_object(); - const Bare_point& fcenter = this->r_c3t3_.surface_center(f.first, f.second); - const Weighted_point& wp = this->r_tr_.point(v); + const Bare_point& fcenter = c3t3().surface_center(f.first, f.second); + const Weighted_point& wp = tr().point(v); - return Th().min_squared_distance(this->r_tr_, fcenter, cp(wp)) - cw(wp); + return Th().min_squared_distance(tr(), fcenter, cp(wp)) - cw(wp); } std::pair biggest_incident_facet_in_complex(const Vertex_handle v) const { #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS - std::cerr << "Bad vertex: " << this->r_tr_.point(v) << std::endl; + std::cerr << "Bad vertex: " << tr().point(v) << std::endl; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::vector facets; facets.reserve(64); - if(this->r_tr_.is_parallel()) - this->r_tr_.incident_facets_threadsafe(v, std::back_inserter(facets)); + if(tr().is_parallel()) + tr().incident_facets_threadsafe(v, std::back_inserter(facets)); else - this->r_tr_.incident_facets(v, std::back_inserter(facets)); + tr().incident_facets(v, std::back_inserter(facets)); typename std::vector::iterator fit = facets.begin(); - while(fit != facets.end() && !this->r_c3t3_.is_in_complex(*fit)) ++fit; + while(fit != facets.end() && !c3t3().is_in_complex(*fit)) ++fit; CGAL_assertion(fit!=facets.end()); CGAL_assertion_code(int facet_counter = 1); @@ -169,7 +188,7 @@ class Refine_facets_manifold_base << " incident faces, with squared sizes:\n"; std::cerr << " " << biggest_sq_dist << "\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS - while(fit != facets.end() && !this->r_c3t3_.is_in_complex(*fit)) ++fit; + while(fit != facets.end() && !c3t3().is_in_complex(*fit)) ++fit; for (; fit != facets.end(); ) { @@ -187,10 +206,10 @@ class Refine_facets_manifold_base biggest_sq_dist = current_sq_dist; } ++fit; - while(fit != facets.end() && !this->r_c3t3_.is_in_complex(*fit)) ++fit; + while(fit != facets.end() && !c3t3().is_in_complex(*fit)) ++fit; } CGAL_assertion(v->cached_number_of_incident_facets() == facet_counter); - CGAL_assertion(this->r_c3t3_.is_in_complex(biggest_facet)); + CGAL_assertion(c3t3().is_in_complex(biggest_facet)); #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::cerr << "Biggest facet squared radius: " << biggest_sq_dist @@ -208,12 +227,12 @@ class Refine_facets_manifold_base // use the list of incident facets in the complex Vertex_handle fev = edge_to_edgevv(arete).first; #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS - std::cerr << "Bad edge: (" << this->r_tr_.point(fev) - << ", " << this->r_tr_.point(arete.first->vertex(arete.third)) + std::cerr << "Bad edge: (" << tr().point(fev) + << ", " << tr().point(arete.first->vertex(arete.third)) << ")\n incident facets squared sizes:\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS - Tr_facet_circulator fcirc = this->r_tr_.incident_facets(arete); - while(!this->r_c3t3_.is_in_complex(*fcirc)) ++fcirc; + Tr_facet_circulator fcirc = tr().incident_facets(arete); + while(!c3t3().is_in_complex(*fcirc)) ++fcirc; Facet first_facet = *fcirc; Facet biggest_facet = *fcirc; FT biggest_sq_dist = compute_sq_distance_to_facet_center(biggest_facet, @@ -225,7 +244,7 @@ class Refine_facets_manifold_base for (++fcirc; *fcirc != first_facet; ++fcirc) { - while(!this->r_c3t3_.is_in_complex(*fcirc)) ++fcirc; + while(!c3t3().is_in_complex(*fcirc)) ++fcirc; if(*fcirc == first_facet) break; const FT current_sq_dist = compute_sq_distance_to_facet_center(*fcirc, fev); @@ -272,14 +291,14 @@ class Refine_facets_manifold_base #endif // CGAL_LINKED_WITH_TBB { //Sequential - if ( this->r_c3t3_.is_in_complex(f) ) { + if ( c3t3().is_in_complex(f) ) { // foreach edge of f const Cell_handle cell = f.first; const int i = f.second; for(int j = 0; j < 3; ++j) { - const int edge_index_va = this->r_tr_.vertex_triple_index(i, j); - const int edge_index_vb = this->r_tr_.vertex_triple_index(i, (j == 2) ? 0 : (j+1)); + const int edge_index_va = tr().vertex_triple_index(i, j); + const int edge_index_vb = tr().vertex_triple_index(i, (j == 2) ? 0 : (j+1)); const Vertex_handle edge_va = cell->vertex(edge_index_va); const Vertex_handle edge_vb = cell->vertex(edge_index_vb); m_bad_edges.left.erase( make_edgevv(edge_va, edge_vb)); @@ -310,7 +329,7 @@ class Refine_facets_manifold_base if(m_bad_vertices.erase(c->vertex(j)) > 0) { #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::cerr << "m_bad_vertices.erase(" - << this->r_tr_.point(c, j) << ")\n"; + << tr().point(c, j) << ")\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS } } @@ -368,12 +387,10 @@ class Refine_facets_manifold_base int n = 0; #endif for (typename Tr::Finite_edges_iterator - eit = this->r_tr_.finite_edges_begin(), end = this->r_tr_.finite_edges_end(); + eit = tr().finite_edges_begin(), end = tr().finite_edges_end(); eit != end; ++eit) { - if ( (this->r_c3t3_.face_status(*eit) == C3t3::SINGULAR) || - ( (!m_with_boundary) && - (this->r_c3t3_.face_status(*eit) == C3t3::BOUNDARY) ) ) + if (is_bad_edge(*eit)) { const auto [biggest_f, sq_dist] = biggest_incident_facet_in_complex(*eit); if (is_smaller_than_min_size(sq_dist)) @@ -388,7 +405,7 @@ class Refine_facets_manifold_base #endif // CGAL_LINKED_WITH_TBB { // Sequential m_bad_edges.insert(Bad_edge(edge_to_edgevv(*eit), - (this->r_c3t3_.face_status(*eit) == + (c3t3().face_status(*eit) == C3t3::SINGULAR ? 0 : 1))); } #ifdef CGAL_MESH_3_VERBOSE @@ -412,11 +429,11 @@ class Refine_facets_manifold_base int n = 0; #endif for (typename Tr::Finite_vertices_iterator - vit = this->r_tr_.finite_vertices_begin(), - end = this->r_tr_.finite_vertices_end(); + vit = tr().finite_vertices_begin(), + end = tr().finite_vertices_end(); vit != end; ++vit) { - if( this->r_c3t3_.face_status(vit) == C3t3::SINGULAR ) + if( is_bad_vertex(vit)) { const auto [biggest_f, sq_dist] = biggest_incident_facet_in_complex(vit); if (is_smaller_than_min_size(sq_dist)) @@ -424,7 +441,7 @@ class Refine_facets_manifold_base #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::cerr << "m_bad_vertices.insert(" - << this->r_tr_.point(vit) << ")\n"; + << tr().point(vit) << ")\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS #ifdef CGAL_LINKED_WITH_TBB // Parallel @@ -448,9 +465,9 @@ class Refine_facets_manifold_base std::cerr << "Bad vertices queue:\n"; for(Vertex_handle v2 : m_bad_vertices) { - std::cerr << this->r_tr_.point(v2) << std::endl; + std::cerr << tr().point(v2) << std::endl; } - CGAL::dump_c3t3(this->r_c3t3_, "dump-at-scan-vertices"); + CGAL::dump_c3t3(c3t3(), "dump-at-scan-vertices"); # endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS #endif } @@ -478,7 +495,7 @@ class Refine_facets_manifold_base #endif // not defined CGAL_NO_ATOMIC if(this->m_maximal_number_of_vertices_ !=0 && - this->r_tr_.number_of_vertices() >= + tr().number_of_vertices() >= this->m_maximal_number_of_vertices_) { return true; @@ -509,9 +526,9 @@ class Refine_facets_manifold_base #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS const EdgeVV& edgevv = m_bad_edges.right.begin()->second; std::cerr << "Bad edge " - << this->r_tr_.point(edgevv.first) + << tr().point(edgevv.first) << " - " - << this->r_tr_.point(edgevv.second) + << tr().point(edgevv.second) << "\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS return biggest_incident_facet_in_complex(first_bad_edge).first; @@ -522,14 +539,14 @@ class Refine_facets_manifold_base std::cerr << "Bad vertices queue:\n"; for(Vertex_handle v2 : m_bad_vertices) { - std::cerr << this->r_tr_.point(v2) << std::endl; + std::cerr << tr().point(v2) << std::endl; } - std::cerr << "Bad vertex " << this->r_tr_.point(v) << "\n"; + std::cerr << "Bad vertex " << tr().point(v) << "\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS - CGAL_assertion(this->r_c3t3_.has_incident_facets_in_complex(v)); - if(this->r_c3t3_.face_status(v) != C3t3::SINGULAR) { - dump_c3t3(this->r_c3t3_, "dump-crash"); - CGAL_error_msg("this->r_c3t3_.face_status(v) != C3t3::SINGULAR"); + CGAL_assertion(c3t3().has_incident_facets_in_complex(v)); + if(c3t3().face_status(v) != C3t3::SINGULAR) { + dump_c3t3(c3t3(), "dump-crash"); + CGAL_error_msg("c3t3().face_status(v) != C3t3::SINGULAR"); } return biggest_incident_facet_in_complex(v).first; } @@ -564,7 +581,7 @@ class Refine_facets_manifold_base typedef std::vector Facets; Facets facets; facets.reserve(64); - this->r_tr_.incident_facets (v, std::back_inserter(facets)); + tr().incident_facets (v, std::back_inserter(facets)); // foreach f in star(v) for (typename Facets::iterator fit = facets.begin(); @@ -576,11 +593,11 @@ class Refine_facets_manifold_base const int i = fit->second; for(int j = 0; j < 3; ++j) { - const int edge_index_va = this->r_tr_.vertex_triple_index(i, j); - const int edge_index_vb = this->r_tr_.vertex_triple_index(i, (j == 2) ? 0 : (j+1)); + const int edge_index_va = tr().vertex_triple_index(i, j); + const int edge_index_vb = tr().vertex_triple_index(i, (j == 2) ? 0 : (j+1)); Edge edge(cell, edge_index_va, edge_index_vb); // test if edge is in Complex - if ( this->r_c3t3_.face_status(edge) != C3t3::NOT_IN_COMPLEX ) { + if ( c3t3().face_status(edge) != C3t3::NOT_IN_COMPLEX ) { // test if edge is not regular to store it as a "bad_edge" // e.g., more than or equal to 3 incident facets (SINGULAR) // or less than or equal to 1 @@ -588,10 +605,7 @@ class Refine_facets_manifold_base // This test is not efficient because // edges are tried to be inserted several times // TODO one day: test if the edge is still singular - if ( (this->r_c3t3_.face_status(edge) == C3t3::SINGULAR) || - ( (!m_with_boundary) && - (this->r_c3t3_.face_status(edge) == C3t3::BOUNDARY) ) - ) + if(is_bad_edge(edge)) { const auto [biggest_f, sq_dist] = biggest_incident_facet_in_complex(edge); if (is_smaller_than_min_size(sq_dist)) @@ -607,7 +621,7 @@ class Refine_facets_manifold_base #endif // CGAL_LINKED_WITH_TBB { // Sequential m_bad_edges.insert(Bad_edge(edge_to_edgevv(edge), - (this->r_c3t3_.face_status(edge) == + (c3t3().face_status(edge) == C3t3::SINGULAR ? 0 : 1))); } } @@ -629,7 +643,7 @@ class Refine_facets_manifold_base // foreach v' in star of v std::vector vertices; vertices.reserve(64); - this->r_tr_.incident_vertices(v, std::back_inserter(vertices)); + tr().incident_vertices(v, std::back_inserter(vertices)); // is_regular_or_boundary_for_vertices // is used here also incident edges are not known to be @@ -640,10 +654,7 @@ class Refine_facets_manifold_base vit = vertices.begin(), end = vertices.end(); vit != end; ++vit) { - if ( this->r_c3t3_.has_incident_facets_in_complex(*vit) && - (this->r_c3t3_.face_status(*vit) == C3t3::SINGULAR) - // !this->r_c3t3_.is_regular_or_boundary_for_vertices(*vit) - ) + if (is_bad_vertex(*vit)) { const auto [biggest_f, sq_dist] = biggest_incident_facet_in_complex(*vit); if (is_smaller_than_min_size(sq_dist)) @@ -651,7 +662,7 @@ class Refine_facets_manifold_base #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::cerr << "m_bad_vertices.insert(" - << this->r_tr_.point(*vit) << ")\n"; + << tr().point(*vit) << ")\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS #ifdef CGAL_LINKED_WITH_TBB // Parallel @@ -667,10 +678,7 @@ class Refine_facets_manifold_base } } - if ( this->r_c3t3_.has_incident_facets_in_complex(v) && - (this->r_c3t3_.face_status(v) == C3t3::SINGULAR) - // !this->r_c3t3_.is_regular_or_boundary_for_vertices(v) - ) + if (is_bad_vertex(v)) { const auto [biggest_f, sq_dist] = biggest_incident_facet_in_complex(v); if (is_smaller_than_min_size(sq_dist)) @@ -678,7 +686,7 @@ class Refine_facets_manifold_base #ifdef CGAL_MESHES_DEBUG_REFINEMENT_POINTS std::cerr << "m_bad_vertices.insert(" - << this->r_tr_.point(v) << ")\n"; + << tr().point(v) << ")\n"; #endif // CGAL_MESHES_DEBUG_REFINEMENT_POINTS #ifdef CGAL_LINKED_WITH_TBB // Parallel diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h index 798fc30a2ea2..7915984bb03b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h +++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h @@ -25,6 +25,7 @@ #include #include +#include #include // for to_double @@ -638,7 +639,110 @@ public Mesh_3::Abstract_criterion }; // end class Facet_on_same_surface_criterion +template +class Facet_normal_angle_criterion +: public Mesh_3::Abstract_criterion +{ + typedef typename C3T3::Triangulation Tr; + typedef typename Tr::Geom_traits::FT FT; + typedef typename Tr::Geom_traits::Vector_3 Vector_3; + + typedef typename Tr::Cell_handle Cell_handle; + typedef typename Tr::Facet Facet; + typedef typename Tr::Edge Edge; + + typedef Mesh_3::Abstract_criterion Base; + typedef typename Base::Quality Quality; + typedef typename Base::Is_bad Is_bad; + + typedef Facet_normal_angle_criterion Self; + +public: + /// Constructor + Facet_normal_angle_criterion(const FT& bound_degrees) + : cosine_bound_(std::cos(CGAL::to_double(bound_degrees * CGAL_PI / 180.0))) + {} + + /// Destructor + virtual ~Facet_normal_angle_criterion() {} + +protected: + virtual void do_accept(Visitor_& v) const { v.visit(*this); } + + virtual Self* do_clone() const + { + // Call copy ctor on this + return new Self(*this); + } + + virtual Is_bad do_is_bad(const C3T3& c3t3, const Facet& f) const + { + CGAL_assertion(c3t3.is_in_complex(f)); + CGAL_assertion(cosine_bound_ <= FT(1)); + + using T3_utils = CGAL::Triangulation_utils_3; + + const Tr& tr = c3t3.triangulation(); + auto cp = tr.geom_traits().construct_point_3_object(); + auto compare_angle = tr.geom_traits().compare_angle_3_object(); + + const Cell_handle start_cell = f.first; + + // for each of the 3 neighboring facets, compute unit normal n2 and compare with nf + for(const Edge& e : tr.edges(f)) + { + if(c3t3.is_in_complex(e)) + continue; + + const auto& [vs, vt] = tr.vertices(e); + Cell_handle cell = start_cell; + do + { + int next_index = T3_utils::next_around_edge(cell->index(vs), cell->index(vt)); + + if(cell->neighbor(next_index) == f.first) + break; // we have come back to the original facet, stop + + if(c3t3.is_in_complex(cell, next_index)) + { + Facet f2(cell, next_index); + + const auto& vf = tr.vertices(f); + const auto& vf2 = tr.vertices(f2); + // compare the angle between the two normals, using the 3 points of each facet + // with the cosine bound + auto res = compare_angle(cp(tr.point(vf[0])), + cp(tr.point(vf[1])), + cp(tr.point(vf[2])), + cp(tr.point(vf2[0])), + cp(tr.point(vf2[1])), + cp(tr.point(vf2[2])), + cosine_bound_); + + // if res == SMALLER, then the angles between the 2 normals is smaller than the bound + // and the triangulation is "flat enough" + // otherwise : + if(res == CGAL::LARGER) + { +#ifdef CGAL_MESH_3_DEBUG_FACET_CRITERIA + std::cerr << "Bad facet (max cos dh variation = " << cosine_bound_ << ")" << std::endl; +#endif + return Is_bad(Quality(1)); + } + } + + cell = cell->neighbor(next_index); + } + while(cell != start_cell); + } + + return Is_bad(); + } + +private: + const FT cosine_bound_; +}; // end class Facet_normal_angle_criterion template class Facet_criterion_visitor diff --git a/Mesh_3/include/CGAL/Mesh_criteria_3.h b/Mesh_3/include/CGAL/Mesh_criteria_3.h index 3866b56e89f8..764dd4611c57 100644 --- a/Mesh_3/include/CGAL/Mesh_criteria_3.h +++ b/Mesh_3/include/CGAL/Mesh_criteria_3.h @@ -93,7 +93,8 @@ class Mesh_criteria_3_impl parameters::choose_parameter(parameters::get_parameter_reference(np, internal_np::facet_size_param), FT(0)), parameters::choose_parameter(parameters::get_parameter_reference(np, internal_np::facet_distance_param), FT(0)), parameters::choose_parameter(parameters::get_parameter(np, internal_np::facet_topology_param), CGAL::FACET_VERTICES_ON_SURFACE), - parameters::choose_parameter(parameters::get_parameter(np, internal_np::facet_min_size_param), FT(0))), + parameters::choose_parameter(parameters::get_parameter(np, internal_np::facet_min_size_param), FT(0)), + parameters::choose_parameter(parameters::get_parameter(np, internal_np::facet_normal_angle_param), FT(0))), cell_criteria_(parameters::choose_parameter(parameters::get_parameter(np, internal_np::cell_radius_edge_ratio_param), FT(0)), parameters::choose_parameter(parameters::get_parameter_reference(np, internal_np::cell_size_param), FT(0)), parameters::choose_parameter(parameters::get_parameter(np, internal_np::cell_min_size_param), FT(0))) @@ -306,6 +307,13 @@ typedef Mesh_cell_criteria_3 Cell_criteria; * get all possible values.} * \cgalParamDefault{CGAL::FACET_VERTICES_ON_SURFACE} * \cgalParamNEnd + * \cgalParamNBegin{facet_normal_angle} + * \cgalParamDescription{an upper bound (in degrees) for the angle between the + * normals of two neighbor facets of + * the complex, separated by an edge that is not in the 1D complex. + * If the angle is larger than this bound, the facet will be + * refined.} + * \cgalParamNEnd * \cgalParamNBegin{cell_radius_edge_ratio} * \cgalParamDescription{ an upper bound for the radius-edge ratio of the mesh tetrahedra.} * \cgalParamNEnd diff --git a/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h b/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h index db4dff0610e9..7723accab599 100644 --- a/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h +++ b/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h @@ -106,6 +106,8 @@ class Mesh_facet_criteria_3 \param min_radius_bound is a uniform lower bound for the radius of the surface Delaunay balls. Only facets with a radius larger than that bound will be refined. + \param normal_angle_bound is an upper bound, in degrees, between the normal vectors of two neighbor + facets of the complex, separated by a an edge that is not in the 1D complex @note If one parameter is set to 0, then its corresponding criterion is ignored. @@ -114,11 +116,11 @@ class Mesh_facet_criteria_3 const FT& radius_bound, const FT& distance_bound, const Mesh_facet_topology topology = FACET_VERTICES_ON_SURFACE, - const FT& min_radius_bound = 0.); + const FT& min_radius_bound = 0., + const FT& normal_angle_bound = 0.); #endif - /*! Returns an object to serve as criteria for facets. The types `SizingField` and `DistanceField` must @@ -131,7 +133,8 @@ class Mesh_facet_criteria_3 const SizingField & radius_bound, const DistanceField& distance_bound, const Mesh_facet_topology topology = FACET_VERTICES_ON_SURFACE, - const FT& min_radius_bound = 0.) + const FT& min_radius_bound = 0., + const FT& normal_angle_bound = 0.) : squared_min_radius_bound_(std::nullopt) { if (FT(0) != min_radius_bound) @@ -150,6 +153,8 @@ class Mesh_facet_criteria_3 Mesh_3::Is_mesh_domain_field_3()); init_topo(topology); + + init_normal_angle(normal_angle_bound); } /// @} @@ -255,6 +260,14 @@ class Mesh_facet_criteria_3 } } + void init_normal_angle(const FT& normal_angle_bound) + { + if(FT(0) == normal_angle_bound) + return; + typedef Mesh_3::Facet_normal_angle_criterion Nvar_criterion; + criteria_.add(new Nvar_criterion(normal_angle_bound)); + } + private: Criteria criteria_; Mesh_facet_topology topology_; diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index 81d40783baf0..01f35b40b86e 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -1971,6 +1971,11 @@ class Periodic_3_triangulation_3 { return Triangulation_data_structure::vertices(c); } + /// Edges around a facet + static std::array edges(const Facet& f) + { + return Triangulation_data_structure::edges(f); + } private: /** @name Checking helpers */ diff --git a/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h b/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h index ba78bc1f4efd..adfdb3454e58 100644 --- a/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h +++ b/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h @@ -445,6 +445,7 @@ CGAL_add_named_parameter_with_compatibility(facet_angle_param_t, facet_angle_par CGAL_add_named_parameter_with_compatibility(facet_size_param_t, facet_size_param, facet_size) CGAL_add_named_parameter_with_compatibility_cref_only(facet_distance_param_t, facet_distance_param, facet_distance) CGAL_add_named_parameter_with_compatibility(facet_min_size_param_t, facet_min_size_param, facet_min_size) +CGAL_add_named_parameter_with_compatibility(facet_normal_angle_param_t, facet_normal_angle_param, facet_normal_angle) CGAL_add_named_parameter_with_compatibility(facet_topology_param_t, facet_topology_param, facet_topology) CGAL_add_named_parameter_with_compatibility(cell_radius_edge_ratio_param_t, cell_radius_edge_ratio_param, cell_radius_edge_ratio) CGAL_add_named_parameter_with_compatibility(cell_size_param_t, cell_size_param, cell_size) diff --git a/TDS_3/include/CGAL/Triangulation_data_structure_3.h b/TDS_3/include/CGAL/Triangulation_data_structure_3.h index 40348035b8f8..b24342e34344 100644 --- a/TDS_3/include/CGAL/Triangulation_data_structure_3.h +++ b/TDS_3/include/CGAL/Triangulation_data_structure_3.h @@ -1634,6 +1634,14 @@ class Triangulation_data_structure_3 c->vertex(2), c->vertex(3)}; } + static std::array edges(const Facet& f) + { + const int i = f.second; + return std::array{ + Edge(f.first, vertex_triple_index(i, 0), vertex_triple_index(i, 1)), + Edge(f.first, vertex_triple_index(i, 1), vertex_triple_index(i, 2)), + Edge(f.first, vertex_triple_index(i, 2), vertex_triple_index(i, 0))}; + } bool is_small_hole(std::size_t s) { diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index c1edf17efb36..9a1908b29c71 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -1948,6 +1948,12 @@ class Triangulation_3 return Tds::vertices(c); } + /// Edges around a facet + static std::array edges(const Facet& f) + { + return Tds::edges(f); + } + // cells around an edge Cell_circulator incident_cells(const Edge& e) const {