From a6f9f33a6249f961d35db26147749976598c95d6 Mon Sep 17 00:00:00 2001 From: cignoni Date: Thu, 3 Jul 2008 21:39:37 +0000 Subject: [PATCH] removed references to the meshlab code (qdebug and leaked mesh types) --- vcg/complex/trimesh/point_sampling.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vcg/complex/trimesh/point_sampling.h b/vcg/complex/trimesh/point_sampling.h index e3407eb0..9dd6e2b1 100644 --- a/vcg/complex/trimesh/point_sampling.h +++ b/vcg/complex/trimesh/point_sampling.h @@ -59,12 +59,12 @@ class TrivialSampler { sampleVec.push_back(p.cP()); } - void AddFace(const FaceType &f, const CMeshO::CoordType &p) + void AddFace(const FaceType &f, const CoordType &p) { sampleVec.push_back(f.P(0)*p[0] + f.P(1)*p[1] +f.P(2)*p[2] ); } - void AddTextureSample(const FaceType &, const CMeshO::CoordType &, const Point2i &) + void AddTextureSample(const FaceType &, const CoordType &, const Point2i &) { // Retrieve the colorof the sample from the face f using the barycentric coord p // and write that color in a texture image at position tp[0],tp[1] @@ -212,7 +212,7 @@ static void AllEdge(MetroMesh & m, VertexSampler &ps) typename std::vector< SimpleEdge>::iterator newEnd = unique(Edges.begin(), Edges.end()); typename std::vector::iterator ei; - qDebug("Edges %i (unique %i) ",(int)Edges.size(), (int)(newEnd-Edges.begin()) ); + //qDebug("Edges %i (unique %i) ",(int)Edges.size(), (int)(newEnd-Edges.begin()) ); Edges.resize(newEnd-Edges.begin()); for(ei=Edges.begin(); ei!=Edges.end(); ++ei) { @@ -264,7 +264,7 @@ static void Montecarlo(MetroMesh & m, VertexSampler &ps,int sampleNum) { ScalarType area = Stat::ComputeMeshArea(m); ScalarType samplePerAreaUnit = sampleNum/area; - qDebug("samplePerAreaUnit %f",samplePerAreaUnit); + //qDebug("samplePerAreaUnit %f",samplePerAreaUnit); // Montecarlo sampling. double floatSampleNum = 0.0; @@ -305,7 +305,7 @@ static void WeightedMontecarlo(MetroMesh & m, VertexSampler &ps, int sampleNum) weightedArea += WeightedArea(*fi); ScalarType samplePerAreaUnit = sampleNum/weightedArea; - qDebug("samplePerAreaUnit %f",samplePerAreaUnit); + //qDebug("samplePerAreaUnit %f",samplePerAreaUnit); // Montecarlo sampling. double floatSampleNum = 0.0; for(fi=m.face.begin(); fi != m.face.end(); fi++) @@ -380,7 +380,7 @@ static void FaceSubdivision(MetroMesh & m, VertexSampler &ps,int sampleNum) ScalarType area = Stat::ComputeMeshArea(m); ScalarType samplePerAreaUnit = sampleNum/area; - qDebug("samplePerAreaUnit %f",samplePerAreaUnit); + //qDebug("samplePerAreaUnit %f",samplePerAreaUnit); double floatSampleNum = 0.0; int faceSampleNum; @@ -444,7 +444,7 @@ static void FaceSimilar(MetroMesh & m, VertexSampler &ps,int sampleNum) ScalarType area = Stat::ComputeMeshArea(m); ScalarType samplePerAreaUnit = sampleNum/area; - qDebug("samplePerAreaUnit %f",samplePerAreaUnit); + //qDebug("samplePerAreaUnit %f",samplePerAreaUnit); // Similar Triangles sampling. int n_samples_per_edge;