diff --git a/vcg/simplex/vertexplus/component.h b/vcg/simplex/vertexplus/component.h index 3ad56d72..bac9aa3b 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.13 2005/11/14 23:50:57 cignoni +Added Incremental Mark + Revision 1.12 2005/11/12 18:35:49 cignoni Changed HasFlag -> HasFlags @@ -138,6 +141,10 @@ template class EmptyMark: public T { public: static bool HasMark() { return false; } static bool HasMarkOpt() { return false; } + inline void InitIMark() { } + inline int & IMark() { assert(0); static int tmp=-1; return tmp;} + inline const int & IMark() const {return 0;} + }; template class Mark: public T { public: @@ -176,7 +183,7 @@ template class Texture2f: public Texture, TT> {}; template class Texture2d: public Texture, TT> {}; /*------------------------- FLAGS -----------------------------------------*/ -template class EmptyFlag: public T { +template class EmptyBitFlags: public T { public: typedef int FlagType; /// Return the vector of Flags(), senza effettuare controlli sui bit @@ -186,12 +193,12 @@ public: }; -template class Flag: public T { +template class BitFlags: public T { public: typedef int FlagType; int &Flags() {return _flags; } const int Flags() const {return _flags; } - static bool HasFlag() { return true; } + static bool HasFlags() { return true; } private: int _flags;