parent
84d860f8f8
commit
4679fecf83
|
@ -6,7 +6,7 @@
|
||||||
Visual Computing Lab http://vcg.isti.cnr.it /\/|
|
Visual Computing Lab http://vcg.isti.cnr.it /\/|
|
||||||
ISTI - Italian National Research Council |
|
ISTI - Italian National Research Council |
|
||||||
\
|
\
|
||||||
Metro 4.04 25/01/2005
|
Metro 4.05 04/05/2005
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
|
@ -79,3 +79,4 @@ where "file1" and "file2" are the input meshes in PLY, OFF or STL format, and op
|
||||||
-c save computed error as vertex colour and quality in two ply files
|
-c save computed error as vertex colour and quality in two ply files
|
||||||
-C # # Set the min/max values used for color mapping (useful for taking snapshot with coherent color ramp)
|
-C # # Set the min/max values used for color mapping (useful for taking snapshot with coherent color ramp)
|
||||||
-L Remove duplicated and unreferenced vertices before processing to avoid
|
-L Remove duplicated and unreferenced vertices before processing to avoid
|
||||||
|
-H write files with histograms of error distribution
|
|
@ -24,6 +24,10 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.15 2005/01/26 22:45:34 cignoni
|
||||||
|
Release 4.04
|
||||||
|
final updates for gcc compiling issues
|
||||||
|
|
||||||
Revision 1.14 2005/01/24 15:37:14 cignoni
|
Revision 1.14 2005/01/24 15:37:14 cignoni
|
||||||
updated from MinDistPoint to Closest (and removed some warnings)
|
updated from MinDistPoint to Closest (and removed some warnings)
|
||||||
|
|
||||||
|
@ -68,6 +72,7 @@ instantiate GridStaticPtr on the simplexClass template.
|
||||||
//#include "min_dist_point.h"
|
//#include "min_dist_point.h"
|
||||||
#include <vcg/complex/trimesh/closest.h>
|
#include <vcg/complex/trimesh/closest.h>
|
||||||
#include <vcg/space/box3.h>
|
#include <vcg/space/box3.h>
|
||||||
|
#include <vcg/math/histogram.h>
|
||||||
#include <vcg/space/color4.h>
|
#include <vcg/space/color4.h>
|
||||||
#include <vcg/simplex/face/distance.h>
|
#include <vcg/simplex/face/distance.h>
|
||||||
#include <vcg/complex/trimesh/update/color.h>
|
#include <vcg/complex/trimesh/update/color.h>
|
||||||
|
@ -131,7 +136,7 @@ private:
|
||||||
int Flags;
|
int Flags;
|
||||||
|
|
||||||
// results
|
// results
|
||||||
// Hist hist;
|
Histogram<double> hist;
|
||||||
unsigned long n_total_samples;
|
unsigned long n_total_samples;
|
||||||
unsigned long n_total_area_samples;
|
unsigned long n_total_area_samples;
|
||||||
unsigned long n_total_edge_samples;
|
unsigned long n_total_edge_samples;
|
||||||
|
@ -174,7 +179,7 @@ public :
|
||||||
unsigned long GetNVertexSamples() {return n_total_vertex_samples;}
|
unsigned long GetNVertexSamples() {return n_total_vertex_samples;}
|
||||||
double GetNSamplesPerAreaUnit() {return n_samples_per_area_unit;}
|
double GetNSamplesPerAreaUnit() {return n_samples_per_area_unit;}
|
||||||
unsigned long GetNSamplesTarget() {return n_samples_target;}
|
unsigned long GetNSamplesTarget() {return n_samples_target;}
|
||||||
// Hist &GetHist() {return hist;}
|
Histogram<double> &GetHist() {return hist;}
|
||||||
void SetFlags(int flags) {Flags = flags;}
|
void SetFlags(int flags) {Flags = flags;}
|
||||||
void ClearFlag(int flag) {Flags &= (flag ^ -1);}
|
void ClearFlag(int flag) {Flags &= (flag ^ -1);}
|
||||||
void SetParam(double _n_samp) {n_samples_target = _n_samp;}
|
void SetParam(double _n_samp) {n_samples_target = _n_samp;}
|
||||||
|
@ -268,8 +273,8 @@ float Sampling<MetroMesh>::AddSample(const Point3x &p )
|
||||||
RMS_dist += dist*dist; // L_2
|
RMS_dist += dist*dist; // L_2
|
||||||
n_total_samples++;
|
n_total_samples++;
|
||||||
|
|
||||||
//if(Flags & HIST)
|
if(Flags & SamplingFlags::HIST)
|
||||||
// hist.Add((float)fabs(dist));
|
hist.Add((float)fabs(dist));
|
||||||
|
|
||||||
return (float)dist;
|
return (float)dist;
|
||||||
}
|
}
|
||||||
|
@ -577,8 +582,8 @@ void Sampling<MetroMesh>::Hausdorff()
|
||||||
// set bounding box
|
// set bounding box
|
||||||
bbox = S2.bbox;
|
bbox = S2.bbox;
|
||||||
dist_upper_bound = /*bbox_factor * */bbox.Diag();
|
dist_upper_bound = /*bbox_factor * */bbox.Diag();
|
||||||
//if(Flags & HIST)
|
if(Flags & SamplingFlags::HIST)
|
||||||
// hist.SetRange(0.0, dist_upper_bound, n_hist_bins);
|
hist.SetRange(0.0, dist_upper_bound/100.0, n_hist_bins);
|
||||||
|
|
||||||
// initialize sampling statistics.
|
// initialize sampling statistics.
|
||||||
n_total_area_samples = n_total_edge_samples = n_total_vertex_samples = n_total_samples = n_samples = 0;
|
n_total_area_samples = n_total_edge_samples = n_total_vertex_samples = n_total_samples = n_samples = 0;
|
||||||
|
|
Loading…
Reference in New Issue