Skip to content

GitLab

Commit 87367ef4 authored by Sylvain Thery's avatar Sylvain Thery
Browse files
Options

add cone selection (for VR) & place selector as last parameter in all function... 

add cone selection (for VR) & place selector as last parameter in all function / remove parallel version
parent bab67f6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 847 additions and 339 deletions
include/Algo/Selection/raySelector.h
View file @ 87367ef4
......@@ -25,10 +25,9 @@
#ifndef RAYSELECTOR_H_
#define RAYSELECTOR_H_
#include <algorithm>
#include <vector>
#include "Algo/Selection/raySelectFunctor.hpp"
#include "Algo/Parallel/parallel_foreach.h"
namespace CGoGN
{
......@@ -48,36 +47,9 @@ namespace Selection
* @param vecFaces (out) vector to store the darts of intersected faces
*/
template<typename PFP>
void facesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecFaces)
{
std::vector<typename PFP::VEC3> iPoints;
// get back intersected faces
vecFaces.clear();
Algo::Selection::FuncFaceInter<PFP> ffi(map, position, vecFaces, iPoints, rayA, rayAB);
map.template foreach_orbit<FACE>(ffi, good);
// compute all distances to observer for each intersected face
// and put them in a vector for sorting
typedef std::pair<typename PFP::REAL, Dart> DartDist;
std::vector<DartDist> distndart;
unsigned int nbi = vecFaces.size();
distndart.resize(nbi);
for (unsigned int i = 0; i < nbi; ++i)
{
distndart[i].second = vecFaces[i];
typename PFP::VEC3 V = iPoints[i] - rayA;
distndart[i].first = V.norm2();
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
for (unsigned int i = 0; i < nbi; ++i)
vecFaces[i] = distndart[i].second;
}
void facesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecFaces,
const FunctorSelect& good=allDarts);
/**
* Function that does the selection of edges, returned darts are sorted from closest to farthest
......@@ -88,40 +60,9 @@ void facesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PF
* @param dist radius of the cylinder of selection
*/
template<typename PFP>
void edgesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecEdges, float dist)
{
typename PFP::REAL dist2 = dist * dist;
typename PFP::REAL AB2 = rayAB * rayAB;
// recuperation des aretes intersectees
vecEdges.clear();
Algo::Selection::FuncEdgeInter<PFP> ffi(map, position, vecEdges, rayA, rayAB, AB2, dist2);
map.template foreach_orbit<EDGE>(ffi, good);
typedef std::pair<typename PFP::REAL, Dart> DartDist;
std::vector<DartDist> distndart;
unsigned int nbi = vecEdges.size();
distndart.resize(nbi);
// compute all distances to observer for each middle of intersected edge
// and put them in a vector for sorting
for (unsigned int i = 0; i < nbi; ++i)
{
Dart d = vecEdges[i];
distndart[i].second = d;
typename PFP::VEC3 V = (position[d] + position[map.phi1(d)]) / typename PFP::REAL(2);
V -= rayA;
distndart[i].first = V.norm2();
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
for (unsigned int i = 0; i < nbi; ++i)
vecEdges[i] = distndart[i].second;
}
void edgesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecEdges, float distMax,
const FunctorSelect& good=allDarts);
/**
* Function that does the selection of vertices, returned darts are sorted from closest to farthest
......@@ -132,251 +73,102 @@ void edgesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PF
* @param dist radius of the cylinder of selection
*/
template<typename PFP>
void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVertices, float dist, const FunctorSelect& good= allDarts)
{
typename PFP::REAL dist2 = dist * dist;
typename PFP::REAL AB2 = rayAB * rayAB;
// recuperation des sommets intersectes
vecVertices.clear();
Algo::Selection::FuncVertexInter<PFP> ffi(map, position, vecVertices, rayA, rayAB, AB2, dist2);
map.template foreach_orbit<VERTEX>(ffi, good);
typedef std::pair<typename PFP::REAL, Dart> DartDist;
std::vector<DartDist> distndart;
void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVertices,
float dist, const FunctorSelect& good=allDarts);
unsigned int nbi = vecVertices.size();
distndart.resize(nbi);
// compute all distances to observer for each intersected vertex
// and put them in a vector for sorting
for (unsigned int i = 0; i < nbi; ++i)
{
Dart d = vecVertices[i];
distndart[i].second = d;
typename PFP::VEC3 V = position[d] - rayA;
distndart[i].first = V.norm2();
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
for (unsigned int i = 0; i < nbi; ++i)
vecVertices[i] = distndart[i].second;
}
namespace Parallel
{
/**
* Volume selection, not yet functional
*/
template<typename PFP>
void facesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecFaces, unsigned int nbth=0, unsigned int current_thread=0)
{
if (nbth==0)
// nbth = Algo::Parallel::optimalNbThreads();
nbth =2; // seems to be optimal ?
std::vector<FunctorMapThreaded<typename PFP::MAP>*> functs;
for (unsigned int i=0; i < nbth; ++i)
functs.push_back(new Parallel::FuncFaceInter<PFP>(map,position,rayA, rayAB));
void volumesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVolumes,
const FunctorSelect& good = allDarts);
Algo::Parallel::foreach_cell<typename PFP::MAP,FACE>(map, functs, false, good, current_thread);
// compute total nb of intersection
unsigned int nbtot=0;
for (unsigned int i=0; i < nbth; ++i)
nbtot += static_cast<Parallel::FuncFaceInter<PFP>*>(functs[i])->getFaceDistances().size();
std::vector<std::pair<typename PFP::REAL, Dart> > distndart;
distndart.reserve(nbtot);
for (unsigned int i=0; i < nbth; ++i)
{
distndart.insert(distndart.end(),static_cast<Parallel::FuncFaceInter<PFP>*>(functs[i])->getFaceDistances().begin(), static_cast<Parallel::FuncFaceInter<PFP>*>(functs[i])->getFaceDistances().end() );
delete functs[i];
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
vecFaces.clear();
vecFaces.reserve(nbtot);
// store sorted darts in returned vector
for (unsigned int i = 0; i < nbtot; ++i)
vecFaces.push_back(distndart[i].second);
}
/**
* Function that does the selection of one vertex
* @param map the map we want to test
* @param rayA first point of ray (user side)
* @param rayAB vector of ray (directed ot the scene)
* @param vertex (out) dart of selected vertex (set to NIL if no vertex selected)
*/
template<typename PFP>
void edgesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecEdges, float dist, unsigned int nbth=0, unsigned int current_thread=0)
{
typename PFP::REAL dist2 = dist * dist;
typename PFP::REAL AB2 = rayAB * rayAB;
if (nbth==0)
// nbth = Algo::Parallel::optimalNbThreads();
nbth =2; // seems to be optimal ?
std::vector<FunctorMapThreaded<typename PFP::MAP>*> functs;
for (unsigned int i=0; i < nbth; ++i)
functs.push_back(new Parallel::FuncEdgeInter<PFP>(map,position,rayA, rayAB, AB2, dist2));
Algo::Parallel::foreach_cell<typename PFP::MAP,EDGE>(map, functs, false, good, current_thread);
// compute total nb of intersection
unsigned int nbtot=0;
for (unsigned int i=0; i < nbth; ++i)
nbtot += static_cast<Parallel::FuncEdgeInter<PFP>*>(functs[i])->getEdgeDistances().size();
std::vector<std::pair<typename PFP::REAL, Dart> > distndart;
distndart.reserve(nbtot);
for (unsigned int i=0; i < nbth; ++i)
{
distndart.insert(distndart.end(),static_cast<Parallel::FuncEdgeInter<PFP>*>(functs[i])->getEdgeDistances().begin(), static_cast<Parallel::FuncEdgeInter<PFP>*>(functs[i])->getEdgeDistances().end() );
delete functs[i];
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
vecEdges.clear();
vecEdges.reserve(nbtot);
for (unsigned int i = 0; i < nbtot; ++i)
vecEdges.push_back(distndart[i].second);
}
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);
template<typename PFP>
void verticesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecVertices, float dist, const FunctorSelect& good= allDarts, unsigned int nbth=0, unsigned int current_thread=0)
{
typename PFP::REAL dist2 = dist * dist;
typename PFP::REAL AB2 = rayAB * rayAB;
if (nbth==0)
// nbth = Algo::Parallel::optimalNbThreads();
nbth =2; // seems to be optimal ?
std::vector<FunctorMapThreaded<typename PFP::MAP>*> functs;
for (unsigned int i=0; i < nbth; ++i)
functs.push_back(new Parallel::FuncVertexInter<PFP>(map,position,rayA, rayAB, AB2, dist2));
Algo::Parallel::foreach_cell<typename PFP::MAP,VERTEX>(map, functs, false, good, current_thread);
// compute total nb of intersection
unsigned int nbtot=0;
for (unsigned int i=0; i < nbth; ++i)
nbtot += static_cast<Parallel::FuncVertexInter<PFP>*>(functs[i])->getVertexDistances().size();
std::vector<std::pair<typename PFP::REAL, Dart> > distndart;
distndart.reserve(nbtot);
for (unsigned int i=0; i < nbth; ++i)
{
distndart.insert(distndart.end(),static_cast<Parallel::FuncVertexInter<PFP>*>(functs[i])->getVertexDistances().begin(), static_cast<Parallel::FuncVertexInter<PFP>*>(functs[i])->getVertexDistances().end() );
delete functs[i];
}
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 FunctorSelect& good = allDarts);
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
vecVertices.clear();
vecVertices.reserve(nbtot);
for (unsigned int i = 0; i < nbtot; ++i)
vecVertices.push_back(distndart[i].second);
/**
* Function that does the selection of vertices in a cone, returned darts are sorted from closest to farthest
* @param map the map we want to test
* @param position the position attribute
* @param rayA first point of ray (user side)
* @param rayAB vector of ray (directed ot the scene)
* @param angle angle of the code in degree.
* @param vecVertices (out) vector to store dart of intersected vertices
* @param good the selector
*/
template<typename PFP>
void verticesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector<Dart>& vecVertices,
const FunctorSelect& good= allDarts);
/**
* Function that does the selection of edges, returned darts are sorted from closest to farthest
* @param map the map we want to test
* @param position the position attribute
* @param rayA first point of ray (user side)
* @param rayAB vector of ray (directed ot the scene)
* @param angle radius of the cylinder of selection
* @param vecEdges (out) vector to store dart of intersected edges
* @param good the selector
*/
template<typename PFP>
void edgesConeSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, float angle, std::vector<Dart>& vecEdges,
const FunctorSelect& good=allDarts);
}
/**
* Function that select the closest vertex in the bubble
* @param map the map we want to test
* @param position the position attribute
* @param cursor the cursor position (center of bubble)
* @param radiusMax max radius of selection
* @param good the selector
*/
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)
{
std::vector<Dart> vecFaces;
vecFaces.reserve(100);
Parallel::facesRaySelection<PFP>(map, position, good, rayA, rayAB, vecFaces, nbth, current_thread);
if(vecFaces.size() > 0)
{
// recuperation du sommet le plus proche
Dart d = vecFaces.front();
Dart it = d;
typename PFP::REAL minDist = (rayA - position[it]).norm2();
vertex = it;
it = map.phi1(it);
while(it != d)
{
typename PFP::REAL dist = (rayA - position[it]).norm2();
if(dist < minDist)
{
minDist = dist;
vertex = it;
}
it = map.phi1(it);
}
}
else
vertex = NIL;
}
}
Dart verticesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& cursor, PFP::REAL radiusMax,
const FunctorSelect& good=allDarts);
/**
* Function that does the selection of one vertex
* Function that select the closest edge in the bubble
* @param map the map we want to test
* @param rayA first point of ray (user side)
* @param rayAB vector of ray (directed ot the scene)
* @param vertex (out) dart of selected vertex (set to NIL if no vertex selected)
* @param position the position attribute
* @param cursor the cursor position (center of bubble)
* @param radiusMax max radius of selection
* @param good the selector
*/
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)
{
std::vector<Dart> vecFaces;
std::vector<typename PFP::VEC3> iPoints;
// recuperation des faces intersectes
Algo::Selection::FuncFaceInter<PFP> ffi(map, position, vecFaces, iPoints, rayA, rayAB);
map.template foreach_orbit<FACE>(ffi, good);
if(vecFaces.size() > 0)
{
typedef std::pair<typename PFP::REAL, unsigned int> IndexedDist;
std::vector<IndexedDist> distnint;
unsigned int nbi = vecFaces.size();
distnint.resize(nbi);
for (unsigned int i = 0; i < nbi; ++i)
{
distnint[i].first = (iPoints[i] - rayA).norm2();
distnint[i].second = i;
}
// sort the vector of pair dist/dart
std::sort(distnint.begin(), distnint.end(), distnintOrdering<PFP>);
// recuperation du point d'intersection sur la face la plus proche
unsigned int first = distnint[0].second;
typename PFP::VEC3 ip = iPoints[first];
// recuperation du sommet le plus proche du point d'intersection
Dart d = vecFaces[first];
Dart it = d;
typename PFP::REAL minDist = (ip - position[it]).norm2();
vertex = it;
it = map.phi1(it);
while(it != d)
{
typename PFP::REAL dist = (ip - position[it]).norm2();
if(dist < minDist)
{
minDist = dist;
vertex = it;
}
it = map.phi1(it);
}
}
else
vertex = NIL;
}
Dart edgesBubbleSelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position,
const typename PFP::VEC3& cursor, PFP::REAL radiusMax,
const FunctorSelect& good=allDarts);
/**
* Fonction that do the selection of darts, returned darts are sorted from closest to farthest
......@@ -386,56 +178,18 @@ void vertexRaySelection(typename PFP::MAP& map, const VertexAttribute<typename P
* @param rayAB vector of ray (directed ot the scene)
* @param vecDarts (out) vector to store dart of intersected darts
*/
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)
{
// recuperation des brins intersectes
vecDarts.clear();
Algo::Selection::FuncDartMapD2Inter<PFP> ffi(map, position, vecDarts, rayA, rayAB);
map.template foreach_orbit<FACE>(ffi, good);
typedef std::pair<typename PFP::REAL, Dart> DartDist;
std::vector<DartDist> distndart;
unsigned int nbi = vecDarts.size();
distndart.resize(nbi);
// compute all distances to observer for each dart of middle of edge
// and put them in a vector for sorting
for (unsigned int i = 0; i < nbi; ++i)
{
Dart d = vecDarts[i];
distndart[i].second = d;
typename PFP::VEC3 V = (position[d] + position[map.phi1(d)]) / typename PFP::REAL(2);
V -= rayA;
distndart[i].first = V.norm2();
}
// sort the vector of pair dist/dart
std::sort(distndart.begin(), distndart.end(), distndartOrdering<PFP>);
// store sorted darts in returned vector
for (unsigned int i=0; i< nbi; ++i)
vecDarts[i] = distndart[i].second;
}
template<typename PFP>
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 FunctorSelect& good = allDarts)
{
TraversorF<typename PFP::MAP> travF(map);
for(Dart dit = travF.begin() ; dit != travF.end() ; dit = travF.next() )
{
if(Geom::intersectionTrianglePlan<typename PFP::VEC3>(position[dit], position[map.phi1(dit)], position[map.phi_1(dit)],plan.d(), plan.normal()) == Geom::FACE_INTERSECTION)
{
vecDarts.push_back(dit);
}
}
std::cout << "nb faces = " << vecDarts.size() << std::endl;
}
//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);
//namespace Parallel
//{
//template<typename PFP>
//void facesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecFaces, unsigned int nbth=0, unsigned int current_thread=0);
//template<typename PFP>
//void edgesRaySelection(typename PFP::MAP& map, const VertexAttribute<typename PFP::VEC3>& position, const FunctorSelect& good, const typename PFP::VEC3& rayA, const typename PFP::VEC3& rayAB, std::vector<Dart>& vecEdges, float dist, unsigned int nbth=0, unsigned int current_thread=0);
//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);
//}
} //namespace Selection
......@@ -443,4 +197,6 @@ void facesPlanSelection(typename PFP::MAP& map, const VertexAttribute<typename P
} //namespace CGoGN
#include "Algo/Selection/raySelector.hpp"
#endif /* RAYSELECTOR_H_ */
include/Algo/Selection/raySelector.hpp 0 → 100644
View file @ 87367ef4
This diff is collapsed.
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