manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated from MinDistPoint to Closest (and removed some warnings)

This commit is contained in:
Paolo Cignoni 2005-01-24 15:37:14 +00:00
parent 507a7c89e6
commit 83add89568
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/metro/sampling.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.13 2004/09/20 16:17:46 ponchio
Floating except fixed (happened on meshes with less than 100 faces :P)
Revision 1.12 2004/09/09 22:59:15 cignoni Revision 1.12 2004/09/09 22:59:15 cignoni
Removed many small warnings Removed many small warnings
@ -59,7 +62,8 @@ instantiate GridStaticPtr on the simplexClass template.
#define __VCGLIB__SAMPLING #define __VCGLIB__SAMPLING
#include <time.h> #include <time.h>
#include "min_dist_point.h" //#include "min_dist_point.h"
#include <vcg/complex/trimesh/closest.h>
#include <vcg/space/box3.h> #include <vcg/space/box3.h>
#include <vcg/space/color4.h> #include <vcg/space/color4.h>
#include <vcg/simplex/face/distance.h> #include <vcg/simplex/face/distance.h>
@ -108,11 +112,11 @@ private:
MetroMeshGrid gS2; MetroMeshGrid gS2;
int n_samples_per_face ; unsigned int n_samples_per_face ;
float n_samples_edge_to_face_ratio ; float n_samples_edge_to_face_ratio ;
float bbox_factor ; float bbox_factor ;
float inflate_percentage ; float inflate_percentage ;
int min_size ; unsigned int min_size ;
float n_hist_bins ; float n_hist_bins ;
int print_every_n_elements ; int print_every_n_elements ;
int referredBit; int referredBit;
@ -248,7 +252,7 @@ float Sampling<MetroMesh>::AddSample(const Point3x &p )
dist = dist_upper_bound; dist = dist_upper_bound;
// compute distance between p_i and the mesh S2 // compute distance between p_i and the mesh S2
MinDistPoint(S2, p, gS2, dist, normf, bestq, f, ip); trimesh::Closest(S2, p, gS2, dist, normf, bestq, f, ip);
// update distance measures // update distance measures
if(dist == dist_upper_bound) if(dist == dist_upper_bound)