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

Re-inserted the cFFp and cVFp access. If only the const version of the member function exists, the compiler will call it 

when a non-const object invokes that function
This commit is contained in:
Paolo Cignoni 2005-10-13 09:32:11 +00:00
parent b63a90172e
commit dee2e4f284
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vcg/complex/trimesh/allocate.h
View File

@ -24,6 +24,10 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.23 2005/10/12 17:26:19 ponchio
cFFp doesn not exist -> FFp (there is the const version...)
same for cVFp.
Revision 1.22 2005/10/12 10:47:21 cignoni Revision 1.22 2005/10/12 10:47:21 cignoni
Removed clearing of flags of added faces. Now the flag component has a constructor that clear it. Removed clearing of flags of added faces. Now the flag component has a constructor that clear it.
FF and VF adjacency are updated only if they are present and consistent (e.g. only if VFp(k) != 0 or FFp(k)!=0) FF and VF adjacency are updated only if they are present and consistent (e.g. only if VFp(k) != 0 or FFp(k)!=0)
@ -325,20 +329,17 @@ static FaceIterator AddFaces(MeshType &m, int n, PointerUpdater<FacePointer> &pu
{ {
if(FaceType::HasFFAdjacency()) if(FaceType::HasFFAdjacency())
{ {
if ((*fi).FFp(0)!=0) pu.Update((*fi).FFp(0)); if ((*fi).cFFp(0)!=0) pu.Update((*fi).FFp(0));
if ((*fi).FFp(1)!=0) pu.Update((*fi).FFp(1)); if ((*fi).cFFp(1)!=0) pu.Update((*fi).FFp(1));
if ((*fi).FFp(2)!=0) pu.Update((*fi).FFp(2)); if ((*fi).cFFp(2)!=0) pu.Update((*fi).FFp(2));
} }
if(FaceType::HasVFAdjacency()) if(FaceType::HasVFAdjacency())
{ {
//update pointers to chain of face incident in a vertex //update pointers to chain of face incident in a vertex
//update them only if they are different from zero //update them only if they are different from zero
if ((*fi).VFp(0)!=0) if ((*fi).cVFp(0)!=0) pu.Update((*fi).VFp(0));
pu.Update((*fi).VFp(0)); if ((*fi).cVFp(1)!=0) pu.Update((*fi).VFp(1));
if ((*fi).VFp(1)!=0) if ((*fi).cVFp(2)!=0) pu.Update((*fi).VFp(2));
pu.Update((*fi).VFp(1));
if ((*fi).VFp(2)!=0)
pu.Update((*fi).VFp(2));
} }
} }
VertexIterator vi; VertexIterator vi;
@ -346,7 +347,7 @@ static FaceIterator AddFaces(MeshType &m, int n, PointerUpdater<FacePointer> &pu
if(!(*vi).IsD()) if(!(*vi).IsD())
{ {
if(VertexType::HasVFAdjacency()) if(VertexType::HasVFAdjacency())
if ((*vi).VFp()!=0) if ((*vi).cVFp()!=0)
pu.Update((FaceType * &)(*vi).VFp()); pu.Update((FaceType * &)(*vi).VFp());
// Note the above cast is probably not useful if you have correctly defined // Note the above cast is probably not useful if you have correctly defined
// your vertex type with the correct name of the facetype as a template argument; // your vertex type with the correct name of the facetype as a template argument;