diff --git a/apps/metro/mesh_type.h b/apps/metro/mesh_type.h index fc03054a..a14015c7 100644 --- a/apps/metro/mesh_type.h +++ b/apps/metro/mesh_type.h @@ -37,7 +37,6 @@ just color and quality on the vertex #ifndef _CMESH_H #define _CMESH_H -#pragma warning(disable:4786 4804 4666) #include #include @@ -49,10 +48,11 @@ just color and quality on the vertex #include #include #include -class MyEdge; class CFace; -class CVertex : public vcg::VertexSimp2 {}; -class CFace : public vcg::FaceSimp2< CVertex,MyEdge,CFace,vcg::face::VertexRef, vcg::face::Normal3d, vcg::face::EdgePlane,vcg::face::Color4b,vcg::face::Mark,vcg::face::BitFlags> {}; +class CVertex; +struct UsedTypes:public vcg::UsedTypes< vcg::Use::AsFaceType, vcg::Use::AsVertexType>{}; +class CVertex : public vcg::Vertex {}; +class CFace : public vcg::Face< UsedTypes,vcg::face::VertexRef, vcg::face::Normal3d, vcg::face::EdgePlane,vcg::face::Color4b,vcg::face::Mark,vcg::face::BitFlags> {}; class CMesh : public vcg::tri::TriMesh< std::vector, std::vector > {}; #endif