Updating of edge values id divided into 2 functions ( the first one update only a face...) added also resetting of edges flags.. (see first line of Set function)
This commit is contained in:
parent
179d96b098
commit
413995409c
|
@ -24,6 +24,9 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.2 2004/05/12 18:52:35 ganovelli
|
||||||
|
removed call to ComputeRT and put its body here
|
||||||
|
|
||||||
Revision 1.1 2004/05/12 10:39:45 ganovelli
|
Revision 1.1 2004/05/12 10:39:45 ganovelli
|
||||||
created
|
created
|
||||||
|
|
||||||
|
@ -39,63 +42,68 @@ namespace tri {
|
||||||
/** \addtogroup trimesh */
|
/** \addtogroup trimesh */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
|
|
||||||
/// Management, updating and computation of per-vertex and per-face normals.
|
/// 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 UpdateEdges
|
class UpdateEdges
|
||||||
{
|
{
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef ComputeMeshType MeshType;
|
typedef ComputeMeshType MeshType;
|
||||||
typedef typename MeshType::VertexType VertexType;
|
typedef typename MeshType::VertexType VertexType;
|
||||||
typedef typename MeshType::VertexPointer VertexPointer;
|
typedef typename MeshType::VertexPointer VertexPointer;
|
||||||
typedef typename MeshType::VertexIterator VertexIterator;
|
typedef typename MeshType::VertexIterator VertexIterator;
|
||||||
typedef typename MeshType::FaceType FaceType;
|
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;
|
||||||
typedef typename MeshType::FaceType::ScalarType ScalarType;
|
typedef typename MeshType::FaceType::ScalarType ScalarType;
|
||||||
|
|
||||||
/// Calculates the vertex normal (if stored in the current face type)
|
/// Calculates the vertex normal (if stored in the current face type)
|
||||||
static void Box(ComputeMeshType &m)
|
static void Box(ComputeMeshType &m)
|
||||||
{
|
{
|
||||||
m.bbox.SetNull();
|
m.bbox.SetNull();
|
||||||
VertexIterator vi;
|
VertexIterator vi;
|
||||||
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
for(vi=m.vert.begin();vi!=m.vert.end();++vi)
|
||||||
if( !(*vi).IsD() ) m.bbox.Add((*vi).P());
|
if( !(*vi).IsD() ) m.bbox.Add((*vi).P());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Set(ComputeMeshType &m)
|
static void Set(FaceType &f)
|
||||||
{
|
{
|
||||||
FaceIterator f;
|
f.Flags() = f.Flags() & (~(FaceType::NORMX|FaceType::NORMY|FaceType::NORMZ));
|
||||||
|
|
||||||
for(f = m.face.begin(); f!=m.face.end(); ++f)
|
// Primo calcolo degli edges
|
||||||
if(!(*f).IsD())
|
f.edge[0] = f.V(1)->P(); f.edge[0] -= f.V(0)->P();
|
||||||
{
|
f.edge[1] = f.V(2)->P(); f.edge[1] -= f.V(1)->P();
|
||||||
// Primo calcolo degli edges
|
f.edge[2] = f.V(0)->P(); f.edge[2] -= f.V(2)->P();
|
||||||
(*f).edge[0] = (*f).V(1)->P(); (*f).edge[0] -= (*f).V(0)->P();
|
// Calcolo di plane
|
||||||
(*f).edge[1] = (*f).V(2)->P(); (*f).edge[1] -= (*f).V(1)->P();
|
f.plane.SetDirection(f.edge[0]^f.edge[1]);
|
||||||
(*f).edge[2] = (*f).V(0)->P(); (*f).edge[2] -= (*f).V(2)->P();
|
f.plane.SetOffset(f.plane.Direction() * f.V(0)->P());
|
||||||
// Calcolo di plane
|
f.plane.Normalize();
|
||||||
(*f).plane.SetDirection((*f).edge[0]^(*f).edge[1]);
|
// Calcolo migliore proiezione
|
||||||
(*f).plane.SetOffset((*f).plane.Direction() * (*f).V(0)->P());
|
ScalarType nx = math::Abs(f.plane.Direction()[0]);
|
||||||
(*f).plane.Normalize();
|
ScalarType ny = math::Abs(f.plane.Direction()[1]);
|
||||||
// Calcolo migliore proiezione
|
ScalarType nz = math::Abs(f.plane.Direction()[2]);
|
||||||
ScalarType nx = math::Abs((*f).plane.Direction()[0]);
|
ScalarType d;
|
||||||
ScalarType ny = math::Abs((*f).plane.Direction()[1]);
|
if(nx>ny && nx>nz) { f.Flags() |= FaceType::NORMX; d = 1/f.plane.Direction()[0]; }
|
||||||
ScalarType nz = math::Abs((*f).plane.Direction()[2]);
|
else if(ny>nz) { f.Flags() |= FaceType::NORMY; d = 1/f.plane.Direction()[1]; }
|
||||||
ScalarType d;
|
else { f.Flags() |= FaceType::NORMZ; d = 1/f.plane.Direction()[2]; }
|
||||||
if(nx>ny && nx>nz) { (*f).Flags() |= FaceType::NORMX; d = 1/(*f).plane.Direction()[0]; }
|
|
||||||
else if(ny>nz) { (*f).Flags() |= FaceType::NORMY; d = 1/(*f).plane.Direction()[1]; }
|
|
||||||
else { (*f).Flags() |= FaceType::NORMZ; d = 1/(*f).plane.Direction()[2]; }
|
|
||||||
|
|
||||||
// Scalatura spigoli
|
// Scalatura spigoli
|
||||||
(*f).edge[0] *= d;
|
f.edge[0] *= d;
|
||||||
(*f).edge[1] *= d;
|
f.edge[1] *= d;
|
||||||
(*f).edge[2] *= d;
|
f.edge[2] *= d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void Set(ComputeMeshType &m)
|
||||||
|
{
|
||||||
|
FaceIterator f;
|
||||||
|
|
||||||
|
for(f = m.face.begin(); f!=m.face.end(); ++f)
|
||||||
|
if(!(*f).IsD())
|
||||||
|
Set(*f);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}; // end class
|
}; // end class
|
||||||
|
|
||||||
} // End namespace
|
} // End namespace
|
||||||
|
|
Loading…
Reference in New Issue