From 9d106c50c1e7cdf80ecc80d5938d93e4d59cb6aa Mon Sep 17 00:00:00 2001
From: cnr-isti-vclab <paolo.cignoni@isti.cnr.it>
Date: Fri, 18 Mar 2005 16:38:36 +0000
Subject: [PATCH] Minor changes

---
 vcg/complex/trimesh/base.h |  8 ++++++--
 vcg/simplex/vertex/base.h  | 14 +++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/vcg/complex/trimesh/base.h b/vcg/complex/trimesh/base.h
index 99ad92b8..6cdef9ce 100644
--- a/vcg/complex/trimesh/base.h
+++ b/vcg/complex/trimesh/base.h
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.13  2005/01/28 17:56:57  pietroni
+changed HasVFTopology function... control if both vertex and face define the vf topology
+
 Revision 1.12  2004/10/28 00:54:34  cignoni
 Better Doxygen documentation
 
@@ -88,6 +91,7 @@ namespace tri {
 template < class VertContainerType, class FaceContainerType >
 class TriMesh{
 	public:
+	typedef TriMesh<VertContainerType, FaceContainerType> MeshType;
 	typedef FaceContainerType FaceContainer;
 	typedef VertContainerType VertContainer;
 	typedef typename VertContainer::value_type VertexType;
@@ -148,12 +152,12 @@ public:
 
 	inline int MemUsed() const
 	{
-		return sizeof(MMTYPE)+sizeof(MVTYPE)*vert.size()+sizeof(MFTYPE)*face.size();
+		return sizeof(MeshType)+sizeof(VertexType)*vert.size()+sizeof(FaceType)*face.size();
 	}
 
 	inline int MemNeeded() const
 	{
-		return sizeof(MMTYPE)+sizeof(MVTYPE)*vn+sizeof(MFTYPE)*fn;
+		return sizeof(MeshType)+sizeof(VertexType)*vn+sizeof(FaceType)*fn;
 	}
 
 
diff --git a/vcg/simplex/vertex/base.h b/vcg/simplex/vertex/base.h
index efded352..9b4ce884 100644
--- a/vcg/simplex/vertex/base.h
+++ b/vcg/simplex/vertex/base.h
@@ -23,6 +23,10 @@
 /****************************************************************************
   History
 $Log: not supported by cvs2svn $
+Revision 1.22  2005/03/18 00:13:45  cignoni
+Removed NormalizedNormalV  (out of standard and wrong) and
+added the member functions Normal and NormalizedNormal() (just like for faces)
+
 Revision 1.21  2004/10/28 00:50:49  cignoni
 Better Doxygen documentation
 
@@ -57,6 +61,10 @@ Revision 1.12  2004/05/10 13:31:13  ganovelli
 function for edge adjacency added
 
 $Log: not supported by cvs2svn $
+Revision 1.22  2005/03/18 00:13:45  cignoni
+Removed NormalizedNormalV  (out of standard and wrong) and
+added the member functions Normal and NormalizedNormal() (just like for faces)
+
 Revision 1.21  2004/10/28 00:50:49  cignoni
 Better Doxygen documentation
 
@@ -727,7 +735,7 @@ public:
 template <bool NormalizeFlag> 
 const CoordType GenericNormal()
 {
-  if (!v->HasVFAdjacency())
+  if (!HasVFAdjacency())
   {
     assert(0);
 		return (VERTEX_TYPE::CoordType (0,0,0));
@@ -735,8 +743,8 @@ const CoordType GenericNormal()
   else
   {
     vcg::face::VFIterator<typename VERTEX_TYPE::FaceType> VFi=vcg::face::VFIterator<typename VERTEX_TYPE::FaceType>();
-    VFi.f=v->VFp();
-    VFi.z=v->VFi();
+    VFi.f=VFp();
+    VFi.z=VFi();
     typename VERTEX_TYPE::CoordType N= typename VERTEX_TYPE::CoordType(0,0,0);
     while (!VFi.End())
     {