ajout de particule secured pour les moving obst

include/moving_obstacle.h

@@ -7,11 +7,16 @@
 #include "env_map.h"
 #include <set>
 
+// #define SECURED
 
 #ifdef TWO_AND_HALF_DIM
 	#include "Algo/MovingObjects/particle_cell_2DandHalf_memo.h"
+#else
+#ifdef SECURED
+	#include "Algo/MovingObjects/particle_cell_2D_secured.h"
 #else
 	#include "Algo/MovingObjects/particle_cell_2D_memo.h"
+#endif
 #endif
 
  #define EXPORTING_BOXES
@@ -69,10 +74,15 @@ public:
 
 	unsigned int nbVertices;
 
-#ifdef TWO_AND_HALF_DIM
-	CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP>* * parts_;
-#else
-	CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>* * parts_;
+#ifdef SECURED
+	CGoGN::Algo::Surface::MovingObjects::ParticleCell2DSecured<PFP> * * parts_ ;
+	#else
+
+		#ifdef TWO_AND_HALF_DIM
+		CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP> * * parts_ ;
+		#else
+		CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>* * parts_ ;
+		#endif
 #endif
 
 	PFP::MAP map;
@@ -147,7 +157,7 @@ public:
 	bool rigid_;
 	bool spinning;
 	ArticulatedObstacle * parent;
-	float hight;
+	float height;
 	MovingMesh* mm_;
 	Agent* ag_;
 	int index_parent;