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

Avoid needless length check (the weight functors already do it)

This commit is contained in:
Mael Rouxel-Labbé 2022-10-20 17:30:45 +02:00
parent 936b02b87e
commit ca93b406a2
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h
View File

@ -641,9 +641,6 @@ private:
const PPM_ref position_v_i = get(ppmap, main_vertex_v_i); const PPM_ref position_v_i = get(ppmap, main_vertex_v_i);
const PPM_ref position_v_j = get(ppmap, *neighbor_vertex_v_j); const PPM_ref position_v_j = get(ppmap, *neighbor_vertex_v_j);
const Vector_3 edge = position_v_i - position_v_j;
const NT squared_length = edge * edge;
vertex_around_target_circulator previous_vertex_v_k = neighbor_vertex_v_j; vertex_around_target_circulator previous_vertex_v_k = neighbor_vertex_v_j;
--previous_vertex_v_k; --previous_vertex_v_k;
const PPM_ref position_v_k = get(ppmap, *previous_vertex_v_k); const PPM_ref position_v_k = get(ppmap, *previous_vertex_v_k);
@ -652,14 +649,10 @@ private:
++next_vertex_v_l; ++next_vertex_v_l;
const PPM_ref position_v_l = get(ppmap, *next_vertex_v_l); const PPM_ref position_v_l = get(ppmap, *next_vertex_v_l);
NT weight = NT(0); // This version was commented out to be an alternative weight in the original code by authors.
CGAL_assertion(squared_length > NT(0)); // two points are identical! // NT weight = CGAL::Weights::authalic_weight(position_v_l, position_v_j, position_v_k, position_v_i) / NT(2);
if(squared_length != NT(0)) { NT weight = CGAL::Weights::cotangent_weight(position_v_l, position_v_j, position_v_k, position_v_i) / NT(2);
// This version was commented out to be an alternative weight
// in the original code by authors.
// weight = CGAL::Weights::authalic_weight(position_v_k, position_v_j, position_v_l, position_v_i) / NT(2);
weight = CGAL::Weights::cotangent_weight(position_v_k, position_v_j, position_v_l, position_v_i) / NT(2);
}
return weight; return weight;
} }