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

added PerVertexFromCurrentFaceNormal 

AreaNormalizeFace NormalizeFace
and shortened PerVertexNormalizedPerFaceNormalized
This commit is contained in:
Paolo Cignoni 2008-04-18 17:52:08 +00:00
parent aea7147a64
commit 1f6ba5e9d5
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
vcg/complex/trimesh/update/normal.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.19 2008/02/15 08:08:59 cignoni
added missing include matrix33
Revision 1.18 2007/12/13 17:57:27 cignoni Revision 1.18 2007/12/13 17:57:27 cignoni
removed harmless gcc warnings removed harmless gcc warnings
@ -118,7 +121,7 @@ typedef typename MeshType::FaceType FaceType;
typedef typename MeshType::FacePointer FacePointer; typedef typename MeshType::FacePointer FacePointer;
typedef typename MeshType::FaceIterator FaceIterator; typedef typename MeshType::FaceIterator FaceIterator;
/// Calculates the vertex normal (if stored in the current face type) /// Calculates the face normal (if stored in the current face type)
static void PerFace(ComputeMeshType &m) static void PerFace(ComputeMeshType &m)
{ {
if( !m.HasPerFaceNormal()) return; if( !m.HasPerFaceNormal()) return;
@ -127,6 +130,27 @@ static void PerFace(ComputeMeshType &m)
if( !(*f).IsD() ) face::ComputeNormal(*f); if( !(*f).IsD() ) face::ComputeNormal(*f);
} }
/// Calculates the vertex normal. Exploiting or current face normals
/// The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
static void PerVertexFromCurrentFaceNormal(ComputeMeshType &m)
{
if( !m.HasPerVertexNormal()) return;
VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
if( !(*vi).IsD() && (*vi).IsRW() )
(*vi).N().Construct(0,0,0);
FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi)
if( !(*fi).IsD())
{
for(int j=0; j<3; ++j)
if( !(*fi).V(j)->IsD())
(*fi).V(j)->N() += (*fi).cN();
}
}
/// Calculates the vertex normal. Without exploiting or touching face normals /// Calculates the vertex normal. Without exploiting or touching face normals
/// The normal of a vertex v is the weigthed average of the normals of the faces incident on v. /// The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
@ -153,6 +177,7 @@ static void PerVertex(ComputeMeshType &m)
} }
} }
/// Calculates both vertex and face normals. /// Calculates both vertex and face normals.
/// The normal of a vertex v is the weigthed average of the normals of the faces incident on v. /// The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
static void PerVertexPerFace(ComputeMeshType &m) static void PerVertexPerFace(ComputeMeshType &m)
@ -186,12 +211,31 @@ static void PerVertexNormalizedPerFace(ComputeMeshType &m)
if( !(*vi).IsD() && (*vi).IsRW() ) if( !(*vi).IsD() && (*vi).IsRW() )
(*vi).N().Normalize(); (*vi).N().Normalize();
} }
/// Normalize the lenght of the face normals
static void NormalizeFace(ComputeMeshType &m)
{
FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi)
if( !(*fi).IsD() ) (*fi).N().Normalize();
}
static void AreaNormalizeFace(ComputeMeshType &m)
{
FaceIterator fi;
for(fi=m.face.begin();fi!=m.face.end();++fi)
if( !(*fi).IsD() )
{
(*fi).N().Normalize();
(*fi).N() = (*fi).N() * DoubleArea(*fi);
}
}
static void PerVertexNormalizedPerFaceNormalized(ComputeMeshType &m) static void PerVertexNormalizedPerFaceNormalized(ComputeMeshType &m)
{ {
PerVertexNormalizedPerFace(m); PerVertexNormalizedPerFace(m);
FaceIterator fi; NormalizeFace(m);
for(fi=m.face.begin();fi!=m.face.end();++fi) }
if( !(*fi).IsD() ) (*fi).N().Normalize();}
static void PerFaceRW(ComputeMeshType &m, bool normalize=false) static void PerFaceRW(ComputeMeshType &m, bool normalize=false)
{ {