From 7d402e258dad7a3a0add83a87f06320e3312a4f6 Mon Sep 17 00:00:00 2001 From: cignoni Date: Sat, 12 Nov 2005 06:44:29 +0000 Subject: [PATCH] Changed GetClosest -> GetClosestFace --- apps/metro/sampling.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/metro/sampling.h b/apps/metro/sampling.h index c6d4443d..15e79f63 100644 --- a/apps/metro/sampling.h +++ b/apps/metro/sampling.h @@ -24,6 +24,12 @@ History $Log: not supported by cvs2svn $ +Revision 1.19 2005/10/02 23:11:50 cignoni +Changed the core for distance computation. +Current version uses the lib flexible search structures. +Now the comparison can be done exploiting a static uniform grid, +a hashed grid or a hierarchy of AA box. + Revision 1.18 2005/09/16 11:55:18 cignoni Partial adding of AABB trees, still not working... @@ -284,11 +290,11 @@ float Sampling::AddSample(const Point3x &p ) // compute distance between p_i and the mesh S2 if(Flags & SamplingFlags::USE_AABB_TREE) - f=trimesh::GetClosest(S2, tS2, p, dist_upper_bound, dist, normf, bestq, ip); + f=trimesh::GetClosestFace(S2, tS2, p, dist_upper_bound, dist, normf, bestq, ip); if(Flags & SamplingFlags::USE_HASH_GRID) - f=trimesh::GetClosest(S2, hS2, p, dist_upper_bound, dist, normf, bestq, ip); + f=trimesh::GetClosestFace(S2, hS2, p, dist_upper_bound, dist, normf, bestq, ip); if(Flags & SamplingFlags::USE_STATIC_GRID) - f=trimesh::GetClosest(S2, gS2, p, dist_upper_bound, dist, normf, bestq, ip); + f=trimesh::GetClosestFace(S2, gS2, p, dist_upper_bound, dist, normf, bestq, ip); // update distance measures if(dist == dist_upper_bound)