Commit e1d6adb5 authored by Sylvain Thery's avatar Sylvain Thery

restore vertexRaySelector name & change parameter order (consistency: good param at the end)

parent 03558439
...@@ -97,7 +97,7 @@ void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename ...@@ -97,7 +97,7 @@ void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename
* @param vertex (out) dart of selected vertex (set to NIL if no vertex selected) * @param vertex (out) dart of selected vertex (set to NIL if no vertex selected)
*/ */
template<typename PFP> template<typename PFP>
void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, void vertexRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex,
const FunctorSelect& good = allDarts); const FunctorSelect& good = allDarts);
......
...@@ -278,7 +278,7 @@ void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename ...@@ -278,7 +278,7 @@ void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename
* @param vertex (out) dart of selected vertex (set to NIL if no vertex selected) * @param vertex (out) dart of selected vertex (set to NIL if no vertex selected)
*/ */
template<typename PFP> template<typename PFP>
void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex, const FunctorSelect& good = allDarts) void vertexRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex, const FunctorSelect& good)
{ {
if (map.dimension() >2) if (map.dimension() >2)
{ {
...@@ -364,7 +364,7 @@ void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<t ...@@ -364,7 +364,7 @@ void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<t
* @param vecDarts (out) vector to store dart of intersected darts * @param vecDarts (out) vector to store dart of intersected darts
*/ */
//template<typename PFP> //template<typename PFP>
//void dartsRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecDarts, const FunctorSelect& good = allDarts) //void dartsRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecDarts, const FunctorSelect& good)
//{ //{
// // recuperation des brins intersectes // // recuperation des brins intersectes
// vecDarts.clear(); // vecDarts.clear();
...@@ -399,7 +399,7 @@ void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<t ...@@ -399,7 +399,7 @@ void vertexOfSurfaceRaySelection(typename PFP::MAP& map, const VertexAttribute<t
template<typename PFP> template<typename PFP>
void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename Geom::Plane3D<typename PFP::VEC3::DATA_TYPE>& plan, std::vector<Dart>& vecDarts, const typename Geom::Plane3D<typename PFP::VEC3::DATA_TYPE>& plan, std::vector<Dart>& vecDarts,
const FunctorSelect& good = allDarts) const FunctorSelect& good)
{ {
TraversorF<typename PFP::MAP> travF(map); TraversorF<typename PFP::MAP> travF(map);
...@@ -702,7 +702,7 @@ Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename ...@@ -702,7 +702,7 @@ Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename
//} //}
// //
//template<typename PFP> //template<typename PFP>
//void vertexRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex, const FunctorSelect& good = allDarts, unsigned int nbth=0, unsigned int current_thread=0) //void vertexRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, Dart& vertex, const FunctorSelect& good, unsigned int nbth=0, unsigned int current_thread=0)
//{ //{
// std::vector<Dart> vecFaces; // std::vector<Dart> vecFaces;
// vecFaces.reserve(100); // vecFaces.reserve(100);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment