[EDGE SUPPORT] Added template parameter to qyery function to comply mods in vcg/complex/trimesh/base.h

This commit is contained in:
ganovelli 2008-11-12 16:18:28 +00:00
parent 085d51edfa
commit d3ba33039b
1 changed files with 13 additions and 13 deletions

View File

@ -628,47 +628,47 @@ public:
} // end namespace face } // end namespace face
template < class, class > class TriMesh; template < class, class,class > class TriMesh;
namespace tri namespace tri
{ {
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType >
bool HasVFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasVFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasVFAdjacencyOcf()) return m.face.IsVFAdjacencyEnabled(); if(FaceType::HasVFAdjacencyOcf()) return m.face.IsVFAdjacencyEnabled();
else return FaceType::FaceType::HasVFAdjacency(); else return FaceType::FaceType::HasVFAdjacency();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType>
bool HasFFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasFFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasFFAdjacencyOcf()) return m.face.IsFFAdjacencyEnabled(); if(FaceType::HasFFAdjacencyOcf()) return m.face.IsFFAdjacencyEnabled();
else return FaceType::FaceType::HasFFAdjacency(); else return FaceType::FaceType::HasFFAdjacency();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType >
bool HasPerWedgeTexCoord (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerWedgeTexCoord (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasWedgeTexCoordOcf()) return m.face.IsWedgeTexEnabled(); if(FaceType::HasWedgeTexCoordOcf()) return m.face.IsWedgeTexEnabled();
else return FaceType::HasWedgeTexCoord(); else return FaceType::HasWedgeTexCoord();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType >
bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasFaceColorOcf()) return m.face.IsColorEnabled(); if(FaceType::HasFaceColorOcf()) return m.face.IsColorEnabled();
else return FaceType::HasFaceColor(); else return FaceType::HasFaceColor();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType >
bool HasPerFaceQuality (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerFaceQuality (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasFaceQualityOcf()) return m.face.IsQualityEnabled(); if(FaceType::HasFaceQualityOcf()) return m.face.IsQualityEnabled();
else return FaceType::HasFaceQuality(); else return FaceType::HasFaceQuality();
} }
template < class VertContainerType, class FaceType > template < class VertContainerType, class FaceType, class EdgeContainerType >
bool HasPerFaceMark (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) bool HasPerFaceMark (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m)
{ {
if(FaceType::HasFaceMarkOcf()) return m.face.IsMarkEnabled(); if(FaceType::HasFaceMarkOcf()) return m.face.IsMarkEnabled();
else return FaceType::HasFaceMark(); else return FaceType::HasFaceMark();