Commit bb7622ee authored by Sylvain Thery's avatar Sylvain Thery

remove useless Selectors

parent 8704c3dc
...@@ -154,7 +154,7 @@ void MCMesh::MC() ...@@ -154,7 +154,7 @@ void MCMesh::MC()
void MCMesh::updateRender() void MCMesh::updateRender()
{ {
SelectorDartNoBoundary<PFP::MAP> nb(myMap); // SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO add Browser for no border //TODO add Browser for no border
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES); m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES); m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
......
...@@ -118,7 +118,6 @@ void MyQT::cb_initGL() ...@@ -118,7 +118,6 @@ void MyQT::cb_initGL()
m_render_topo = new Algo::Render::GL2::Topo3Render(); m_render_topo = new Algo::Render::GL2::Topo3Render();
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f); m_render_topo->updateData<PFP>(myMap, position, 0.95f, 0.9f, 0.8f);
m_dm_topo = new DartMarker(myMap); m_dm_topo = new DartMarker(myMap);
} }
...@@ -145,7 +144,6 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -145,7 +144,6 @@ void MyQT::cb_mousePress(int button, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart d = m_render_topo->picking<PFP>(myMap, x, y); Dart d = m_render_topo->picking<PFP>(myMap, x, y);
if (d != Dart::nil()) if (d != Dart::nil())
{ {
...@@ -199,7 +197,6 @@ void MyQT::traverse2() ...@@ -199,7 +197,6 @@ void MyQT::traverse2()
return; return;
m_last=2; m_last=2;
// int code = (m_ajd_or_inci2)*100+m_first2*10+m_second2; // int code = (m_ajd_or_inci2)*100+m_first2*10+m_second2;
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_drawer.newList(GL_COMPILE); m_drawer.newList(GL_COMPILE);
m_drawer.lineWidth(7.0f); m_drawer.lineWidth(7.0f);
...@@ -266,8 +263,6 @@ void MyQT::traverse3() ...@@ -266,8 +263,6 @@ void MyQT::traverse3()
m_last=3; m_last=3;
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_affDarts.clear(); m_affDarts.clear();
m_drawer.newList(GL_COMPILE); m_drawer.newList(GL_COMPILE);
......
...@@ -77,7 +77,7 @@ void MyQT::createMap() ...@@ -77,7 +77,7 @@ void MyQT::createMap()
show(); show();
// render the topo of the map without boundary darts // render the topo of the map without boundary darts
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f,true ); m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f);
} }
// initialization GL callback // initialization GL callback
......
...@@ -69,7 +69,7 @@ class MyQT: public Utils::QT::SimpleQT ...@@ -69,7 +69,7 @@ class MyQT: public Utils::QT::SimpleQT
{ {
Q_OBJECT Q_OBJECT
public: 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_redraw();
void cb_initGL(); void cb_initGL();
...@@ -87,8 +87,6 @@ protected: ...@@ -87,8 +87,6 @@ protected:
VertexAttribute<VEC3> position; VertexAttribute<VEC3> position;
DartAttribute<VEC3> colorDarts; DartAttribute<VEC3> colorDarts;
SelectorDartNoBoundary<PFP::MAP> nb;
// render (for the topo) // render (for the topo)
Algo::Render::GL2::TopoRender* m_render_topo; Algo::Render::GL2::TopoRender* m_render_topo;
Dart m_selected; Dart m_selected;
......
...@@ -142,8 +142,7 @@ void MyQT::cb_initGL() ...@@ -142,8 +142,7 @@ void MyQT::cb_initGL()
Utils::GLSLShader::setCurrentOGLVersion(2); Utils::GLSLShader::setCurrentOGLVersion(2);
m_render_topo = new Algo::Render::GL2::Topo3Render(); m_render_topo = new Algo::Render::GL2::Topo3Render();
SelectorDartNoBoundary<PFP::MAP> nb(myMap); m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.8f, 0.8f);
m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.8f, 0.8f/*, nb*/);
m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f)); m_strings = new Utils::Strings3D(true, Geom::Vec3f(0.1f,0.0f,0.3f));
registerShader(m_strings); registerShader(m_strings);
...@@ -167,8 +166,7 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -167,8 +166,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
SelectorDartNoBoundary<PFP::MAP> nb(myMap); m_clicked = m_render_topo->picking<PFP>(myMap, x,y);
m_clicked = m_render_topo->picking<PFP>(myMap, x,y/*, nb*/);
if (m_clicked != Dart::nil()) 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}; 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};
......
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