From e87fff39971a4dc3d24d6727cd1e736855d6a35e Mon Sep 17 00:00:00 2001 From: ponchio Date: Tue, 6 Dec 2005 15:30:45 +0000 Subject: [PATCH] added #include triangle3.h for Normal(...) added a few FaceType:: instead of face:: --- vcg/complex/trimesh/update/normal.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vcg/complex/trimesh/update/normal.h b/vcg/complex/trimesh/update/normal.h index 91712fc4..6dacca25 100644 --- a/vcg/complex/trimesh/update/normal.h +++ b/vcg/complex/trimesh/update/normal.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.9 2005/11/22 15:47:34 cignoni +Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!) + Revision 1.8 2005/11/21 21:44:43 cignoni Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!) @@ -59,6 +62,8 @@ Initial commit #ifndef __VCG_TRI_UPDATE_NORMALS #define __VCG_TRI_UPDATE_NORMALS +#include + namespace vcg { namespace tri { @@ -88,7 +93,7 @@ static void PerFace(ComputeMeshType &m) if( !m.HasPerFaceNormal()) return; FaceIterator f; for(f=m.face.begin();f!=m.face.end();++f) - if( !(*f).IsD() ) face::ComputeNormal(*f); + if( !(*f).IsD() ) FaceType::ComputeNormal(*f); } @@ -165,7 +170,7 @@ static void PerFaceRW(ComputeMeshType &m, bool normalize=false) { for(int j=0; j<3; ++j) if( !(*f).V(j)->IsR()) cn = false; - if( cn ) face::ComputeNormalizedNormal(*f); + if( cn ) FaceType::ComputeNormalizedNormal(*f); cn = true; } } @@ -190,7 +195,7 @@ static void PerFaceNormalized(ComputeMeshType &m) if( !m.HasPerFaceNormal()) return; FaceIterator f; for(f=m.face.begin();f!=m.face.end();++f) - if( !(*f).IsD() ) face::ComputeNormalizedNormal(*f); + if( !(*f).IsD() ) FaceType::ComputeNormalizedNormal(*f); }