Commit 5054c589 authored by Pierre Kraemer's avatar Pierre Kraemer

global allDarts Selector

parent 72d6f882
...@@ -213,7 +213,6 @@ void MyQT::cb_keyPress(int code) ...@@ -213,7 +213,6 @@ void MyQT::cb_keyPress(int code)
Algo::Modelisation::EarTriangulation<PFP> triangulation(myMap); Algo::Modelisation::EarTriangulation<PFP> triangulation(myMap);
triangulation.triangule(); triangulation.triangule();
SelectorTrue allDarts;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
updateGL(); updateGL();
...@@ -439,7 +438,6 @@ int main(int argc, char **argv) ...@@ -439,7 +438,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
......
...@@ -79,7 +79,6 @@ public: ...@@ -79,7 +79,6 @@ public:
//Manip Carte //Manip Carte
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
TVEC3 position; TVEC3 position;
Dart dglobal; Dart dglobal;
......
...@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD ...@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
}; };
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
PFP::TREAL scalar; PFP::TREAL scalar;
Dart dglobal; Dart dglobal;
......
...@@ -155,7 +155,6 @@ int main(int argc, char **argv) ...@@ -155,7 +155,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
...@@ -56,7 +56,6 @@ struct PFP: public PFP_STANDARD ...@@ -56,7 +56,6 @@ struct PFP: public PFP_STANDARD
typedef PFP::MAP MAP; typedef PFP::MAP MAP;
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
class MyGlutWin : public Utils::GlutWin_ATB class MyGlutWin : public Utils::GlutWin_ATB
{ {
......
...@@ -154,7 +154,6 @@ int main(int argc, char **argv) ...@@ -154,7 +154,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
...@@ -140,8 +140,6 @@ void myGlutWin::init() ...@@ -140,8 +140,6 @@ void myGlutWin::init()
void myGlutWin::updateRender() void myGlutWin::updateRender()
{ {
SelectorTrue allDarts;
// create the renderer (first call only) // create the renderer (first call only)
if (m_render == NULL) if (m_render == NULL)
m_render = new Algo::Render::GL2::MapRender_VBO() ; m_render = new Algo::Render::GL2::MapRender_VBO() ;
......
...@@ -50,7 +50,6 @@ class SimpleGMap2 : public Utils::QT::SimpleQT ...@@ -50,7 +50,6 @@ class SimpleGMap2 : public Utils::QT::SimpleQT
public: public:
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
PFP::TVEC3 position ; PFP::TVEC3 position ;
......
...@@ -50,7 +50,6 @@ class SimpleGMap3 : public Utils::QT::SimpleQT ...@@ -50,7 +50,6 @@ class SimpleGMap3 : public Utils::QT::SimpleQT
public: public:
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
PFP::TVEC3 position ; PFP::TVEC3 position ;
......
...@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD ...@@ -55,7 +55,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
Dart dglobal; Dart dglobal;
......
...@@ -119,10 +119,6 @@ int main(int argc, char **argv) ...@@ -119,10 +119,6 @@ int main(int argc, char **argv)
// declaration of the map // declaration of the map
PFP::MAP myMap; PFP::MAP myMap;
// this selector is going to select all the darts
SelectorTrue allDarts;
std::vector<std::string> attrNames ; std::vector<std::string> attrNames ;
if(!Algo::Import::importMesh<PFP>(myMap, argv[1], attrNames)) if(!Algo::Import::importMesh<PFP>(myMap, argv[1], attrNames))
{ {
......
...@@ -63,7 +63,6 @@ protected: ...@@ -63,7 +63,6 @@ protected:
public: public:
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
// render // render
Algo::Render::GL2::MapRender* m_render; Algo::Render::GL2::MapRender* m_render;
......
...@@ -144,9 +144,6 @@ int main(int argc, char **argv) ...@@ -144,9 +144,6 @@ int main(int argc, char **argv)
// declaration of the map // declaration of the map
PFP::MAP myMap; PFP::MAP myMap;
// this selector is going to select all the darts
SelectorTrue allDarts;
// creation of a new attribute on vertices of type 3D vector // creation of a new attribute on vertices of type 3D vector
// a handler to this attribute is returned // a handler to this attribute is returned
AttributeHandler<PFP::VEC3> position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position"); AttributeHandler<PFP::VEC3> position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
......
...@@ -210,6 +210,10 @@ void Viewer::importMesh(std::string& filename) ...@@ -210,6 +210,10 @@ void Viewer::importMesh(std::string& filename)
setParamObject(bb.maxSize(), bb.center().data()) ; setParamObject(bb.maxSize(), bb.center().data()) ;
updateGLMatrices() ; updateGLMatrices() ;
TraversorCell<MAP> t(myMap, VERTEX) ;
for(Dart d = t.begin(); d != t.end(); d = t.next())
std::cout << "pos -> " << position[d] << std::endl ;
} }
void Viewer::slot_drawVertices(bool b) void Viewer::slot_drawVertices(bool b)
......
...@@ -64,7 +64,6 @@ class Viewer : public Utils::QT::SimpleQT ...@@ -64,7 +64,6 @@ class Viewer : public Utils::QT::SimpleQT
public: public:
MAP myMap ; MAP myMap ;
SelectorTrue allDarts ;
Utils::QT::uiDockInterface dock ; Utils::QT::uiDockInterface dock ;
......
...@@ -48,7 +48,6 @@ struct PFP: public PFP_STANDARD ...@@ -48,7 +48,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
......
...@@ -69,9 +69,6 @@ AttributeHandler<PFP::VEC3> position; ...@@ -69,9 +69,6 @@ AttributeHandler<PFP::VEC3> position;
// handler d'attribut de normale par sommet // handler d'attribut de normale par sommet
AttributeHandler<PFP::VEC3> normal; AttributeHandler<PFP::VEC3> normal;
/// fonction qui renvoit vrai (appliquée à un brin)
//SelectorTrue allDarts;
/// encore 1 typedef pour simplifier l'ecriture du code /// encore 1 typedef pour simplifier l'ecriture du code
typedef PFP::VEC3 Point3D; typedef PFP::VEC3 Point3D;
...@@ -615,7 +612,6 @@ int main(int argc, char **argv) ...@@ -615,7 +612,6 @@ int main(int argc, char **argv)
sqt.m_normalVBO->updateData(normal); sqt.m_normalVBO->updateData(normal);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
...@@ -173,7 +173,6 @@ int main(int argc, char **argv) ...@@ -173,7 +173,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
SelectorEdgeNoBoundary<PFP::MAP> insideEdges(myMap);// just to draw only inside edges SelectorEdgeNoBoundary<PFP::MAP> insideEdges(myMap);// just to draw only inside edges
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, insideEdges, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, insideEdges, Algo::Render::GL2::LINES);
......
...@@ -46,8 +46,6 @@ struct PFP: public PFP_STANDARD ...@@ -46,8 +46,6 @@ struct PFP: public PFP_STANDARD
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
PFP::TVEC3 normal ; PFP::TVEC3 normal ;
AttributeHandler<Geom::Vec4f> color ; AttributeHandler<Geom::Vec4f> color ;
...@@ -251,7 +249,6 @@ int main(int argc, char **argv) ...@@ -251,7 +249,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
...@@ -103,7 +103,6 @@ void MyQT::cb_keyPress(int code) ...@@ -103,7 +103,6 @@ void MyQT::cb_keyPress(int code)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
PFP::TVEC3 normal ; PFP::TVEC3 normal ;
......
...@@ -51,7 +51,6 @@ struct PFP: public PFP_STANDARD ...@@ -51,7 +51,6 @@ struct PFP: public PFP_STANDARD
}; };
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts ;
PFP::TVEC3 position ; PFP::TVEC3 position ;
PFP::TVEC3 normal ; PFP::TVEC3 normal ;
...@@ -218,7 +217,6 @@ int main(int argc, char **argv) ...@@ -218,7 +217,6 @@ int main(int argc, char **argv)
sqt.m_positionVBO->updateData(position); sqt.m_positionVBO->updateData(position);
// update des primitives du renderer // update des primitives du renderer
SelectorTrue allDarts;
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
......
...@@ -60,7 +60,6 @@ struct PFP: public PFP_STANDARD ...@@ -60,7 +60,6 @@ struct PFP: public PFP_STANDARD
}; };
PFP::MAP myMap; PFP::MAP myMap;
SelectorTrue allDarts;
PFP::TVEC3 position ; PFP::TVEC3 position ;
Dart dglobal; Dart dglobal;
...@@ -185,8 +184,6 @@ void MyQT::cb_initGL() ...@@ -185,8 +184,6 @@ void MyQT::cb_initGL()
registerShader(m_sprite); registerShader(m_sprite);
registerShader(m_lines); registerShader(m_lines);
SelectorTrue allDarts;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
......
...@@ -58,8 +58,6 @@ struct PFP: public PFP_STANDARD ...@@ -58,8 +58,6 @@ struct PFP: public PFP_STANDARD
// declaration of the map // declaration of the map
PFP::MAP myMap; PFP::MAP myMap;
// this selector is going to select all the darts
SelectorTrue allDarts;
// attribute handlers // attribute handlers
AttributeHandler<PFP::VEC3> position; AttributeHandler<PFP::VEC3> position;
......
...@@ -99,10 +99,9 @@ void MyQT::cb_initGL() ...@@ -99,10 +99,9 @@ void MyQT::cb_initGL()
colorVBO->releasePtr(); colorVBO->releasePtr();
// update the renderer (primitives and geometry) // update the renderer (primitives and geometry)
SelectorTrue allDarts; m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
m_render->initPrimitives<PFP>(myMap, allDarts,Algo::Render::GL2::TRIANGLES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, allDarts,Algo::Render::GL2::LINES); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
m_render->initPrimitives<PFP>(myMap, allDarts,Algo::Render::GL2::POINTS);
shader1 = new Utils::ShaderPhong(); shader1 = new Utils::ShaderPhong();
shader1->setAttributePosition(positionVBO); shader1->setAttributePosition(positionVBO);
......
...@@ -46,7 +46,7 @@ void decimate( ...@@ -46,7 +46,7 @@ void decimate(
ApproximatorType a, ApproximatorType a,
typename PFP::TVEC3& position, typename PFP::TVEC3& position,
unsigned int nbWantedVertices, unsigned int nbWantedVertices,
const FunctorSelect& selected = SelectorTrue() const FunctorSelect& selected = allDarts
) ; ) ;
} //namespace Decimation } //namespace Decimation
......
...@@ -67,7 +67,7 @@ private: ...@@ -67,7 +67,7 @@ private:
void recomputeQuadric(const Dart d, const bool recomputeNeighbors = false) ; void recomputeQuadric(const Dart d, const bool recomputeNeighbors = false) ;
public: public:
HalfEdgeSelector_QEMml(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = SelectorTrue()) : HalfEdgeSelector_QEMml(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
EdgeSelector<PFP>(m, pos, approx, select) EdgeSelector<PFP>(m, pos, approx, select)
{ {
halfEdgeInfo = m.template addAttribute<HalfEdgeInfo>(DART, "halfEdgeInfo") ; halfEdgeInfo = m.template addAttribute<HalfEdgeInfo>(DART, "halfEdgeInfo") ;
...@@ -124,7 +124,7 @@ private: ...@@ -124,7 +124,7 @@ private:
void recomputeQuadric(const Dart d, const bool recomputeNeighbors) ; void recomputeQuadric(const Dart d, const bool recomputeNeighbors) ;
public: public:
HalfEdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = SelectorTrue()) : HalfEdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
EdgeSelector<PFP>(m, pos, approx, select) EdgeSelector<PFP>(m, pos, approx, select)
{ {
m_frame = m.template getAttribute<MATRIX33>(VERTEX, "frame") ; m_frame = m.template getAttribute<MATRIX33>(VERTEX, "frame") ;
...@@ -188,7 +188,7 @@ private: ...@@ -188,7 +188,7 @@ private:
void computeEdgeInfo(Dart d, EdgeInfo& einfo) ; void computeEdgeInfo(Dart d, EdgeInfo& einfo) ;
public: public:
EdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = SelectorTrue()) : EdgeSelector_Lightfield(MAP& m, typename PFP::TVEC3& pos, std::vector<ApproximatorGen<PFP>*>& approx, const FunctorSelect& select = allDarts) :
EdgeSelector<PFP>(m, pos, approx, select) EdgeSelector<PFP>(m, pos, approx, select)
{ {
m_frame = m.template getAttribute<FRAME>(VERTEX, "frame") ; m_frame = m.template getAttribute<FRAME>(VERTEX, "frame") ;
......
...@@ -23,7 +23,7 @@ void decimate( ...@@ -23,7 +23,7 @@ void decimate(
typename PFP::TVEC3& position, typename PFP::TVEC3& position,
double nbWanted double nbWanted
); );
// const FunctorSelect& selected = SelectorTrue() // const FunctorSelect& selected = allDarts
//) ; //) ;
} //namespace DecimationVolumique } //namespace DecimationVolumique
......
...@@ -43,7 +43,7 @@ namespace Export ...@@ -43,7 +43,7 @@ namespace Export
* @return true * @return true
*/ */
template <typename PFP> template <typename PFP>
bool exportPLY(typename PFP::MAP& map, const typename PFP::TVEC3& position, const char* filename, const FunctorSelect& good = SelectorTrue()) ; bool exportPLY(typename PFP::MAP& map, const typename PFP::TVEC3& position, const char* filename, const FunctorSelect& good = allDarts) ;
/** /**
* export the map into a OFF file * export the map into a OFF file
...@@ -52,7 +52,7 @@ bool exportPLY(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons ...@@ -52,7 +52,7 @@ bool exportPLY(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true * @return true
*/ */
template <typename PFP> template <typename PFP>
bool exportOFF(typename PFP::MAP& map, const typename PFP::TVEC3& position, const char* filename, const FunctorSelect& good = SelectorTrue()) ; bool exportOFF(typename PFP::MAP& map, const typename PFP::TVEC3& position, const char* filename, const FunctorSelect& good = allDarts) ;
/** /**
* export the map into a Trian file * export the map into a Trian file
...@@ -61,7 +61,7 @@ bool exportOFF(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons ...@@ -61,7 +61,7 @@ bool exportOFF(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true * @return true
*/ */
template <typename PFP> template <typename PFP>
bool exportTrian(typename PFP::MAP& map, const typename PFP::TVEC3& position, char* filename, const FunctorSelect& good = SelectorTrue()) ; bool exportTrian(typename PFP::MAP& map, const typename PFP::TVEC3& position, char* filename, const FunctorSelect& good = allDarts) ;
/** /**
* export the map into a Trian file * export the map into a Trian file
...@@ -70,7 +70,7 @@ bool exportTrian(typename PFP::MAP& map, const typename PFP::TVEC3& position, ch ...@@ -70,7 +70,7 @@ bool exportTrian(typename PFP::MAP& map, const typename PFP::TVEC3& position, ch
* @return true * @return true
*/ */
template <typename PFP> template <typename PFP>
bool exportCTM(typename PFP::MAP& map, const typename PFP::TVEC3& position, const std::string& filename, const FunctorSelect& good = SelectorTrue()) ; bool exportCTM(typename PFP::MAP& map, const typename PFP::TVEC3& position, const std::string& filename, const FunctorSelect& good = allDarts) ;
/** /**
* export the map into a PLYPTMgeneric file (K. Vanhoey generic format). * export the map into a PLYPTMgeneric file (K. Vanhoey generic format).
...@@ -85,7 +85,7 @@ bool exportCTM(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons ...@@ -85,7 +85,7 @@ bool exportCTM(typename PFP::MAP& map, const typename PFP::TVEC3& position, cons
* @return true * @return true
*/ */
template <typename PFP> template <typename PFP>
bool exportPlyPTMgeneric(typename PFP::MAP& map, const char* filename, const typename PFP::TVEC3& position, const FunctorSelect& good = SelectorTrue()) ; bool exportPlyPTMgeneric(typename PFP::MAP& map, const char* filename, const typename PFP::TVEC3& position, const FunctorSelect& good = allDarts) ;
/** /**
* export the map into a PLYPTMgeneric file (K. Vanhoey generic format) * export the map into a PLYPTMgeneric file (K. Vanhoey generic format)
......
...@@ -34,7 +34,7 @@ void exportTrianglePlain(std::ofstream& out,typename PFP::VEC3& p1,typename PFP: ...@@ -34,7 +34,7 @@ void exportTrianglePlain(std::ofstream& out,typename PFP::VEC3& p1,typename PFP:
} }
template <typename PFP> template <typename PFP>
void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& meshName, const FunctorSelect& good = SelectorTrue()) void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& meshName, const FunctorSelect& good = allDarts)
{ {
out << "#declare " << meshName << "= union {" << std::endl; out << "#declare " << meshName << "= union {" << std::endl;
...@@ -74,7 +74,7 @@ void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, typename PFP::T ...@@ -74,7 +74,7 @@ void exportMeshPlain(std::ofstream& out, typename PFP::MAP& map, typename PFP::T
} }
template <typename PFP> template <typename PFP>
void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& meshName, const FunctorSelect& good = SelectorTrue()) void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& meshName, const FunctorSelect& good = allDarts)
{ {
out << "#declare " << meshName << "= union {" << std::endl; out << "#declare " << meshName << "= union {" << std::endl;
...@@ -117,7 +117,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TV ...@@ -117,7 +117,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TV
} }
template <typename PFP> template <typename PFP>
bool exportScenePov(typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& filename, typename PFP::VEC3 cameraPos, typename PFP::VEC3 cameraLook, typename PFP::VEC3 translate, float angle_X, float angle_Y, float angle_Z,const FunctorSelect& good = SelectorTrue()) bool exportScenePov(typename PFP::MAP& map, typename PFP::TVEC3& position, const std::string& filename, typename PFP::VEC3 cameraPos, typename PFP::VEC3 cameraLook, typename PFP::VEC3 translate, float angle_X, float angle_Y, float angle_Z,const FunctorSelect& good = allDarts)
{ {
std::ofstream out(filename.c_str(), std::ios::out); std::ofstream out(filename.c_str(), std::ios::out);
if (!out.good()) if (!out.good())
......
...@@ -43,7 +43,7 @@ void filterAverageAttribute_OneRing( ...@@ -43,7 +43,7 @@ void filterAverageAttribute_OneRing(
const AttributeHandler<T>& attIn, const AttributeHandler<T>& attIn,
AttributeHandler<T>& attOut, AttributeHandler<T>& attOut,
int neigh, int neigh,
const FunctorSelect& select = SelectorTrue()) const FunctorSelect& select = allDarts)
{ {
FunctorAverage<T> fa(attIn) ; FunctorAverage<T> fa(attIn) ;
Algo::Selection::Collector_OneRing<PFP> col(map) ; Algo::Selection::Collector_OneRing<PFP> col(map) ;
...@@ -86,7 +86,7 @@ void filterAverageVertexAttribute_WithinSphere( ...@@ -86,7 +86,7 @@ void filterAverageVertexAttribute_WithinSphere(
int neigh, int neigh,
typename PFP::TVEC3 & position, typename PFP::TVEC3 & position,
typename PFP::REAL radius, typename PFP::REAL radius,
const FunctorSelect& select = SelectorTrue()) const FunctorSelect& select = allDarts)
{ {
FunctorAverage<T> faInside(attIn) ; FunctorAverage<T> faInside(attIn) ;