reglage thomas ok

include/agent.h

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

include/moving_mesh.h

@@ -18,7 +18,7 @@
 
 using namespace std;
 
-//#define EXPORTING2
+// #define EXPORTING2
 
 class MovingMesh
 {

src/agent.cpp

@@ -21,8 +21,8 @@ float Agent::averageMaxSpeed_ = 2.0f ;
 //float Agent::neighborDist_ = 20.0f ;
 float Agent::neighborDistSq_ = neighborDist_ * neighborDist_ ;
 //float Agent::radius_ = 8.0f ;
-//float Agent::radius_ = 3.0f ;
-float Agent::radius_ = 1.5f ;
+float Agent::radius_ = 3.0f ;
+// float Agent::radius_ = 1.5f ;
 float Agent::timeHorizon_ = 10.0f ;
 //float Agent::timeHorizon_ = 100.0f ;
 float Agent::timeHorizonObst_ = 10.0f ;

src/simulator.cpp

@@ -80,7 +80,7 @@ void Simulator::init( float dimension, unsigned int nbAgent, unsigned int nbObst
 			setupScenario(nbAgent, true) ;
 //			SelectorCellNotMarked<PFP::MAP> scnm(envMap_.pedWayMark);
 			addMovingObstacles(nbObst, 1);
-//			addPathToObstacles(envMap_.pedWayMark, false);
+			addPathToObstacles(envMap_.pedWayMark, false);
 			addPathsToAgents();
 			break;
 		case 6:
@@ -665,9 +665,10 @@ void Simulator::setupScenario(unsigned int nbMaxAgent, bool pedWay)
 	 */
 	TraversorF<PFP::MAP> tF(envMap_.map);
 	Dart d = tF.begin() ;
-
-	unsigned int nbx = 1 ;
-	unsigned int nby = 1 ;
+//-----------------------
+	unsigned int nbx = 2 ;
+	unsigned int nby = 2 ;
+//-----------------------
 
 	unsigned int bMax = nbx * nby > 0 ? nbMaxAgent / (nbx * nby) : nbMaxAgent ;
 

src/viewer.cpp

@@ -1907,6 +1907,13 @@ void SocialAgents::keyPressEvent(QKeyEvent *e)
 			cam->lookAt(qglviewer::Vec(0,0,0));
 			cam->setSceneRadius(10000);
 		}
+		if(simulator.config==3)
+		{
+			cam->setPosition(qglviewer::Vec(0,-900,700));
+			cam->setUpVector(qglviewer::Vec(0,0,0));
+			cam->lookAt(qglviewer::Vec(0,0,0));
+			cam->setSceneRadius(10000);
+		}
 		break;
 	}
 	case Qt::Key_5 :