From bb7622eec78a6f36cc59536bb342d92580213980 Mon Sep 17 00:00:00 2001
From: Sylvain Thery <thery@unistra.fr>
Date: Mon, 18 Feb 2013 16:15:45 +0100
Subject: [PATCH] remove useless Selectors

---
 Apps/Examples/mcmesh.cpp      | 2 +-
 Apps/Tuto/show_traversors.cpp | 5 -----
 Apps/Tuto/tuto1.cpp           | 2 +-
 Apps/Tuto/tuto_oper2.h        | 4 +---
 Apps/Tuto/tuto_orbits.cpp     | 6 ++----
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Apps/Examples/mcmesh.cpp b/Apps/Examples/mcmesh.cpp
index 1a4555d6b..862c5e56a 100644
--- a/Apps/Examples/mcmesh.cpp
+++ b/Apps/Examples/mcmesh.cpp
@@ -154,7 +154,7 @@ void MCMesh::MC()
 
 void MCMesh::updateRender()
 {
-	SelectorDartNoBoundary<PFP::MAP> nb(myMap);
+//	SelectorDartNoBoundary<PFP::MAP> nb(myMap);
 	//TODO	add Browser for no border
 	m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::LINES);
 	m_render->initPrimitives<PFP>(myMap, Algo::Render::GL2::TRIANGLES);
diff --git a/Apps/Tuto/show_traversors.cpp b/Apps/Tuto/show_traversors.cpp
index 8af5b3b14..c6c872f87 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<PFP::MAP> nb(myMap);
 	m_render_topo->updateData<PFP>(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<PFP::MAP> nb(myMap);
 		Dart d = m_render_topo->picking<PFP>(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<PFP::MAP> nb(myMap);
 
 	m_drawer.newList(GL_COMPILE);
 	m_drawer.lineWidth(7.0f);
@@ -266,8 +263,6 @@ void MyQT::traverse3()
 
 	m_last=3;
 
-	SelectorDartNoBoundary<PFP::MAP> nb(myMap);
-
 
 	m_affDarts.clear();
 	m_drawer.newList(GL_COMPILE);
diff --git a/Apps/Tuto/tuto1.cpp b/Apps/Tuto/tuto1.cpp
index a02d3ba46..936a59472 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<PFP>(myMap, position, 0.9f, 0.9f,true	);
+	m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f);
 }
 
 // initialization GL callback
diff --git a/Apps/Tuto/tuto_oper2.h b/Apps/Tuto/tuto_oper2.h
index 9f37b4dc7..586a10e21 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<VEC3> position;
 	DartAttribute<VEC3> colorDarts;
 
-	SelectorDartNoBoundary<PFP::MAP> 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 826ec39e4..c829b7dec 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<PFP::MAP> nb(myMap);
-	m_render_topo->updateData<PFP>(myMap, position,  0.9f, 0.8f, 0.8f/*, nb*/);
+	m_render_topo->updateData<PFP>(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<PFP::MAP> nb(myMap);	
-		m_clicked = m_render_topo->picking<PFP>(myMap, x,y/*, nb*/);
+		m_clicked = m_render_topo->picking<PFP>(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};
-- 
GitLab