VFb moved to VFp, userbit to bitflag,setV, inclusion of pos.h

This commit is contained in:
ganovelli 2004-07-15 11:25:01 +00:00
parent db900ae484
commit 16e27ee1e8
1 changed files with 20 additions and 7 deletions

View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.15 2004/07/15 10:13:48 pietroni
adde NormalizedNormalV funtion to compute the normal on a vertex
Revision 1.14 2004/05/13 22:44:40 ganovelli Revision 1.14 2004/05/13 22:44:40 ganovelli
syntax error (typo) syntax error (typo)
@ -36,6 +39,9 @@ Revision 1.12 2004/05/10 13:31:13 ganovelli
function for edge adjacency added function for edge adjacency added
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.15 2004/07/15 10:13:48 pietroni
adde NormalizedNormalV funtion to compute the normal on a vertex
Revision 1.14 2004/05/13 22:44:40 ganovelli Revision 1.14 2004/05/13 22:44:40 ganovelli
syntax error (typo) syntax error (typo)
@ -49,7 +55,7 @@ Revision 1.11 2004/05/10 13:31:13 ganovelli
function for edge adjacency added function for edge adjacency added
Revision 1.10 2004/05/10 13:13:17 cignoni Revision 1.10 2004/05/10 13:13:17 cignoni
added void to Convert, corrected return object in VFb added void to Convert, corrected return object in VFp
Revision 1.9 2004/05/06 15:28:10 pietroni Revision 1.9 2004/05/06 15:28:10 pietroni
changed names to VF topology function (was missed) changed names to VF topology function (was missed)
@ -219,6 +225,9 @@ public:
bool IsS() const {return (_flags & SELECTED) != 0;} bool IsS() const {return (_flags & SELECTED) != 0;}
/// checks if the vertex is readable /// checks if the vertex is readable
bool IsB() const {return (_flags & BORDER) != 0;} bool IsB() const {return (_flags & BORDER) != 0;}
/// checks if the vertex is visited
bool IsV() const {return (_flags & VISITED) != 0;}
/** Set the flag value /** Set the flag value
@param flagp Valore da inserire nel flag @param flagp Valore da inserire nel flag
@ -246,10 +255,14 @@ public:
void SetS() {_flags |=SELECTED;} void SetS() {_flags |=SELECTED;}
/// Un-select a vertex /// Un-select a vertex
void ClearS() {_flags &= ~SELECTED;} void ClearS() {_flags &= ~SELECTED;}
/// Set vertex as ob border
void SetB() {_flags |=BORDER;} void SetB() {_flags |=BORDER;}
void ClearB() {_flags &=~BORDER;} void ClearB() {_flags &=~BORDER;}
/// checks if the vertex is visited
/// Return the first bit that is not still used void ClearV() {_flags &= ~VISITED;}
/// checks if the vertex is visited
void SetV() {_flags |=VISITED;}
/// Return the first bit that is not still used
static int &LastBitFlag() static int &LastBitFlag()
{ {
static int b =USER0; static int b =USER0;
@ -257,13 +270,13 @@ static int &LastBitFlag()
} }
/// allocate a bit among the flags that can be used by user. /// allocate a bit among the flags that can be used by user.
static inline int NewUserBit() static inline int NewBitFlag()
{ {
LastBitFlag()=LastBitFlag()<<1; LastBitFlag()=LastBitFlag()<<1;
return LastBitFlag(); return LastBitFlag();
} }
// de-allocate a bit among the flags that can be used by user. // de-allocate a bit among the flags that can be used by user.
static inline bool DeleteUserBit(int bitval) static inline bool DeleteBitFlag(int bitval)
{ {
if(LastBitFlag()==bitval) { if(LastBitFlag()==bitval) {
LastBitFlag()= LastBitFlag()>>1; LastBitFlag()= LastBitFlag()>>1;
@ -453,7 +466,7 @@ protected:
#endif #endif
public: public:
inline VFTYPE * & VFb() inline VFTYPE * & VFp()
{ {
#if ((defined __VCGLIB_VERTEX_AF) || (defined __VCGLIB_VERTEX_AFS)) #if ((defined __VCGLIB_VERTEX_AF) || (defined __VCGLIB_VERTEX_AFS))
return _vfb; return _vfb;
@ -464,7 +477,7 @@ inline VFTYPE * & VFb()
#endif #endif
} }
inline const VFTYPE * & VFb() const inline const VFTYPE * & VFp() const
{ {
#if ((defined __VCGLIB_VERTEX_AF) || (defined __VCGLIB_VERTEX_AFS)) #if ((defined __VCGLIB_VERTEX_AF) || (defined __VCGLIB_VERTEX_AFS))
return _vfb; return _vfb;