updated to current version of the library
This commit is contained in:
parent
f3969b8774
commit
95713e5723
|
@ -211,12 +211,13 @@ using namespace std;
|
||||||
using namespace vcg;
|
using namespace vcg;
|
||||||
|
|
||||||
|
|
||||||
|
class CVertex;
|
||||||
class CFace;
|
class CFace;
|
||||||
class CEdge;
|
|
||||||
class CVertex : public VertexSimp2< CVertex, CEdge, CFace, vert::VFAdj, vert::Coord3f,
|
struct MyTypes: public UsedTypes< Use<CVertex>::AsVertexType,Use<CFace>::AsFaceType>{};
|
||||||
vert::BitFlags, vert::Normal3f > {};
|
|
||||||
class CFace : public FaceSimp2< CVertex, CEdge, CFace, face::FFAdj, face::VFAdj,
|
class CVertex : public Vertex< MyTypes, vertex::VFAdj, vertex::Coord3f,vertex::BitFlags, vertex::Normal3f > {};
|
||||||
face::VertexRef, face::Normal3f, face::BitFlags, face::Mark > {};
|
class CFace : public Face< MyTypes, face::FFAdj, face::VFAdj, face::VertexRef, face::Normal3f, face::BitFlags, face::Mark > {};
|
||||||
class CMesh : public vcg::tri::TriMesh< vector<CVertex>, vector<CFace> > {};
|
class CMesh : public vcg::tri::TriMesh< vector<CVertex>, vector<CFace> > {};
|
||||||
|
|
||||||
typedef CMesh::VertexPointer VertexPointer;
|
typedef CMesh::VertexPointer VertexPointer;
|
||||||
|
@ -782,8 +783,8 @@ int main(int argc, char ** argv)
|
||||||
tri::UpdateTopology<CMesh>::VertexFace(m);
|
tri::UpdateTopology<CMesh>::VertexFace(m);
|
||||||
|
|
||||||
// IS MANIFOLD?
|
// IS MANIFOLD?
|
||||||
mi.VManifold = tri::Clean<CMesh>::IsTwoManifoldVertex(m);
|
mi.VManifold = tri::Clean<CMesh>::CountNonManifoldVertexFF(m)>0;
|
||||||
mi.FManifold = tri::Clean<CMesh>::IsTwoManifoldFace(m);
|
mi.FManifold = tri::Clean<CMesh>::CountNonManifoldEdgeFF(m)>0;
|
||||||
|
|
||||||
// COUNT EDGES
|
// COUNT EDGES
|
||||||
tri::Clean<CMesh>::CountEdges(m, mi.count_e, mi.boundary_e);
|
tri::Clean<CMesh>::CountEdges(m, mi.count_e, mi.boundary_e);
|
||||||
|
@ -792,11 +793,11 @@ int main(int argc, char ** argv)
|
||||||
if(mi.VManifold && mi.FManifold)
|
if(mi.VManifold && mi.FManifold)
|
||||||
{
|
{
|
||||||
mi.numholes = tri::Clean<CMesh>::CountHoles(m);
|
mi.numholes = tri::Clean<CMesh>::CountHoles(m);
|
||||||
mi.BEdges = tri::Clean<CMesh>::BorderEdges(m, mi.numholes);
|
tri::Clean<CMesh>::CountEdges(m, mi.BEdges,mi.numholes);
|
||||||
}
|
}
|
||||||
|
|
||||||
// CONNECTED COMPONENTS
|
// CONNECTED COMPONENTS
|
||||||
mi.numcomponents = tri::Clean<CMesh>::ConnectedComponents(m);
|
mi.numcomponents = tri::Clean<CMesh>::CountConnectedComponents(m);
|
||||||
|
|
||||||
// ORIENTATION
|
// ORIENTATION
|
||||||
if (mi.VManifold && mi.FManifold)
|
if (mi.VManifold && mi.FManifold)
|
||||||
|
|
Loading…
Reference in New Issue