correctif pb merge ParticleBase

Apps/Examples/viewer.cpp

@@ -194,7 +194,7 @@ void Viewer::importMesh(std::string& filename)
 
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS) ;
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES) ;
-	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES, false) ;
+	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES) ;
 
 	bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
 	normalBaseSize = bb.diagSize() / 100.0f ;

include/Algo/MovingObjects/particle_base.h

@@ -18,47 +18,40 @@ typedef Geom::Vec3f VEC3;
 
 class ParticleBase
 {
-	public :
-		VEC3 m_position;
-
-		ParticleBase()
-		{
-			m_position.zero();
-		}
-
-		ParticleBase(VEC3 position)
-		{
-			m_position = position;
-		}
-
-		virtual unsigned int getState()
-		{
-			return 0;
-		}
-		
-		/**
-		* @param newPosition new position to reach
-		*/
-		virtual bool move(VEC3 position)
-		{
-			m_position = position;
-			return true;
-		}
-
-		virtual unsigned int getState()
-		{
-			return 0;
-		}
-
-		VEC3 getPosition() { return m_position; }
+public :
+	VEC3 m_position;
+
+	ParticleBase()
+	{
+		m_position.zero();
+	}
+
+	ParticleBase(VEC3 position)
+	{
+		m_position = position;
+	}
+
+	virtual unsigned int getState()
+	{
+		return 0;
+	}
+
+	/**
+	* @param newPosition new position to reach
+	*/
+	virtual bool move(VEC3 position)
+	{
+		m_position = position;
+		return true;
+	}
+
+	VEC3 getPosition() { return m_position; }
 };
 
-//namespace
-}
+} // namespace MovingObjects
 
-}
-
-}
+} // namespace Algo
 
+} // namespace CGoGN
 
 #endif