songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

when curves topology is valid, use curve_segment_length

This commit is contained in:
Jane Tournois 2023-12-15 15:52:02 +01:00
parent 3ef2ce9163
commit a66e78a672
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -1763,20 +1763,33 @@ is_sampling_dense_enough(const Vertex_handle& v1, const Vertex_handle& v2,
FT size_v1 = get_radius(v1); FT size_v1 = get_radius(v1);
FT size_v2 = get_radius(v2); FT size_v2 = get_radius(v2);
bool v1_valid_curve_index = true;
bool v2_valid_curve_index = true;
if(use_minimal_size())
{
v1_valid_curve_index = (get_dimension(v1) != 1
|| curve_index == domain_.curve_index(v1->index()));
v2_valid_curve_index = (get_dimension(v2) != 1
|| curve_index == domain_.curve_index(v2->index()));
}
else
{
CGAL_assertion(get_dimension(v1) != 1 || CGAL_assertion(get_dimension(v1) != 1 ||
curve_index == domain_.curve_index(v1->index())); curve_index == domain_.curve_index(v1->index()));
CGAL_assertion(get_dimension(v2) != 1 || CGAL_assertion(get_dimension(v2) != 1 ||
curve_index == domain_.curve_index(v2->index())); curve_index == domain_.curve_index(v2->index()));
}
const Weighted_point& v1_wp = c3t3_.triangulation().point(v1); const Weighted_point& v1_wp = c3t3_.triangulation().point(v1);
const Weighted_point& v2_wp = c3t3_.triangulation().point(v2); const Weighted_point& v2_wp = c3t3_.triangulation().point(v2);
FT arc_length = use_minimal_size() FT arc_length = (v1_valid_curve_index && v2_valid_curve_index)
? compute_distance(v1, v2) //curve polyline may not be consistent ? domain_.curve_segment_length(cp(v1_wp),
: domain_.curve_segment_length(cp(v1_wp),
cp(v2_wp), cp(v2_wp),
curve_index, curve_index,
orientation); orientation)
: compute_distance(v1, v2); //curve polyline may not be consistent
// Sufficient condition so that the curve portion between v1 and v2 is // Sufficient condition so that the curve portion between v1 and v2 is
// inside the union of the two balls. // inside the union of the two balls.