added typedef VertContainer VertexContainer to avoid inconsistency with pre-existing methods
This commit is contained in:
parent
c5e02633d8
commit
0004ccb15a
|
@ -24,6 +24,10 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.4 2006/08/23 15:32:24 marfr960
|
||||||
|
added bbox of the mesh
|
||||||
|
vn int->size_t
|
||||||
|
|
||||||
Revision 1.3 2005/09/20 13:58:55 pietroni
|
Revision 1.3 2005/09/20 13:58:55 pietroni
|
||||||
Modified MArk function parameter form ConstVertexPointer to VertexPointer
|
Modified MArk function parameter form ConstVertexPointer to VertexPointer
|
||||||
|
|
||||||
|
@ -62,6 +66,7 @@ template < class VertContainerType >
|
||||||
class VertexMesh{
|
class VertexMesh{
|
||||||
public:
|
public:
|
||||||
typedef VertContainerType VertContainer;
|
typedef VertContainerType VertContainer;
|
||||||
|
typedef VertContainer VertexContainer;
|
||||||
typedef typename VertContainerType::value_type VertexType;
|
typedef typename VertContainerType::value_type VertexType;
|
||||||
typedef typename VertContainerType::value_type::ScalarType ScalarType;
|
typedef typename VertContainerType::value_type::ScalarType ScalarType;
|
||||||
typedef typename VertContainerType::value_type::CoordType CoordType;
|
typedef typename VertContainerType::value_type::CoordType CoordType;
|
||||||
|
|
|
@ -24,6 +24,9 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.2 2006/06/29 13:02:38 ganovelli
|
||||||
|
agiunta UpdateBoundingBase, superclasse di UpdateBounding, templated sul container di vertici.
|
||||||
|
|
||||||
Revision 1.1 2005/03/09 13:22:55 ganovelli
|
Revision 1.1 2005/03/09 13:22:55 ganovelli
|
||||||
creation
|
creation
|
||||||
|
|
||||||
|
@ -40,8 +43,6 @@ namespace vertex {
|
||||||
/** \addtogroup vertexmesh */
|
/** \addtogroup vertexmesh */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
|
|
||||||
/// 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.
|
|
||||||
template <class VERTEX_CONTAINER>
|
template <class VERTEX_CONTAINER>
|
||||||
class UpdateBoundingBase
|
class UpdateBoundingBase
|
||||||
{
|
{
|
||||||
|
@ -52,7 +53,6 @@ typedef typename VERTEX_CONTAINER::value_type * VertexPointer;
|
||||||
typedef typename VERTEX_CONTAINER::iterator VertexIterator;
|
typedef typename VERTEX_CONTAINER::iterator VertexIterator;
|
||||||
typedef typename VERTEX_CONTAINER::value_type::ScalarType ScalarType;
|
typedef typename VERTEX_CONTAINER::value_type::ScalarType ScalarType;
|
||||||
|
|
||||||
/// Calculates the vertex normal (if stored in the current face type)
|
|
||||||
static Box3<ScalarType> Box(VERTEX_CONTAINER &vert)
|
static Box3<ScalarType> Box(VERTEX_CONTAINER &vert)
|
||||||
{
|
{
|
||||||
Box3<ScalarType> res; res.SetNull();
|
Box3<ScalarType> res; res.SetNull();
|
||||||
|
@ -62,21 +62,20 @@ static Box3<ScalarType> Box(VERTEX_CONTAINER &vert)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
}; // end class
|
}; // end class UpdateBoundingBase
|
||||||
|
|
||||||
template <class VMType>
|
template <class VMType>
|
||||||
class UpdateBounding: public UpdateBoundingBase<typename VMType::VertexContainer> {
|
class UpdateBounding: public UpdateBoundingBase<typename VMType::VertexContainer>
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
typedef typename VMType::VertexContainer VertexContainer;
|
static void Box(VMType &vm)
|
||||||
|
{
|
||||||
static void Box(VMType &vm){
|
vm.bbox = UpdateBoundingBase<VMType::VertexContainer>::Box(vm.vert);
|
||||||
vm.bbox = UpdateBoundingBase<typename VMType::VertexContainer>::Box(vm.vert);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // End namespace
|
} // End namespace vertex
|
||||||
} // End namespace
|
} // End namespace vcg
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue