diff --git a/vcg/simplex/vertexplus/component.h b/vcg/simplex/vertexplus/component.h index 63b1dc8e..9743f4c1 100644 --- a/vcg/simplex/vertexplus/component.h +++ b/vcg/simplex/vertexplus/component.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.7 2004/05/10 13:50:32 cignoni +Updated names of adj functions to the new standards + Revision 1.6 2004/04/05 11:53:06 cignoni addend constant access funcs @@ -104,13 +107,13 @@ template class Normal3d: public Normal {}; /*-------------------------- NORMAL ----------------------------------------*/ -template class EmptyTexture: public T { +template class EmptyTexture: public TT { public: typedef vcg::TCoord2 TextureType; TextureType &T() { static TextureType dummy_texture; return dummy_texture; } static bool HasTexture() { return false; } }; -template class Texture: public T { +template class Texture: public TT { public: typedef A TextureType; TextureType &T() { return _t; } @@ -120,9 +123,9 @@ private: TextureType _t; }; -template class Texture2s: public Texture, T> {}; -template class Texture2f: public Texture, T> {}; -template class Texture2d: public Texture, T> {}; +template class Texture2s: public Texture, TT> {}; +template class Texture2f: public Texture, TT> {}; +template class Texture2d: public Texture, TT> {}; /*------------------------- FLAGS -----------------------------------------*/ template class EmptyFlag: public T { @@ -187,14 +190,14 @@ template class Qualityd: public Quality {}; template class EmptyVFAdj: public T { public: - typename T::FacePointer &VFb() { static typename T::FacePointer fp=0; return fp; } + typename T::FacePointer &VFp() { static typename T::FacePointer fp=0; return fp; } int &VFi(){static int z=0; return z;}; static bool HasVFAdjacency() { return false; } }; template class VFAdj: public T { public: - typename T::FacePointer &VFb() {return _fp; } + typename T::FacePointer &VFp() {return _fp; } int &VFi() {return _zp; } static bool HasVFAdjacency() { return true; } private: @@ -204,4 +207,4 @@ private: } // end namespace vert }// end namespace vcg -#endif \ No newline at end of file +#endif diff --git a/vcg/simplex/vertexplus/with/readme.txt b/vcg/simplex/vertexplus/with/readme.txt index c3d34733..e2415c02 100644 --- a/vcg/simplex/vertexplus/with/readme.txt +++ b/vcg/simplex/vertexplus/with/readme.txt @@ -21,23 +21,33 @@ * * ****************************************************************************/ -This folders contains most common vertex configuration files -The name of the file specify the members that are added to the vertex class -The name is a sequence of letters, in strict alphabetical order. -The possible admitted letters are +This folders contains most common VERTEX configuration files. -A - vertex-face adjacency -C - Color -N - Normal -Q - Quality -T - Texture Coords +The name of the file specifies the members that are added to the vertex +class. The name is a sequence of letter pairs, in strict alphabetical order. The +possible admitted letters pairs are: + +Adjacency Info + +AF - Vertex-Face adjacency +AE - Vertex-Edge adjacency +AT - Vertex-Tetra adjacency + +Per-Vertex Data +VC - Color +VN - Normal +VM - Incremental Mark +VQ - Quality +VT - Texture Coords E.g. -#include +#include generate a type -VertexACQ -that can store V-F adjacency, color and quality. + +VertexAFVCVQ + +That can store V-F adjacency, color, normal and quality.