Commit 419ba993 authored by Arash HABIBI's avatar Arash HABIBI
Browse files

obst_fixe_resolu_merci_thomas

parent 1cdd1527
......@@ -405,7 +405,7 @@ Dart generateBuilding(EnvMap& envMap, Dart d, float height, unsigned int buildin
Dart x =map.phi2(dd);
if(!map.isBoundaryMarked(x))
{
addElementToVector<Obstacle*>(envMap.obstvect[d],o);
addElementToVector<Obstacle*>(envMap.obstvect[x],o);
if(!map.isBoundaryMarked(map.phi2(map.phi1(x))))
addElementToVector<Obstacle*>(envMap.obstvect[map.phi2(map.phi1(x))],o);
......
......@@ -623,7 +623,7 @@ void Agent::computeNewVelocity()
++it)
{
double dist = it->first;
cerr << "nobst=" << nobst << "dist=" << dist << endl;
// cerr << "nobst=" << nobst << "dist=" << dist << endl;
// double effective_range = 50*range_;
double effective_range = 10*range_;
float force_value=0.0;
......@@ -652,7 +652,7 @@ void Agent::computeNewVelocity()
//----- forces dues à la répulsion des autres agents -------
// double ag_stiffness = 500.0; // agent-agent interaction stiffness
double ag_stiffness = 50.0; // agent-agent interaction stiffness
double ag_stiffness = 500.0; // agent-agent interaction stiffness
double ag_damping = 1.0; // agent-agent interaction damping
double ag_phys_radius_coef = 20.0;
double ag_power = 8; // the power to which elevate the agent-agent distance
......
......@@ -35,7 +35,7 @@ void Simulator::init( float dimension, bool enablePathFinding)
switch (config)
{
case 0 :
setupCircleScenario(50,20) ;
setupCircleScenario(1000,20) ;
break ;
case 1 :
setupCorridorScenario(1000,40) ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment