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

Removed NormalizedNormalV (out of standard and wrong) and 

added the member functions Normal and NormalizedNormal() (just like for faces)
This commit is contained in:
Paolo Cignoni 2005-03-18 00:13:45 +00:00
parent 9c05ca5f01
commit b4b7f45041
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
vcg/simplex/vertex/base.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.21 2004/10/28 00:50:49 cignoni
Better Doxygen documentation
Revision 1.20 2004/10/11 17:45:05 ganovelli Revision 1.20 2004/10/11 17:45:05 ganovelli
added template on corrdinate type (default Point3) added template on corrdinate type (default Point3)
@ -54,6 +57,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.21 2004/10/28 00:50:49 cignoni
Better Doxygen documentation
Revision 1.20 2004/10/11 17:45:05 ganovelli Revision 1.20 2004/10/11 17:45:05 ganovelli
added template on corrdinate type (default Point3) added template on corrdinate type (default Point3)
@ -717,6 +723,42 @@ public:
return *(CoordType *)this; return *(CoordType *)this;
#endif #endif
} }
template <bool NormalizeFlag>
const CoordType GenericNormal()
{
if (!v->HasVFAdjacency())
{
assert(0);
return (VERTEX_TYPE::CoordType (0,0,0));
}
else
{
vcg::face::VFIterator<typename VERTEX_TYPE::FaceType> VFi=vcg::face::VFIterator<typename VERTEX_TYPE::FaceType>();
VFi.f=v->VFp();
VFi.z=v->VFi();
typename VERTEX_TYPE::CoordType N= typename VERTEX_TYPE::CoordType(0,0,0);
while (!VFi.End())
{
N+=VFi.f->Normal();
VFi++;
}
if(NormalizeFlag) N.Normalize();
return N;
}
}
/// Return the un-normalized value of the vertex normal as it correspond to the current geometry.
/// It is always computed and never use any stored value.
/// REQUIRES vertex-face topology
const CoordType Normal() { return GenericNormal<false>(); }
/// Return the normalized value of the vertex normal as it correspond to the current geometry.
/// It is always computed and never use any stored value.
/// REQUIRES vertex-face topology
const CoordType NormalizedNormal() { return GenericNormal<true>(); }
//@} //@}
/***********************************************/ /***********************************************/
@ -857,29 +899,6 @@ inline void Convert( VERT_TYPE &v )
}; };
template <class VERTEX_TYPE> typename VERTEX_TYPE::CoordType NormalizedNormalV(VERTEX_TYPE *v)
{
if (!v->HasVFAdjacency())
{
assert(0);
return (VERTEX_TYPE::CoordType (0,0,0));
}
else
{
vcg::face::VFIterator<typename VERTEX_TYPE::FaceType> VFi=vcg::face::VFIterator<typename VERTEX_TYPE::FaceType>();
VFi.f=v->VFp();
VFi.z=v->VFi();
typename VERTEX_TYPE::CoordType N= typename VERTEX_TYPE::CoordType(0,0,0);
int i=0;
while (!VFi.End())
{
N+=VFi.f->NormalizedNormal();
i++;
VFi++;
}
return ((typename VERTEX_TYPE::CoordType) N/(typename VERTEX_TYPE::CoordType::ScalarType)i);
}
}
//@} //@}
} // end namespace } // end namespace
#endif #endif