From a97119dde3220e77538968c9e768c9d1a479bfb6 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 7 Nov 2012 22:51:16 +0000 Subject: [PATCH] Name Cleanup VertexVectorHasPerFaceVFAdjacency -> VertexVectorHasVFAdjacency --- vcg/complex/complex.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vcg/complex/complex.h b/vcg/complex/complex.h index 7499426e..26008aaa 100644 --- a/vcg/complex/complex.h +++ b/vcg/complex/complex.h @@ -445,11 +445,11 @@ bool HasPerVertexVEAdjacency (const TriMesh < CType0, CType1, CType2, CType3> & template < class CType0, class CType1, class CType2 , class CType3> bool HasPerEdgeVEAdjacency (const TriMesh < CType0, CType1, CType2, CType3> & /*m*/) {return TriMesh < CType0 , CType1, CType2, CType3>::EdgeContainer::value_type::HasVEAdjacency();} -template < class VertexType> bool VertexVectorHasPerFaceVFAdjacency (const std::vector &) { return VertexType::HasVFAdjacency(); } -template < class FaceType > bool FaceVectorHasPerFaceVFAdjacency (const std::vector &) { return FaceType::HasVFAdjacency(); } +template < class VertexType> bool VertexVectorHasVFAdjacency (const std::vector &) { return VertexType::HasVFAdjacency(); } +template < class FaceType > bool FaceVectorHasVFAdjacency (const std::vector &) { return FaceType::HasVFAdjacency(); } -template < class TriMeshType> bool HasPerFaceVFAdjacency (const TriMeshType &m) { return tri::FaceVectorHasPerFaceVFAdjacency (m.vert); } -template < class TriMeshType> bool HasPerVertexVFAdjacency (const TriMeshType &m) { return tri::VertexVectorHasPerFaceVFAdjacency(m.vert); } +template < class TriMeshType> bool HasPerFaceVFAdjacency (const TriMeshType &m) { return tri::FaceVectorHasVFAdjacency (m.vert); } +template < class TriMeshType> bool HasPerVertexVFAdjacency (const TriMeshType &m) { return tri::VertexVectorHasVFAdjacency(m.vert); } template < class VertexType> bool VertexVectorHasPerVertexQuality (const std::vector &) { return VertexType::HasQuality (); } @@ -504,6 +504,8 @@ template < class TriMeshType> bool HasFFAdjacency (const TriMeshType &m) { ret template < class TriMeshType> bool HasFEAdjacency (const TriMeshType &m) { return tri::FaceVectorHasFEAdjacency (m.face); } template < class TriMeshType> bool HasFVAdjacency (const TriMeshType &m) { return tri::FaceVectorHasFVAdjacency (m.face); } +template < class TriMeshType> bool HasVFAdjacency (const TriMeshType &m) { return tri::FaceVectorHasVFAdjacency (m.face) && tri::VertexVectorHasVFAdjacency(m.vert); } + template < class CType0, class CType1, class CType2 , class CType3>