From 682865bf2538db040b93d282e90d15d55a2ce074 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Tue, 30 Sep 2008 10:52:37 +0000 Subject: [PATCH] [Namespaces changes] trimesh->tri clean up of some namespaces to comply the following naming: Complexes (3 letters namespaces): order 0 (point cloud ) :vrt order 1 (edge meshes) :edg order 2 (triangle meshes) :tri order 3 (triangle meshes) :tet Simplexes (extended namespaces): order 0 (vertex) :vertex order 1 (edge) :edge order 2 (triangle) :triangle (temporarily it remains "face") order 3 (tetrahedron) :tetrahedron --- vcg/complex/trimesh/inside.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vcg/complex/trimesh/inside.h b/vcg/complex/trimesh/inside.h index 86efd596..0827cf8c 100644 --- a/vcg/complex/trimesh/inside.h +++ b/vcg/complex/trimesh/inside.h @@ -53,7 +53,7 @@ compiling error resolved namespace vcg { - namespace trimesh { + namespace tri { template class Inside @@ -79,7 +79,7 @@ namespace vcg { { ScalarType dist; CoordType Norm, ip, nearest; - FaceType *f = vcg::trimesh::GetClosestFace< TriMeshType, FaceSpatialIndexing >( m, _g_mesh, test, m.bbox.Diag(), dist, nearest, Norm, ip ); + FaceType *f = vcg::tri::GetClosestFace< TriMeshType, FaceSpatialIndexing >( m, _g_mesh, test, m.bbox.Diag(), dist, nearest, Norm, ip ); assert( f != NULL ); /// Check if there is any face in the mesh /// If the point is on the face is considered inside. if( ( test - nearest ).Norm() <= EPSILON ) return true; @@ -98,7 +98,7 @@ namespace vcg { CoordType bary = vcg::Barycenter< FaceType >(*f); /// Set ray : origin and direction vcg::Ray3 r; r.Set( test, ( bary - test ) ); r.Normalize(); - FaceType *f1 = vcg::trimesh::DoRay< TriMeshType, FaceSpatialIndexing >( m, _g_mesh, r, m.bbox.Diag(), dist ); + FaceType *f1 = vcg::tri::DoRay< TriMeshType, FaceSpatialIndexing >( m, _g_mesh, r, m.bbox.Diag(), dist ); assert( f1 != NULL ); /// In this case normal direction is enough. if( ( f1->N() * ( test - bary ) ) < 0 ) return true;