converted to the new UsedTypes syntax

This commit is contained in:
Paolo Cignoni 2010-03-18 11:26:44 +00:00
parent cf872a327c
commit 51534c9ce9
1 changed files with 28 additions and 22 deletions
wrap/io_trimesh

View File

@ -35,18 +35,19 @@
namespace vcg { namespace vcg {
namespace tri { namespace tri {
namespace io { namespace io {
template<typename OpenMeshType> template<typename OpenMeshType>
class ImporterDAE : public UtilDAE class ImporterDAE : public UtilDAE
{ {
public:
private:
class ColladaEdge; class ColladaEdge;
class ColladaFace; class ColladaFace;
class ColladaVertex; class ColladaVertex;
class ColladaVertex : public vcg::VertexSimp2< ColladaVertex, ColladaEdge, ColladaFace, class ColladaTypes: public vcg::UsedTypes < vcg::Use<ColladaVertex>::template AsVertexType,
vcg::Use<ColladaEdge >::template AsEdgeType,
vcg::Use<ColladaFace >::template AsFaceType >{};
class ColladaVertex : public vcg::Vertex< ColladaTypes,
vcg::vertex::Coord3f, /* 12b */ vcg::vertex::Coord3f, /* 12b */
vcg::vertex::BitFlags, /* 4b */ vcg::vertex::BitFlags, /* 4b */
vcg::vertex::Normal3f, /* 12b */ vcg::vertex::Normal3f, /* 12b */
@ -54,7 +55,7 @@ class ColladaVertex : public vcg::VertexSimp2< ColladaVertex, ColladaEdge, Coll
> {}; > {};
class ColladaFace : public vcg::FaceSimp2< ColladaVertex, ColladaEdge, ColladaFace, class ColladaFace : public vcg::Face< ColladaTypes,
vcg::face::VertexRef, /*12b */ vcg::face::VertexRef, /*12b */
vcg::face::BitFlags, /* 4b */ vcg::face::BitFlags, /* 4b */
vcg::face::Normal3f, /*12b */ vcg::face::Normal3f, /*12b */
@ -66,6 +67,11 @@ class ColladaMesh : public vcg::tri::TriMesh< std::vector<ColladaVertex>, std
private:
static int WedgeNormalAttribute(ColladaMesh& m,const QStringList face,const QStringList wn,const QDomNode wnsrc,const int meshfaceind,const int faceind,const int component) static int WedgeNormalAttribute(ColladaMesh& m,const QStringList face,const QStringList wn,const QDomNode wnsrc,const int meshfaceind,const int faceind,const int component)