Improved the VertexNormalPointCloud smoothing algorithm (it can re use a kdtree)

This commit is contained in:
Paolo Cignoni 2012-11-08 18:33:55 +00:00
parent 1d092cf736
commit c367bf93fa
1 changed files with 23 additions and 10 deletions

View File

@ -1233,26 +1233,39 @@ static void VertexCoordPasoDobleFast(MeshType &m, int NormalSmoothStep, typename
} }
static void VertexNormalPointCloud(MeshType &m, int neighborNum) static void VertexNormalPointCloud(MeshType &m, int neighborNum, int iterNum, KdTree<float> *tp=0)
{ {
SimpleTempData<typename MeshType::VertContainer,Point3f > TD(m.vert,Point3f(0,0,0)); SimpleTempData<typename MeshType::VertContainer,Point3f > TD(m.vert,Point3f(0,0,0));
VertexConstDataWrapper<MeshType> ww(m); VertexConstDataWrapper<MeshType> ww(m);
KdTree<float> *tree=0;
if(tp==0) tree = new KdTree<float>(ww);
else tree=tp;
KdTree<float> tree(ww); tree->setMaxNofNeighbors(neighborNum);
tree.setMaxNofNeighbors(neighborNum); for(int ii=0;ii<iterNum;++ii)
for (VertexIterator vi = m.vert.begin();vi!=m.vert.end();++vi)
{ {
tree.doQueryK(vi->cP()); for (VertexIterator vi = m.vert.begin();vi!=m.vert.end();++vi)
int neighbours = tree.getNofFoundNeighbors(); {
tree->doQueryK(vi->cP());
int neighbours = tree->getNofFoundNeighbors();
for (int i = 0; i < neighbours; i++) for (int i = 0; i < neighbours; i++)
{ {
int neightId = tree.getNeighborId(i); int neightId = tree->getNeighborId(i);
if(m.vert[neightId].cN()*vi->cN()>0)
TD[vi]+= m.vert[neightId].cN(); TD[vi]+= m.vert[neightId].cN();
else
TD[vi]-= m.vert[neightId].cN();
} }
}
for (VertexIterator vi = m.vert.begin();vi!=m.vert.end();++vi)
{
vi->N()=TD[vi];
TD[vi]=Point3f(0,0,0);
}
tri::UpdateNormal<MeshType>::NormalizePerVertex(m);
} }
for (VertexIterator vi = m.vert.begin();vi!=m.vert.end();++vi)
vi->N()=TD[vi]; if(tp==0) delete tree;
tri::UpdateNormal<MeshType>::NormalizePerVertex(m);
} }
//! Laplacian smoothing with a reprojection on a target surface. //! Laplacian smoothing with a reprojection on a target surface.