diff --git a/include/Algo/Geometry/distances.h b/include/Algo/Geometry/distances.h index cef58d51a320e9bf041aca011f54173d22c6d8f6..8c950bdbd65a27674c2d67ef93cbe36cf8b7b79b 100644 --- a/include/Algo/Geometry/distances.h +++ b/include/Algo/Geometry/distances.h @@ -43,7 +43,7 @@ namespace Geometry * @return the squared distance to the plane */ template -typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) ; /** * compute squared distance from point to face (assuming face is convex) @@ -55,7 +55,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f * @return the squared distance */ template -typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) ; /** * compute squared distance from point to an edge @@ -66,7 +66,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con * @return the squared distance */ template -typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const VEC3& P) ; +typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const typename PFP::VEC3& P) ; //template //void computeDistance(typename PFP::MAP& map1, const VertexAttribute& position1, VertexAttribute& distance1, diff --git a/include/Algo/Geometry/distances.hpp b/include/Algo/Geometry/distances.hpp index c7f4a700cec3af8f4185139bacff95835d19d528..08f9d20f9d85ab3936f2cce02dece79e6bcb4ff1 100644 --- a/include/Algo/Geometry/distances.hpp +++ b/include/Algo/Geometry/distances.hpp @@ -34,7 +34,7 @@ namespace Geometry { template -typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) { Vertex v(f.dart); const typename PFP::VEC3& A = position[v]; @@ -47,7 +47,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f } template -typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, const VertexAttribute& position, const typename PFP::VEC3& P) { typedef typename PFP::REAL REAL; @@ -72,7 +72,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con } template -typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const VEC3& P) +typename PFP::REAL squaredDistancePoint2Edge(typename PFP::MAP& map, Edge e, const VertexAttribute& position, const typename PFP::VEC3& P) { const typename PFP::VEC3& A = position[e.dart]; typename PFP::VEC3 AB = position[map.phi1(e.dart)] - A;