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

wrong define FACE_N instead of FACE_FN

This commit is contained in:
Paolo Cignoni 2004-04-05 11:51:22 +00:00
parent 2c95c0cd3a
commit ec3c53d1d5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vcg/simplex/face/base.h
View File

@ -24,6 +24,9 @@
History
$Log: not supported by cvs2svn $
Revision 1.4 2004/03/29 08:37:09 cignoni
missing include
Revision 1.3 2004/03/10 00:52:38 cignoni
Moved geometric stuff to the space/triangle class
@ -199,29 +202,29 @@ protected:
public:
#endif
/// Return the reference of the normal to the face (if __VCGLIB_FACE_N is defined).
/// Return the reference of the normal to the face (if __VCGLIB_FACE_FN is defined).
inline CoordType & N()
{
#ifdef __VCGLIB_FACE_N
#ifdef __VCGLIB_FACE_FN
return _n;
#else
assert(0);
return *(CoordType *)0;
#endif
}
/// Return the reference of the normal to the face (if __VCGLIB_FACE_N is defined).
/// Return the reference of the normal to the face (if __VCGLIB_FACE_FN is defined).
inline const CoordType & N() const
{
#ifdef __VCGLIB_FACE_N
#ifdef __VCGLIB_FACE_FN
return _n;
#else
return *(CoordType *)0;
#endif
}
/// Return the reference of the normal to the face (if __VCGLIB_FACE_N is defined).
/// Return the reference of the normal to the face (if __VCGLIB_FACE_FN is defined).
inline const CoordType cN() const
{
#ifdef __VCGLIB_FACE_N
#ifdef __VCGLIB_FACE_FN
return _n;
#else
return *(CoordType *)0;
@ -231,15 +234,15 @@ public:
/// Calculate the normal to the face, the value is store in the field _n of the face
void ComputeNormal()
{
#ifdef __VCGLIB_FACE_N
_n = vcg::Normal(V(0)->cP(), V(1)->cP(), V(2)->cP());
#ifdef __VCGLIB_FACE_FN
_n = vcg::Normal(*this);
#else
assert(0);
#endif
}
void ComputeNormalizedNormal()
{
#ifdef __VCGLIB_FACE_N
#ifdef __VCGLIB_FACE_FN
_n = vcg::NormalizedNormal(V(0)->cP(), V(1)->cP(), V(2)->cP());
#else
assert(0);