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

minimal addition to support neighboorhood relation between vertices 

and between faces
This commit is contained in:
ganovelli 2011-06-14 16:18:34 +00:00
parent ddb4e72887
commit a815890b15
4 changed files with 31 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
vcg/simplex/face/component.h
View File

@ -20,80 +20,7 @@
* for more details. * * for more details. *
* * * *
****************************************************************************/ ****************************************************************************/
/****************************************************************************
History
$Log: not supported by cvs2svn $
Revision 1.21 2008/02/04 21:26:45 ganovelli
added ImportData which imports all local attributes into vertexplus and faceplus.
A local attribute is everything (N(), C(), Q()....) except pointers to other simplices
(i.e. FFAdj, VFAdj, VertexRef) which are set to NULL.
Added some function for const attributes
Revision 1.20 2008/01/28 08:42:51 cignoni
added assert when writing on empty data members
Revision 1.19 2008/01/19 17:49:05 ganovelli
missing const cVF added
Revision 1.18 2007/11/20 09:43:53 ganovelli
added missing include to color4
Revision 1.17 2007/05/04 16:16:04 ganovelli
added include to texcoor2
Revision 1.16 2007/03/12 15:42:11 tarini
Texture coord name change! "TCoord" and "Texture" are BAD. "TexCoord" is GOOD.
Revision 1.15 2007/03/12 15:37:19 tarini
Texture coord name change! "TCoord" and "Texture" are BAD. "TexCoord" is GOOD.
Revision 1.14 2007/02/27 09:32:00 cignoni
Added constructor to the VFadj component to comply to the allocator needs
Revision 1.13 2007/02/12 19:01:23 ganovelli
added Name(std:vector<std::string>& n) that fills n with the names of the attribute of the face type
Revision 1.12 2007/01/11 10:22:39 cignoni
Added intialization of vertexRef to 0.
Revision 1.11 2006/12/06 00:08:57 cignoni
Added FFp1 and FFp2 shortcuts
Revision 1.10 2006/12/04 11:00:02 ganovelli
Cambiate Has*Opt in Has*Occ e aggiunti typedef per la compilazione di Occ
Revision 1.9 2006/11/28 22:34:28 cignoni
Added default constructor with null initialization to adjacency members.
AddFaces and AddVertices NEED to know if the topology is correctly computed to update it.
Revision 1.8 2006/10/07 09:59:42 cignoni
Added missing const to EmptyFF
Revision 1.7 2006/01/09 13:58:55 cignoni
Added Initialization of Color in Vertex and Face Components
Revision 1.6 2005/11/22 15:49:39 cignoni
removed two spurious computenormal
Revision 1.5 2005/11/21 21:44:47 cignoni
Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!)
Revision 1.4 2005/11/18 15:44:49 cignoni
Access to constant normal changed from by val to by reference
Revision 1.3 2005/11/16 22:58:17 cignoni
Added IncrementalMark and WedgeTexCoord
Standardized name of flags. It is plural becouse each simplex has many flag.
Revision 1.2 2005/11/12 18:43:14 cignoni
added missing cFFi
Revision 1.1 2005/10/14 15:07:58 cignoni
First Really Working version
****************************************************************************/
#ifndef __VCG_FACE_PLUS_COMPONENT #ifndef __VCG_FACE_PLUS_COMPONENT
#define __VCG_FACE_PLUS_COMPONENT #define __VCG_FACE_PLUS_COMPONENT
@ -643,6 +570,10 @@ public:
typename T::FacePointer const FFp1( const int j ) const { return FFp((j+1)%3);} typename T::FacePointer const FFp1( const int j ) const { return FFp((j+1)%3);}
typename T::FacePointer const FFp2( const int j ) const { return FFp((j+2)%3);} typename T::FacePointer const FFp2( const int j ) const { return FFp((j+2)%3);}
typename T::FacePointer & Neigh( const int j ) { return _ffp[j];}
typename T::FacePointer const cNeigh( const int j ) const { return _ffp[j];}
unsigned int SizeNeigh(){return 3;}
template <class RightF> template <class RightF>
void ImportData(const RightF & rightF){T::ImportData(rightF);} void ImportData(const RightF & rightF){T::ImportData(rightF);}
inline void Alloc(const int & ns){T::Alloc(ns);} inline void Alloc(const int & ns){T::Alloc(ns);}

4
vcg/simplex/face/component_ocf.h
View File

@ -437,6 +437,10 @@ public:
typename T::FacePointer &FFp2( const int j ) { return FFp((j+2)%3);} typename T::FacePointer &FFp2( const int j ) { return FFp((j+2)%3);}
typename T::FacePointer const FFp1( const int j ) const { return FFp((j+1)%3);} typename T::FacePointer const FFp1( const int j ) const { return FFp((j+1)%3);}
typename T::FacePointer const FFp2( const int j ) const { return FFp((j+2)%3);} typename T::FacePointer const FFp2( const int j ) const { return FFp((j+2)%3);}
typename T::FacePointer & Neigh( const int j ) { return FFp(j);}
typename T::FacePointer const cNeigh( const int j ) const { return cFFp(j);}
unsigned int SizeNeigh(){return 3;}
template <class LeftF> template <class LeftF>
void ImportData(const LeftF & leftF){ void ImportData(const LeftF & leftF){

4
vcg/simplex/face/component_polygon.h
View File

@ -183,6 +183,8 @@ public:
char &FFi(const int j){static char z=0; assert(0); return z;}; char &FFi(const int j){static char z=0; assert(0); return z;};
const char &cVFi(const int j){static char z=0; return z;}; const char &cVFi(const int j){static char z=0; return z;};
const char &cFFi(const int j) const {static char z=0; return z;}; const char &cFFi(const int j) const {static char z=0; return z;};
unsigned int SizeNeigh(){assert(0); return 0;}
template <class LeftF> template <class LeftF>
void ImportData(const LeftF & leftF){ T::ImportData(leftF);} void ImportData(const LeftF & leftF){ T::ImportData(leftF);}
void Alloc(const int & ns){T::Alloc(ns);} void Alloc(const int & ns){T::Alloc(ns);}
@ -221,6 +223,8 @@ public:
T::Alloc(ns); T::Alloc(ns);
} }
unsigned int SizeNeigh(){ return this->VN();}
inline void Dealloc() { if(_vfpP!=NULL){ inline void Dealloc() { if(_vfpP!=NULL){
delete [] _vfpP; _vfpP = NULL; delete [] _vfpP; _vfpP = NULL;
delete [] _vfiP; _vfiP = NULL; delete [] _vfiP; _vfiP = NULL;

19
vcg/simplex/vertex/component.h
View File

@ -426,6 +426,25 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::st
}; };
template <class T> class VNeigh: public T {
public:
VNeigh(){}
typename T::VertexPointer &Neigh(const int j) { assert(j>=0 && j<_nn.size()); return _nn[j]; }
typename T::VertexPointer cNeigh(const int j) { assert(j>=0 && j<_nn.size()); return _nn[j]; }
size_t SizeNeigh(){return _nn.size();}
void ClearNeigh(){_nn.clear();}
void AddNeigh(typename T::VertexPointer v){_nn.push_back(v);}
template <class RightF>
void ImportData(const RightF & rightF){T::ImportData(rightF);}
static bool HasVVNeigh() { return true; }
static bool HasVVNeighOcc() { return false; }
static void Name(std::vector<std::string> & name){name.push_back(std::string("VVNeigh"));T::Name(name);}
private:
std::vector<typename T::VertexPointer> _nn;
};
/*----------------------------- VEADJ ------------------------------*/ /*----------------------------- VEADJ ------------------------------*/
template <class T> class VEAdj: public T { template <class T> class VEAdj: public T {