From d3ba33039b10e98b53915c6da334a35e3f9b599a Mon Sep 17 00:00:00 2001 From: ganovelli Date: Wed, 12 Nov 2008 16:18:28 +0000 Subject: [PATCH] [EDGE SUPPORT] Added template parameter to qyery function to comply mods in vcg/complex/trimesh/base.h --- vcg/simplex/faceplus/component_ocf.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/vcg/simplex/faceplus/component_ocf.h b/vcg/simplex/faceplus/component_ocf.h index d0d2b553..0d0ec34d 100644 --- a/vcg/simplex/faceplus/component_ocf.h +++ b/vcg/simplex/faceplus/component_ocf.h @@ -628,47 +628,47 @@ public: } // end namespace face - template < class, class > class TriMesh; + template < class, class,class > class TriMesh; namespace tri { - template < class VertContainerType, class FaceType > - bool HasVFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType > + bool HasVFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasVFAdjacencyOcf()) return m.face.IsVFAdjacencyEnabled(); else return FaceType::FaceType::HasVFAdjacency(); } - template < class VertContainerType, class FaceType > - bool HasFFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType> + bool HasFFAdjacency (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasFFAdjacencyOcf()) return m.face.IsFFAdjacencyEnabled(); else return FaceType::FaceType::HasFFAdjacency(); } - template < class VertContainerType, class FaceType > - bool HasPerWedgeTexCoord (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType > + bool HasPerWedgeTexCoord (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasWedgeTexCoordOcf()) return m.face.IsWedgeTexEnabled(); else return FaceType::HasWedgeTexCoord(); } - template < class VertContainerType, class FaceType > - bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType > + bool HasPerFaceColor (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasFaceColorOcf()) return m.face.IsColorEnabled(); else return FaceType::HasFaceColor(); } - template < class VertContainerType, class FaceType > - bool HasPerFaceQuality (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType > + bool HasPerFaceQuality (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasFaceQualityOcf()) return m.face.IsQualityEnabled(); else return FaceType::HasFaceQuality(); } - template < class VertContainerType, class FaceType > - bool HasPerFaceMark (const TriMesh < VertContainerType , face::vector_ocf< FaceType > > & m) + template < class VertContainerType, class FaceType, class EdgeContainerType > + bool HasPerFaceMark (const TriMesh < VertContainerType , face::vector_ocf< FaceType >, EdgeContainerType > & m) { if(FaceType::HasFaceMarkOcf()) return m.face.IsMarkEnabled(); else return FaceType::HasFaceMark();