corrected bug in PerVertexFromCurrentFaceNormal (wrong use of Construct() )
This commit is contained in:
parent
a37e44cff1
commit
2143a5138a
|
|
@ -1,365 +1,366 @@
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* VCGLib o o *
|
* VCGLib o o *
|
||||||
* Visual and Computer Graphics Library o o *
|
* Visual and Computer Graphics Library o o *
|
||||||
* _ O _ *
|
* _ O _ *
|
||||||
* Copyright(C) 2004 \/)\/ *
|
* Copyright(C) 2004 \/)\/ *
|
||||||
* Visual Computing Lab /\/| *
|
* Visual Computing Lab /\/| *
|
||||||
* ISTI - Italian National Research Council | *
|
* ISTI - Italian National Research Council | *
|
||||||
* \ *
|
* \ *
|
||||||
* All rights reserved. *
|
* All rights reserved. *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or modify *
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
* it under the terms of the GNU General Public License as published by *
|
* it under the terms of the GNU General Public License as published by *
|
||||||
* the Free Software Foundation; either version 2 of the License, or *
|
* the Free Software Foundation; either version 2 of the License, or *
|
||||||
* (at your option) any later version. *
|
* (at your option) any later version. *
|
||||||
* *
|
* *
|
||||||
* This program is distributed in the hope that it will be useful, *
|
* This program is distributed in the hope that it will be useful, *
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
|
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
Revision 1.20 2008/04/18 17:52:08 cignoni
|
Revision 1.20 2008/04/18 17:52:08 cignoni
|
||||||
added PerVertexFromCurrentFaceNormal
|
added PerVertexFromCurrentFaceNormal
|
||||||
AreaNormalizeFace NormalizeFace
|
AreaNormalizeFace NormalizeFace
|
||||||
and shortened PerVertexNormalizedPerFaceNormalized
|
and shortened PerVertexNormalizedPerFaceNormalized
|
||||||
|
|
||||||
Revision 1.19 2008/02/15 08:08:59 cignoni
|
Revision 1.19 2008/02/15 08:08:59 cignoni
|
||||||
added missing include matrix33
|
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
|
||||||
|
|
||||||
Revision 1.17 2007/11/23 17:02:47 cignoni
|
Revision 1.17 2007/11/23 17:02:47 cignoni
|
||||||
disambiguated pow call (again)
|
disambiguated pow call (again)
|
||||||
|
|
||||||
Revision 1.16 2007/11/23 15:42:11 cignoni
|
Revision 1.16 2007/11/23 15:42:11 cignoni
|
||||||
disambiguated pow call
|
disambiguated pow call
|
||||||
|
|
||||||
Revision 1.15 2007/11/14 11:56:23 ganovelli
|
Revision 1.15 2007/11/14 11:56:23 ganovelli
|
||||||
added updating of vertex and face normals
|
added updating of vertex and face normals
|
||||||
|
|
||||||
Revision 1.14 2007/07/12 23:11:35 cignoni
|
Revision 1.14 2007/07/12 23:11:35 cignoni
|
||||||
added the missing PerVertexNormalizedPerFaceNormalized
|
added the missing PerVertexNormalizedPerFaceNormalized
|
||||||
|
|
||||||
Revision 1.13 2007/01/10 17:25:14 matteodelle
|
Revision 1.13 2007/01/10 17:25:14 matteodelle
|
||||||
*** empty log message ***
|
*** empty log message ***
|
||||||
|
|
||||||
Revision 1.12 2006/11/07 15:13:56 zifnab1974
|
Revision 1.12 2006/11/07 15:13:56 zifnab1974
|
||||||
Necessary changes for compilation with gcc 3.4.6. Especially the hash function is a problem
|
Necessary changes for compilation with gcc 3.4.6. Especially the hash function is a problem
|
||||||
|
|
||||||
Revision 1.11 2005/12/06 18:22:31 pietroni
|
Revision 1.11 2005/12/06 18:22:31 pietroni
|
||||||
changed FaceType::ComputeNormal and FaceType::ComputeNormalizedNormal
|
changed FaceType::ComputeNormal and FaceType::ComputeNormalizedNormal
|
||||||
with face::ComputeNormal and face::ComputeNormalizedNormal
|
with face::ComputeNormal and face::ComputeNormalizedNormal
|
||||||
|
|
||||||
Revision 1.10 2005/12/06 15:30:45 ponchio
|
Revision 1.10 2005/12/06 15:30:45 ponchio
|
||||||
added #include triangle3.h for Normal(...)
|
added #include triangle3.h for Normal(...)
|
||||||
|
|
||||||
added a few FaceType:: instead of face::
|
added a few FaceType:: instead of face::
|
||||||
|
|
||||||
Revision 1.9 2005/11/22 15:47:34 cignoni
|
Revision 1.9 2005/11/22 15:47:34 cignoni
|
||||||
Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!)
|
Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!)
|
||||||
|
|
||||||
Revision 1.8 2005/11/21 21:44:43 cignoni
|
Revision 1.8 2005/11/21 21:44:43 cignoni
|
||||||
Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!)
|
Moved ComputeNormal and ComputeNormalizedNormal out of the face class (no more a member function!)
|
||||||
|
|
||||||
Revision 1.7 2005/10/13 08:38:00 cignoni
|
Revision 1.7 2005/10/13 08:38:00 cignoni
|
||||||
removed the access to the face member function normal and substituted with vcg::normal(*f);
|
removed the access to the face member function normal and substituted with vcg::normal(*f);
|
||||||
|
|
||||||
Revision 1.6 2005/06/17 00:46:09 cignoni
|
Revision 1.6 2005/06/17 00:46:09 cignoni
|
||||||
Added a PerVertexNormalizedPerFace (vertex are face/area weighted AND normalized)
|
Added a PerVertexNormalizedPerFace (vertex are face/area weighted AND normalized)
|
||||||
|
|
||||||
Revision 1.5 2005/04/01 13:04:55 fiorin
|
Revision 1.5 2005/04/01 13:04:55 fiorin
|
||||||
Minor changes
|
Minor changes
|
||||||
|
|
||||||
Revision 1.4 2004/09/09 14:35:14 ponchio
|
Revision 1.4 2004/09/09 14:35:14 ponchio
|
||||||
Typename changes for linux
|
Typename changes for linux
|
||||||
|
|
||||||
Revision 1.3 2004/08/31 15:18:54 pietroni
|
Revision 1.3 2004/08/31 15:18:54 pietroni
|
||||||
minor changes to comply gcc compiler (typename's )
|
minor changes to comply gcc compiler (typename's )
|
||||||
|
|
||||||
Revision 1.2 2004/03/12 15:22:19 cignoni
|
Revision 1.2 2004/03/12 15:22:19 cignoni
|
||||||
Written some documentation and added to the trimes doxygen module
|
Written some documentation and added to the trimes doxygen module
|
||||||
|
|
||||||
Revision 1.1 2004/03/05 10:59:24 cignoni
|
Revision 1.1 2004/03/05 10:59:24 cignoni
|
||||||
Changed name from plural to singular (normals->normal)
|
Changed name from plural to singular (normals->normal)
|
||||||
|
|
||||||
Revision 1.1 2004/03/04 00:05:50 cignoni
|
Revision 1.1 2004/03/04 00:05:50 cignoni
|
||||||
First working version!
|
First working version!
|
||||||
|
|
||||||
Revision 1.1 2004/02/19 13:11:06 cignoni
|
Revision 1.1 2004/02/19 13:11:06 cignoni
|
||||||
Initial commit
|
Initial commit
|
||||||
|
|
||||||
|
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#ifndef __VCG_TRI_UPDATE_NORMALS
|
#ifndef __VCG_TRI_UPDATE_NORMALS
|
||||||
#define __VCG_TRI_UPDATE_NORMALS
|
#define __VCG_TRI_UPDATE_NORMALS
|
||||||
|
|
||||||
#include <vcg/space/triangle3.h>
|
#include <vcg/space/triangle3.h>
|
||||||
#include <vcg/math/matrix33.h>
|
#include <vcg/math/matrix33.h>
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
namespace tri {
|
namespace tri {
|
||||||
|
|
||||||
/// \ingroup trimesh
|
/// \ingroup trimesh
|
||||||
|
|
||||||
/// \headerfile normal.h vcg/complex/trimesh/update/normal.h
|
/// \headerfile normal.h vcg/complex/trimesh/update/normal.h
|
||||||
|
|
||||||
/// \brief Management, updating and computation of per-vertex and per-face normals.
|
/// \brief Management, updating and computation of per-vertex and per-face normals.
|
||||||
/**
|
/**
|
||||||
This class is used to compute or update the normals that can be stored in the vertex or face component of a mesh.
|
This class is used to compute or update the normals that can be stored in the vertex or face component of a mesh.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
template <class ComputeMeshType>
|
template <class ComputeMeshType>
|
||||||
class UpdateNormals
|
class UpdateNormals
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef ComputeMeshType MeshType;
|
typedef ComputeMeshType MeshType;
|
||||||
typedef typename MeshType::VertexType VertexType;
|
typedef typename MeshType::VertexType VertexType;
|
||||||
typedef typename VertexType::NormalType NormalType;
|
typedef typename MeshType::CoordType CoordType;
|
||||||
typedef typename VertexType::ScalarType ScalarType;
|
typedef typename VertexType::NormalType NormalType;
|
||||||
typedef typename MeshType::VertexPointer VertexPointer;
|
typedef typename VertexType::ScalarType ScalarType;
|
||||||
typedef typename MeshType::VertexIterator VertexIterator;
|
typedef typename MeshType::VertexPointer VertexPointer;
|
||||||
typedef typename MeshType::FaceType FaceType;
|
typedef typename MeshType::VertexIterator VertexIterator;
|
||||||
typedef typename MeshType::FacePointer FacePointer;
|
typedef typename MeshType::FaceType FaceType;
|
||||||
typedef typename MeshType::FaceIterator FaceIterator;
|
typedef typename MeshType::FacePointer FacePointer;
|
||||||
|
typedef typename MeshType::FaceIterator FaceIterator;
|
||||||
/// \brief Calculates the face normal (if stored in the current face type)
|
|
||||||
|
/// \brief 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;
|
{
|
||||||
FaceIterator f;
|
if( !m.HasPerFaceNormal()) return;
|
||||||
for(f=m.face.begin();f!=m.face.end();++f)
|
FaceIterator f;
|
||||||
if( !(*f).IsD() ) face::ComputeNormal(*f);
|
for(f=m.face.begin();f!=m.face.end();++f)
|
||||||
}
|
if( !(*f).IsD() ) face::ComputeNormal(*f);
|
||||||
|
}
|
||||||
/// \brief Calculates the vertex normal. Exploiting or current face normals.
|
|
||||||
/**
|
/// \brief 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.
|
/**
|
||||||
*/
|
The normal of a vertex v is the weigthed average of the normals of the faces incident on v.
|
||||||
static void PerVertexFromCurrentFaceNormal(ComputeMeshType &m)
|
*/
|
||||||
{
|
static void PerVertexFromCurrentFaceNormal(ComputeMeshType &m)
|
||||||
if( !m.HasPerVertexNormal()) return;
|
{
|
||||||
|
if( !m.HasPerVertexNormal()) return;
|
||||||
VertexIterator vi;
|
|
||||||
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
VertexIterator vi;
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N().Construct(0,0,0);
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
|
(*vi).N()=CoordType(0,0,0);
|
||||||
FaceIterator fi;
|
|
||||||
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
FaceIterator fi;
|
||||||
if( !(*fi).IsD())
|
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())
|
for(int j=0; j<3; ++j)
|
||||||
(*fi).V(j)->N() += (*fi).cN();
|
if( !(*fi).V(j)->IsD())
|
||||||
}
|
(*fi).V(j)->N() += (*fi).cN();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// \brief Calculates the vertex normal. Without exploiting or touching face normals.
|
|
||||||
/**
|
/// \brief 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.
|
||||||
|
*/
|
||||||
static void PerVertex(ComputeMeshType &m)
|
|
||||||
{
|
static void PerVertex(ComputeMeshType &m)
|
||||||
if( !m.HasPerVertexNormal()) return;
|
{
|
||||||
|
if( !m.HasPerVertexNormal()) return;
|
||||||
VertexIterator vi;
|
|
||||||
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
VertexIterator vi;
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N() = NormalType((ScalarType)0,(ScalarType)0,(ScalarType)0);
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
|
(*vi).N() = NormalType((ScalarType)0,(ScalarType)0,(ScalarType)0);
|
||||||
FaceIterator f;
|
|
||||||
|
FaceIterator f;
|
||||||
for(f=m.face.begin();f!=m.face.end();++f)
|
|
||||||
if( !(*f).IsD() && (*f).IsR() )
|
for(f=m.face.begin();f!=m.face.end();++f)
|
||||||
{
|
if( !(*f).IsD() && (*f).IsR() )
|
||||||
//typename FaceType::NormalType t = (*f).Normal();
|
{
|
||||||
typename FaceType::NormalType t = vcg::Normal(*f);
|
//typename FaceType::NormalType t = (*f).Normal();
|
||||||
|
typename FaceType::NormalType t = vcg::Normal(*f);
|
||||||
for(int j=0; j<3; ++j)
|
|
||||||
if( !(*f).V(j)->IsD() && (*f).V(j)->IsRW() )
|
for(int j=0; j<3; ++j)
|
||||||
(*f).V(j)->N() += t;
|
if( !(*f).V(j)->IsD() && (*f).V(j)->IsRW() )
|
||||||
}
|
(*f).V(j)->N() += t;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// \brief Calculates both vertex and face normals.
|
|
||||||
/**
|
/// \brief 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)
|
||||||
if( !m.HasPerVertexNormal() || !m.HasPerFaceNormal()) return;
|
{
|
||||||
|
if( !m.HasPerVertexNormal() || !m.HasPerFaceNormal()) return;
|
||||||
PerFace(m);
|
|
||||||
VertexIterator vi;
|
PerFace(m);
|
||||||
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
VertexIterator vi;
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N() = NormalType((ScalarType)0,(ScalarType)0,(ScalarType)0);
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
|
(*vi).N() = NormalType((ScalarType)0,(ScalarType)0,(ScalarType)0);
|
||||||
FaceIterator f;
|
|
||||||
|
FaceIterator f;
|
||||||
for(f=m.face.begin();f!=m.face.end();++f)
|
|
||||||
if( !(*f).IsD() && (*f).IsR() )
|
for(f=m.face.begin();f!=m.face.end();++f)
|
||||||
{
|
if( !(*f).IsD() && (*f).IsR() )
|
||||||
for(int j=0; j<3; ++j)
|
{
|
||||||
if( !(*f).V(j)->IsD() && (*f).V(j)->IsRW() )
|
for(int j=0; j<3; ++j)
|
||||||
(*f).V(j)->N() += (*f).cN();
|
if( !(*f).V(j)->IsD() && (*f).V(j)->IsRW() )
|
||||||
}
|
(*f).V(j)->N() += (*f).cN();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
/// \brief Calculates both vertex and face normals.
|
|
||||||
/**
|
/// \brief 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 PerVertexNormalizedPerFace(ComputeMeshType &m)
|
|
||||||
{
|
static void PerVertexNormalizedPerFace(ComputeMeshType &m)
|
||||||
PerVertexPerFace(m);
|
{
|
||||||
NormalizeVertex(m);
|
PerVertexPerFace(m);
|
||||||
}
|
NormalizeVertex(m);
|
||||||
|
}
|
||||||
/// \brief Normalize the lenght of the face normals.
|
|
||||||
static void NormalizeVertex(ComputeMeshType &m)
|
/// \brief Normalize the lenght of the face normals.
|
||||||
{
|
static void NormalizeVertex(ComputeMeshType &m)
|
||||||
VertexIterator vi;
|
{
|
||||||
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
VertexIterator vi;
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N().Normalize();
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
}
|
(*vi).N().Normalize();
|
||||||
|
}
|
||||||
/// \brief Normalize the lenght of the face normals.
|
|
||||||
static void NormalizeFace(ComputeMeshType &m)
|
/// \brief Normalize the lenght of the face normals.
|
||||||
{
|
static void NormalizeFace(ComputeMeshType &m)
|
||||||
FaceIterator fi;
|
{
|
||||||
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
FaceIterator fi;
|
||||||
if( !(*fi).IsD() ) (*fi).N().Normalize();
|
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
||||||
}
|
if( !(*fi).IsD() ) (*fi).N().Normalize();
|
||||||
|
}
|
||||||
static void AreaNormalizeFace(ComputeMeshType &m)
|
|
||||||
{
|
static void AreaNormalizeFace(ComputeMeshType &m)
|
||||||
FaceIterator fi;
|
{
|
||||||
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
FaceIterator fi;
|
||||||
if( !(*fi).IsD() )
|
for(fi=m.face.begin();fi!=m.face.end();++fi)
|
||||||
{
|
if( !(*fi).IsD() )
|
||||||
(*fi).N().Normalize();
|
{
|
||||||
(*fi).N() = (*fi).N() * DoubleArea(*fi);
|
(*fi).N().Normalize();
|
||||||
}
|
(*fi).N() = (*fi).N() * DoubleArea(*fi);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
static void PerVertexNormalizedPerFaceNormalized(ComputeMeshType &m)
|
|
||||||
{
|
static void PerVertexNormalizedPerFaceNormalized(ComputeMeshType &m)
|
||||||
PerVertexNormalizedPerFace(m);
|
{
|
||||||
NormalizeFace(m);
|
PerVertexNormalizedPerFace(m);
|
||||||
}
|
NormalizeFace(m);
|
||||||
|
}
|
||||||
static void PerFaceRW(ComputeMeshType &m, bool normalize=false)
|
|
||||||
{
|
static void PerFaceRW(ComputeMeshType &m, bool normalize=false)
|
||||||
if( !m.HasPerFaceNormal()) return;
|
{
|
||||||
|
if( !m.HasPerFaceNormal()) return;
|
||||||
FaceIterator f;
|
|
||||||
bool cn = true;
|
FaceIterator f;
|
||||||
|
bool cn = true;
|
||||||
if(normalize)
|
|
||||||
{
|
if(normalize)
|
||||||
for(f=m.m.face.begin();f!=m.m.face.end();++f)
|
{
|
||||||
if( !(*f).IsD() && (*f).IsRW() )
|
for(f=m.m.face.begin();f!=m.m.face.end();++f)
|
||||||
{
|
if( !(*f).IsD() && (*f).IsRW() )
|
||||||
for(int j=0; j<3; ++j)
|
{
|
||||||
if( !(*f).V(j)->IsR()) cn = false;
|
for(int j=0; j<3; ++j)
|
||||||
if( cn ) face::ComputeNormalizedNormal(*f);
|
if( !(*f).V(j)->IsR()) cn = false;
|
||||||
cn = true;
|
if( cn ) face::ComputeNormalizedNormal(*f);
|
||||||
}
|
cn = true;
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
{
|
else
|
||||||
for(f=m.m.face.begin();f!=m.m.face.end();++f)
|
{
|
||||||
if( !(*f).IsD() && (*f).IsRW() )
|
for(f=m.m.face.begin();f!=m.m.face.end();++f)
|
||||||
{
|
if( !(*f).IsD() && (*f).IsRW() )
|
||||||
for(int j=0; j<3; ++j)
|
{
|
||||||
if( !(*f).V(j)->IsR()) cn = false;
|
for(int j=0; j<3; ++j)
|
||||||
|
if( !(*f).V(j)->IsR()) cn = false;
|
||||||
if( cn )
|
|
||||||
(*f).ComputeNormal();
|
if( cn )
|
||||||
cn = true;
|
(*f).ComputeNormal();
|
||||||
}
|
cn = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void PerFaceNormalized(ComputeMeshType &m)
|
|
||||||
{
|
static void PerFaceNormalized(ComputeMeshType &m)
|
||||||
if( !m.HasPerFaceNormal()) return;
|
{
|
||||||
FaceIterator f;
|
if( !m.HasPerFaceNormal()) return;
|
||||||
for(f=m.face.begin();f!=m.face.end();++f)
|
FaceIterator f;
|
||||||
if( !(*f).IsD() ) face::ComputeNormalizedNormal(*f);
|
for(f=m.face.begin();f!=m.face.end();++f)
|
||||||
}
|
if( !(*f).IsD() ) face::ComputeNormalizedNormal(*f);
|
||||||
|
}
|
||||||
|
|
||||||
/// \brief Calculates the vertex normal.
|
|
||||||
static void PerVertexNormalized(ComputeMeshType &m)
|
/// \brief Calculates the vertex normal.
|
||||||
{
|
static void PerVertexNormalized(ComputeMeshType &m)
|
||||||
if( !m.HasPerVertexNormal()) return;
|
{
|
||||||
PerVertex(m);
|
if( !m.HasPerVertexNormal()) return;
|
||||||
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
|
PerVertex(m);
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N().Normalize();
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
}
|
(*vi).N().Normalize();
|
||||||
|
}
|
||||||
/// \brief Multiply the vertex normals by the matrix passed. By default, the scale component is removed.
|
|
||||||
static void PerVertexMatrix(ComputeMeshType &m, const Matrix44<ScalarType> &mat, bool remove_scaling= true){
|
/// \brief Multiply the vertex normals by the matrix passed. By default, the scale component is removed.
|
||||||
float scale;
|
static void PerVertexMatrix(ComputeMeshType &m, const Matrix44<ScalarType> &mat, bool remove_scaling= true){
|
||||||
|
float scale;
|
||||||
Matrix33<ScalarType> mat33(mat,3);
|
|
||||||
|
Matrix33<ScalarType> mat33(mat,3);
|
||||||
if( !m.HasPerVertexNormal()) return;
|
|
||||||
|
if( !m.HasPerVertexNormal()) return;
|
||||||
if(remove_scaling){
|
|
||||||
scale = pow(mat33.Determinant(),(ScalarType)(1.0/3.0));
|
if(remove_scaling){
|
||||||
mat33[0][0]/=scale;
|
scale = pow(mat33.Determinant(),(ScalarType)(1.0/3.0));
|
||||||
mat33[1][1]/=scale;
|
mat33[0][0]/=scale;
|
||||||
mat33[2][2]/=scale;
|
mat33[1][1]/=scale;
|
||||||
}
|
mat33[2][2]/=scale;
|
||||||
|
}
|
||||||
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
|
|
||||||
if( !(*vi).IsD() && (*vi).IsRW() )
|
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
(*vi).N() = mat33*(*vi).N();
|
if( !(*vi).IsD() && (*vi).IsRW() )
|
||||||
}
|
(*vi).N() = mat33*(*vi).N();
|
||||||
|
}
|
||||||
/// \brief Multiply the face normals by the matrix passed. By default, the scale component is removed.
|
|
||||||
static void PerFaceMatrix(ComputeMeshType &m, const Matrix44<ScalarType> &mat, bool remove_scaling= true){
|
/// \brief Multiply the face normals by the matrix passed. By default, the scale component is removed.
|
||||||
float scale;
|
static void PerFaceMatrix(ComputeMeshType &m, const Matrix44<ScalarType> &mat, bool remove_scaling= true){
|
||||||
|
float scale;
|
||||||
Matrix33<ScalarType> mat33(mat,3);
|
|
||||||
|
Matrix33<ScalarType> mat33(mat,3);
|
||||||
if( !m.HasPerFaceNormal()) return;
|
|
||||||
|
if( !m.HasPerFaceNormal()) return;
|
||||||
if(remove_scaling){
|
|
||||||
scale = pow(mat33.Determinant(),ScalarType(1.0/3.0));
|
if(remove_scaling){
|
||||||
mat33[0][0]/=scale;
|
scale = pow(mat33.Determinant(),ScalarType(1.0/3.0));
|
||||||
mat33[1][1]/=scale;
|
mat33[0][0]/=scale;
|
||||||
mat33[2][2]/=scale;
|
mat33[1][1]/=scale;
|
||||||
}
|
mat33[2][2]/=scale;
|
||||||
|
}
|
||||||
for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi)
|
|
||||||
if( !(*fi).IsD() && (*fi).IsRW() )
|
for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi)
|
||||||
(*fi).N() = mat33* (*fi).N();
|
if( !(*fi).IsD() && (*fi).IsRW() )
|
||||||
}
|
(*fi).N() = mat33* (*fi).N();
|
||||||
|
}
|
||||||
}; // end class
|
|
||||||
|
}; // end class
|
||||||
} // End namespace
|
|
||||||
} // End namespace
|
} // End namespace
|
||||||
|
} // End namespace
|
||||||
|
|
||||||
#endif
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue