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

converted to the new UsedTypes syntax

This commit is contained in:
Paolo Cignoni 2010-03-17 09:22:23 +00:00
parent eca7114e6c
commit 2a1aebfa3d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/complex/trimesh/autoalign_4pcs.h
View File

@ -58,11 +58,18 @@ template <class MeshType>
class FourPCS { class FourPCS {
public: public:
/* mesh only for using spatial indexing functions (to remove) */ /* mesh only for using spatial indexing functions (to remove) */
class PEdge; // dummy prototype never used class PVertex; // dummy prototype never used
class PFace; class PEdge; // dummy prototype never used
class PVertex : public vcg::VertexSimp2< PVertex, PEdge, PFace,vcg::vertex::BitFlags,vcg::vertex::Coord3f ,vcg::vertex::Mark>{}; class PFace;
class PUsedTypes: public vcg::UsedTypes < vcg::Use<PVertex>::template AsVertexType,
vcg::Use<PEdge >::template AsEdgeType,
vcg::Use<PFace >::template AsFaceType >{};
class PVertex : public vcg::Vertex< PUsedTypes,vcg::vertex::BitFlags,vcg::vertex::Coord3f ,vcg::vertex::Mark>{};
/*same as for the vertes */ /*same as for the vertes */
class PFace : public vcg::FaceSimp2< PVertex, PEdge, PFace> {}; class PFace : public vcg::Face< PUsedTypes> {};
/*the mesh is a container of vertices and a container of faces */ /*the mesh is a container of vertices and a container of faces */
class PMesh : public vcg::tri::TriMesh< std::vector<PVertex>, std::vector<PFace> > {}; class PMesh : public vcg::tri::TriMesh< std::vector<PVertex>, std::vector<PFace> > {};
@ -127,7 +134,7 @@ private:
ScalarType err; ScalarType err;
int score; int score;
int base; // debug: for which base int base; // debug: for which base
const bool & operator <(const CandiType & o) const {return score > o.score;} inline bool operator <(const CandiType & o) const {return score > o.score;}
}; };