lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-15 09:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

other few changes connected to the disappearing of the hated faceprojection flags...

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2011-12-13 15:07:46 +00:00
parent 6b8fa50873
commit 78b8d392f4
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/meshlabplugins/filter_sampling/filter_sampling.cpp
View File

@ -123,7 +123,7 @@ class HausdorffSampler
typedef GridStaticPtr<CMeshO::VertexType, CMeshO::ScalarType > MetroMeshVertexGrid;
public:
HausdorffSampler(CMeshO* _m=0,CMeshO* _sampleMesh=0, CMeshO* _closestMesh=0 )
HausdorffSampler(CMeshO* _m=0,CMeshO* _sampleMesh=0, CMeshO* _closestMesh=0 ) :markerFunctor(_m)
{
init(_m,_sampleMesh,_closestMesh);
};
@ -165,7 +165,6 @@ public:
if(m)
{
tri::UpdateNormals<CMeshO>::PerFaceNormalized(*m);
tri::UpdateFlags<CMeshO>::FaceProjection(*m);
if(m->fn==0) useVertexSampling = true;
else useVertexSampling = false;
@ -251,7 +250,7 @@ class RedetailSampler
public:
RedetailSampler()
RedetailSampler():markerFunctor(0)
{
m=0;
};
@ -286,7 +285,6 @@ public:
if(m)
{
tri::UpdateNormals<CMeshO>::PerFaceNormalized(*m);
tri::UpdateFlags<CMeshO>::FaceProjection(*m);
if(m->fn==0) useVertexSampling = true;
else useVertexSampling = false;
@ -898,7 +896,6 @@ case FP_CLUSTERED_SAMPLING :
mm1->updateDataMask(MeshModel::MM_VERTQUALITY);
mm1->updateDataMask(MeshModel::MM_FACEMARK);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(mm1->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(mm1->cm);
MeshModel *samplePtMesh =0;
MeshModel *closestPtMesh =0;
@ -950,7 +947,6 @@ case FP_CLUSTERED_SAMPLING :
float upperbound = par.getAbsPerc("UpperBound"); // maximum distance to stop search
srcMesh->updateDataMask(MeshModel::MM_FACEMARK);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(srcMesh->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(srcMesh->cm);
RedetailSampler rs;
rs.init(&(srcMesh->cm),cb,trgMesh->cm.vn);
@ -1131,7 +1127,6 @@ case FP_CLUSTERED_SAMPLING :
tri::Allocator<CMeshO>::CompactFaceVector(mmM->cm);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(mmM->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(mmM->cm);
std::vector<Point3f> pvec;
tri::SurfaceSampling<CMeshO,RedetailSampler>::RegularRecursiveOffset(mmM->cm,pvec, offset, CellSize);

3
src/meshlabplugins/filter_sdf/filter_sdf.cpp
View File

@ -72,8 +72,7 @@ bool SdfPlugin::applyFilter(MeshDocument& md, RichParameterSet& pars, vcg::CallB
tri::UpdateNormals<CMeshO>::PerFaceNormalized(m);
tri::UpdateNormals<CMeshO>::PerVertexAngleWeighted(m);
tri::UpdateNormals<CMeshO>::NormalizeVertex(m);
tri::UpdateFlags<CMeshO>::FaceProjection(m);
//--- Enable & Reset the necessary attributes
switch(onPrimitive){
case ON_VERTICES: