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

Merge pull request #6421 from afabri/Nef_3-has_smaller_distance_to_point-GF 

Nef_3: Use has_smaller_distance_to_point()
This commit is contained in:
Sébastien Loriot 2022-03-29 17:46:16 +02:00
parent 99f0598f3e a92e6e6039
commit 3e959d7ca6
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
View File

@ -349,10 +349,8 @@ public:
CGAL_assertion( initialized); CGAL_assertion( initialized);
_CGAL_NEF_TRACEN( "locate "<<p); _CGAL_NEF_TRACEN( "locate "<<p);
typename SNC_structure::FT min_distance;
typename SNC_structure::FT tmp_distance;
Object_handle result; Object_handle result;
Vertex_handle v; Vertex_handle v, closest;
Halfedge_handle e; Halfedge_handle e;
Halffacet_handle f; Halffacet_handle f;
Object_list candidates = candidate_provider->objects_around_point(p); Object_list candidates = candidate_provider->objects_around_point(p);
@ -366,23 +364,23 @@ public:
if(p==v->point()) if(p==v->point())
return make_object(v); return make_object(v);
min_distance = CGAL::squared_distance(v->point(),p); closest = v;
result = make_object(v);
++o; ++o;
while(o!=candidates.end() && CGAL::assign(v,*o)) { while(o!=candidates.end() && CGAL::assign(v,*o)) {
if ( p == v->point()) { if ( p == v->point()) {
_CGAL_NEF_TRACEN("found on vertex "<<v->point()); _CGAL_NEF_TRACEN("found on vertex "<<v->point());
return make_object(v); return make_object(v);
} }
tmp_distance = CGAL::squared_distance(v->point(),p);
if(tmp_distance < min_distance) { if(CGAL::has_smaller_distance_to_point(p, v->point(), closest->point())){
result = make_object(v); closest = v;
min_distance = tmp_distance;
} }
++o; ++o;
} }
CGAL::assign(v, result); v = closest;
result = make_object(v);
Segment_3 s(p,v->point()); Segment_3 s(p,v->point());
// bool first = true; // bool first = true;
Point_3 ip; Point_3 ip;