modification of topo render usage

small modif for warning in image class of MC
removing of unused code (testing) in map2

Apps/Examples/clipping.cpp

@@ -137,21 +137,21 @@ void Clipping::slot_drawFaces(bool b)
 void Clipping::slot_explodTopoPhi1(double c)
 {
 	m_coeffTopoExplod[0] = (float)c;
-	m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
+	m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
 	updateGL();
 }
 
 void Clipping::slot_explodTopoPhi2(double c)
 {
 	m_coeffTopoExplod[1] = (float)c;
-	m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
+	m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
 	updateGL();
 }
 
 void Clipping::slot_explodTopoPhi3(double c)
 {
 	m_coeffTopoExplod[2] = (float)c;
-	m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
+	m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
 	updateGL();
 }
 
@@ -830,7 +830,7 @@ void Clipping::importMesh(std::string& filename)
 
 	updateVBOprimitives(Algo::Render::GL2::TRIANGLES | Algo::Render::GL2::LINES | Algo::Render::GL2::POINTS) ;
 
-	m_render_topo->updateData<PFP>(myMap, allDarts, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2]);
+	m_render_topo->updateData<PFP>(myMap, position, m_coeffTopoExplod[0], m_coeffTopoExplod[1], m_coeffTopoExplod[2], allDarts);
 
 	m_bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
 	gPosObj = m_bb.center() ;
@@ -859,7 +859,7 @@ void Clipping::cb_initGL()
 
 	// create the render
 	m_render = new Algo::Render::GL2::MapRender();
-	m_render_topo = new Algo::Render::GL2::Topo3RenderMapD();
+	m_render_topo = new Algo::Render::GL2::Topo3Render();
 
 	// create VBO for position
 	m_positionVBO = new Utils::VBO();

Apps/Examples/clipping.h

@@ -91,7 +91,7 @@ public:
 	bool m_drawTopo;
 
 	Algo::Render::GL2::MapRender* m_render;
-	Algo::Render::GL2::Topo3RenderMapD* m_render_topo;
+	Algo::Render::GL2::Topo3Render* m_render_topo;
 
 	Geom::BoundingBox<PFP::VEC3> m_bb;
 

Apps/Tuto/tp_master.cpp

@@ -369,7 +369,7 @@ void MyQT::cb_initGL()
 
 	// create the render
 	m_render = new Algo::Render::GL2::MapRender();
-	m_render_topo = new Algo::Render::GL2::TopoRenderMapD() ;
+	m_render_topo = new Algo::Render::GL2::TopoRender() ;
 
 	m_ds = new Utils::Drawer();
 

Apps/Tuto/tp_master.h

@@ -31,7 +31,7 @@
 
 // forward definitions (minimize includes)
 namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; } } } }
-namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class TopoRenderMapD; } } } }
+namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class TopoRender; } } } }
 namespace CGoGN { namespace Utils { class VBO; } }
 namespace CGoGN { namespace Utils { class ShaderPhong; } }
 namespace CGoGN { namespace Utils { class ShaderSimpleColor; } }
@@ -53,7 +53,7 @@ protected:
 public:
 	// render
 	Algo::Render::GL2::MapRender* m_render;
-	Algo::Render::GL2::TopoRenderMapD* m_render_topo;
+	Algo::Render::GL2::TopoRender* m_render_topo;
 
 	// VBO
 	Utils::VBO* m_positionVBO;

include/Algo/MC/image.hpp

@@ -731,7 +731,7 @@ Image<DataType>* Image<DataType>::cropz(unsigned int zmin, unsigned int nb)
 	newImg->m_Alloc=true;
 	// set origin of real data in image ??
 
-	for(unsigned int z=zmin; z< zmax; ++z)
+	for(int z=zmin; z< zmax; ++z)
 	{
 		for(int y=0; y<m_WY; ++y)
 		{

include/Topology/map/map2.h

@@ -101,11 +101,6 @@ protected:
 
 public:
 
-	/**
-	 * FOR TEST
-	 */
-	void forceFixedPoint(Dart d) { (*m_phi2)[d.index] = d ;}
-
 	/*! @name Generator and Deletor
 	 *  To generate or delete faces in a 2-map
 	 *************************************************************************/