Commit 7576a3e9 by Sylvain Thery

### bug missing pfp::

parent 8d771e17
 ... @@ -43,7 +43,7 @@ namespace Geometry ... @@ -43,7 +43,7 @@ namespace Geometry * @return the squared distance to the plane * @return the squared distance to the plane */ */ template 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) * 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 ... @@ -55,7 +55,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f * @return the squared distance * @return the squared distance */ */ template 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 * compute squared distance from point to an edge ... @@ -66,7 +66,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con ... @@ -66,7 +66,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con * @return the squared distance * @return the squared distance */ */ template 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 //template //void computeDistance(typename PFP::MAP& map1, const VertexAttribute& position1, VertexAttribute& distance1, //void computeDistance(typename PFP::MAP& map1, const VertexAttribute& position1, VertexAttribute& distance1, ... ...
 ... @@ -34,7 +34,7 @@ namespace Geometry ... @@ -34,7 +34,7 @@ namespace Geometry { { template 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); Vertex v(f.dart); const typename PFP::VEC3& A = position[v]; const typename PFP::VEC3& A = position[v]; ... @@ -47,7 +47,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f ... @@ -47,7 +47,7 @@ typename PFP::REAL squaredDistancePoint2FacePlane(typename PFP::MAP& map, Face f } } template 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; typedef typename PFP::REAL REAL; ... @@ -72,7 +72,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con ... @@ -72,7 +72,7 @@ typename PFP::REAL squaredDistancePoint2Face(typename PFP::MAP& map, Face f, con } } template 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]; const typename PFP::VEC3& A = position[e.dart]; typename PFP::VEC3 AB = position[map.phi1(e.dart)] - A; typename PFP::VEC3 AB = position[map.phi1(e.dart)] - A; ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!