Changed TestVertexFace function in order to test if the each face is effectively added to the VF list of a vertex.
This commit is contained in:
parent
290804071b
commit
810c3df9a4
|
|
@ -405,7 +405,20 @@ static void FaceFaceFromTexCoord(MeshType &m)
|
||||||
/// \brief Test correctness of VFtopology
|
/// \brief Test correctness of VFtopology
|
||||||
static void TestVertexFace(MeshType &m)
|
static void TestVertexFace(MeshType &m)
|
||||||
{
|
{
|
||||||
|
SimpleTempData<typename MeshType::VertContainer, int > numVertex(m.vert,0);
|
||||||
|
|
||||||
if(!m.HasVFTopology()) return;
|
if(!m.HasVFTopology()) return;
|
||||||
|
|
||||||
|
FaceIterator fi;
|
||||||
|
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
||||||
|
{
|
||||||
|
if (!(*fi).IsD())
|
||||||
|
{
|
||||||
|
numVertex[(*fi).V0(0)]++;
|
||||||
|
numVertex[(*fi).V1(0)]++;
|
||||||
|
numVertex[(*fi).V2(0)]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
VertexIterator vi;
|
VertexIterator vi;
|
||||||
vcg::face::VFIterator<FaceType> VFi;
|
vcg::face::VFIterator<FaceType> VFi;
|
||||||
|
|
@ -415,16 +428,21 @@ static void TestVertexFace(MeshType &m)
|
||||||
if (!vi->IsD())
|
if (!vi->IsD())
|
||||||
if(vi->VFp()!=0) // unreferenced vertices MUST have VF == 0;
|
if(vi->VFp()!=0) // unreferenced vertices MUST have VF == 0;
|
||||||
{
|
{
|
||||||
|
int num=0;
|
||||||
assert(vi->VFp() >= &*m.face.begin());
|
assert(vi->VFp() >= &*m.face.begin());
|
||||||
assert(vi->VFp() <= &m.face.back());
|
assert(vi->VFp() <= &m.face.back());
|
||||||
VFi.f=vi->VFp();
|
VFi.f=vi->VFp();
|
||||||
VFi.z=vi->VFi();
|
VFi.z=vi->VFi();
|
||||||
while (!VFi.End())
|
while (!VFi.End())
|
||||||
{
|
{
|
||||||
|
num++;
|
||||||
assert(!VFi.F()->IsD());
|
assert(!VFi.F()->IsD());
|
||||||
assert((VFi.F()->V(VFi.I()))==&(*vi));
|
assert((VFi.F()->V(VFi.I()))==&(*vi));
|
||||||
++VFi;
|
++VFi;
|
||||||
}
|
}
|
||||||
|
int num1=numVertex[&(*vi)];
|
||||||
|
assert(num==num1);
|
||||||
|
/*assert(num>1);*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue