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

corrected some non templated type on SplitNonManifoldVertex function

This commit is contained in:
Nico Pietroni 2013-05-08 09:05:58 +00:00
parent 81b21cdaa8
commit 5f59f1fa5a
1 changed files with 3 additions and 2 deletions
vcg/complex/algorithms
clean.h

5
vcg/complex/algorithms/clean.h
View File

@ -120,6 +120,7 @@ private:
typedef typename MeshType::ConstVertexIterator ConstVertexIterator; typedef typename MeshType::ConstVertexIterator ConstVertexIterator;
typedef typename MeshType::EdgeIterator EdgeIterator; typedef typename MeshType::EdgeIterator EdgeIterator;
typedef typename MeshType::EdgePointer EdgePointer; typedef typename MeshType::EdgePointer EdgePointer;
typedef typename MeshType::CoordType CoordType;
typedef typename MeshType::ScalarType ScalarType; typedef typename MeshType::ScalarType ScalarType;
typedef typename MeshType::FaceType FaceType; typedef typename MeshType::FaceType FaceType;
typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FacePointer FacePointer;
@ -477,7 +478,7 @@ private:
// Duplicated vertices are moved apart according to the move threshold param. // Duplicated vertices are moved apart according to the move threshold param.
// that is a percentage of the average vector from the non manifold vertex to the barycenter of the incident faces. // that is a percentage of the average vector from the non manifold vertex to the barycenter of the incident faces.
static int SplitNonManifoldVertex(MeshType& m, float moveThreshold) static int SplitNonManifoldVertex(MeshType& m, ScalarType moveThreshold)
{ {
RequireFFAdjacency(m); RequireFFAdjacency(m);
typedef std::pair<FacePointer,int> FaceInt; // a face and the index of the vertex that we have to change typedef std::pair<FacePointer,int> FaceInt; // a face and the index of the vertex that we have to change
@ -522,7 +523,7 @@ private:
pu.Update(np); pu.Update(np);
firstVp->ImportData(*np); firstVp->ImportData(*np);
// loop on the face to be changed, and also compute the movement vector; // loop on the face to be changed, and also compute the movement vector;
Point3f delta(0,0,0); CoordType delta(0,0,0);
for(size_t j=0;j<ToSplitVec[i].second.size();++j) for(size_t j=0;j<ToSplitVec[i].second.size();++j)
{ {
FaceInt ff=ToSplitVec[i].second[j]; FaceInt ff=ToSplitVec[i].second[j];