ok

include/agent.h

@@ -8,10 +8,10 @@
 #include "spatialHashing.h"
 
 
-//#define SECURED
+// #define SECURED
 //#define EXPORTING_AGENT
 
-//#define EXPORTING_OBJ
+#define EXPORTING_OBJ
 #define ARASH
 
 

include/env_map.h

@@ -60,6 +60,8 @@ public:
 	REAL maxCellSize ;
 	REAL minCellSize ;
 	REAL obstacleDistance ;
+	
+	unsigned int config;
 
 	EnvMap() ;
 	void init(unsigned int config, REAL width, REAL height, REAL minSize, REAL maxSize) ;
@@ -132,6 +134,7 @@ public:
 	void popObstNeighborInCells(Obstacle* o, Dart d);
 	void find_next(Obstacle* o,Dart * d, CellMarkerMemo<FACE>& cms);
 	bool movingObstacleFree(Dart d);
+	bool movingObstacleNeighborFree(Dart d);
 #ifdef EXPORTING3
 	std::vector<PFP::MAP *> m_map_Export;
 	std::vector<Algo::Surface::Import::OBJModel<PFP2> *> m_obj_Export;

include/moving_obstacle.h

@@ -19,7 +19,7 @@
 #endif
 #endif
 
- #define EXPORTING_BOXES
+//  #define EXPORTING_BOXES
 
 #ifdef EXPORTING_BOXES
 	#include "Algo/Render/GL2/mapRender.h"
@@ -74,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;

meshRessources/scenario6/planeteBuilding.mtl

+# Blender MTL File: 'None'
+# Material Count: 1
+newmtl _untitled.001
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd .
+
+

meshRessources/scenario6/planeteSol.mtl

+# Blender MTL File: 'None'
+# Material Count: 1
+newmtl _untitled
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd .
+
+

meshRessources/scenario7/tacheBuilding.mtl

+# Blender MTL File: 'taches.blend'
+# Material Count: 1
+newmtl _untitled.001
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd .
+
+

meshRessources/scenario7/tacheSol.mtl

+# Blender MTL File: 'taches.blend'
+# Material Count: 1
+newmtl _untitled
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd .
+
+

meshRessources/scenario8/torusBuilding.mtl

+# Blender MTL File: 'None'
+# Material Count: 1
+newmtl _untitled.001
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd torusBuilding.png
+
+