diff --git a/Apps/Examples/mcmesh.cpp b/Apps/Examples/mcmesh.cpp index 1a4555d6bcd6406fd2c620a1183964f3f0421508..862c5e56a01fa15758f4c7081724b9ad09f3736f 100644 --- a/Apps/Examples/mcmesh.cpp +++ b/Apps/Examples/mcmesh.cpp @@ -154,7 +154,7 @@ void MCMesh::MC() void MCMesh::updateRender() { - SelectorDartNoBoundary nb(myMap); +// SelectorDartNoBoundary nb(myMap); //TODO add Browser for no border m_render->initPrimitives(myMap, Algo::Render::GL2::LINES); m_render->initPrimitives(myMap, Algo::Render::GL2::TRIANGLES); diff --git a/Apps/Tuto/show_traversors.cpp b/Apps/Tuto/show_traversors.cpp index 8af5b3b14922b309a736d3dda4e65aaf3b9fc895..c6c872f87a1468dc5ab2d823a522c7e28cc85268 100644 --- a/Apps/Tuto/show_traversors.cpp +++ b/Apps/Tuto/show_traversors.cpp @@ -118,7 +118,6 @@ void MyQT::cb_initGL() m_render_topo = new Algo::Render::GL2::Topo3Render(); -// SelectorDartNoBoundary nb(myMap); m_render_topo->updateData(myMap, position, 0.95f, 0.9f, 0.8f); m_dm_topo = new DartMarker(myMap); } @@ -145,7 +144,6 @@ void MyQT::cb_mousePress(int button, int x, int y) { if (Shift()) { -// SelectorDartNoBoundary nb(myMap); Dart d = m_render_topo->picking(myMap, x, y); if (d != Dart::nil()) { @@ -199,7 +197,6 @@ void MyQT::traverse2() return; m_last=2; // int code = (m_ajd_or_inci2)*100+m_first2*10+m_second2; - SelectorDartNoBoundary nb(myMap); m_drawer.newList(GL_COMPILE); m_drawer.lineWidth(7.0f); @@ -266,8 +263,6 @@ void MyQT::traverse3() m_last=3; - SelectorDartNoBoundary nb(myMap); - m_affDarts.clear(); m_drawer.newList(GL_COMPILE); diff --git a/Apps/Tuto/tuto1.cpp b/Apps/Tuto/tuto1.cpp index a02d3ba46d09a17bf1ffdc317d0a77128321c0f3..936a59472e9a52f0d7b6b5ce89d285268d0450b8 100644 --- a/Apps/Tuto/tuto1.cpp +++ b/Apps/Tuto/tuto1.cpp @@ -77,7 +77,7 @@ void MyQT::createMap() show(); // render the topo of the map without boundary darts - m_render_topo->updateData(myMap, position, 0.9f, 0.9f,true ); + m_render_topo->updateData(myMap, position, 0.9f, 0.9f); } // initialization GL callback diff --git a/Apps/Tuto/tuto_oper2.h b/Apps/Tuto/tuto_oper2.h index 9f37b4dc74c2516ebc65c79f4ade6cfa115779dd..586a10e210d3d4a0366e3f8c50ea341e6d7da1d4 100644 --- a/Apps/Tuto/tuto_oper2.h +++ b/Apps/Tuto/tuto_oper2.h @@ -69,7 +69,7 @@ class MyQT: public Utils::QT::SimpleQT { Q_OBJECT public: - MyQT():nb(myMap),m_render_topo(NULL),m_selected(NIL),m_selected2(NIL),dm(myMap),m_shift(0.01f) {} + MyQT():m_render_topo(NULL),m_selected(NIL),m_selected2(NIL),dm(myMap),m_shift(0.01f) {} void cb_redraw(); void cb_initGL(); @@ -87,8 +87,6 @@ protected: VertexAttribute position; DartAttribute colorDarts; - SelectorDartNoBoundary nb; - // render (for the topo) Algo::Render::GL2::TopoRender* m_render_topo; Dart m_selected; diff --git a/Apps/Tuto/tuto_orbits.cpp b/Apps/Tuto/tuto_orbits.cpp index 826ec39e47e50260314ef4e47255827825949bec..c829b7decf1d3511651dea36771af76088074b73 100644 --- a/Apps/Tuto/tuto_orbits.cpp +++ b/Apps/Tuto/tuto_orbits.cpp @@ -142,8 +142,7 @@ void MyQT::cb_initGL() Utils::GLSLShader::setCurrentOGLVersion(2); m_render_topo = new Algo::Render::GL2::Topo3Render(); - SelectorDartNoBoundary nb(myMap); - m_render_topo->updateData(myMap, position, 0.9f, 0.8f, 0.8f/*, nb*/); + m_render_topo->updateData(myMap, position, 0.9f, 0.8f, 0.8f); m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f)); registerShader(m_strings); @@ -167,8 +166,7 @@ void MyQT::cb_mousePress(int button, int x, int y) { if (Shift()) { - SelectorDartNoBoundary nb(myMap); - m_clicked = m_render_topo->picking(myMap, x,y/*, nb*/); + m_clicked = m_render_topo->picking(myMap, x,y); if (m_clicked != Dart::nil()) { unsigned int orbs[9] = {VERTEX,EDGE,FACE,VOLUME,PFP::MAP::VERTEX_OF_PARENT,PFP::MAP::EDGE_OF_PARENT,PFP::MAP::FACE_OF_PARENT,PFP::MAP::VERTEX_OF_PARENT2,PFP::MAP::EDGE_OF_PARENT2};