Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 616b25d7 authored by Jund Thomas's avatar Jund Thomas
Browse files

micro modif

parent 7904ec91
...@@ -228,6 +228,7 @@ void MovingObstacle::update() ...@@ -228,6 +228,7 @@ void MovingObstacle::update()
velocity_[1] = prefVelocity_[1] * velocity_factor; velocity_[1] = prefVelocity_[1] * velocity_factor;
// MAJ des particules // MAJ des particules
make_half_turn = 0;
float rotor = make_half_turn > 0.01f * nbVertices ? 0.01f : make_half_turn / nbVertices; float rotor = make_half_turn > 0.01f * nbVertices ? 0.01f : make_half_turn / nbVertices;
// CGoGNout << "début ++ update "<< CGoGNendl; // CGoGNout << "début ++ update "<< CGoGNendl;
......
...@@ -35,7 +35,7 @@ void Simulator::init(unsigned int config, int minSize, float dimension, bool ena ...@@ -35,7 +35,7 @@ void Simulator::init(unsigned int config, int minSize, float dimension, bool ena
setupCircleScenario(100) ; setupCircleScenario(100) ;
break ; break ;
case 1 : case 1 :
setupCorridorScenario(500, 10) ; setupCorridorScenario(500, 40) ;
break ; break ;
case 2 : case 2 :
setupScenario(1000) ; setupScenario(1000) ;
...@@ -274,14 +274,15 @@ void Simulator::setupCorridorScenario(unsigned int nbAgents, unsigned int nbObst ...@@ -274,14 +274,15 @@ void Simulator::setupCorridorScenario(unsigned int nbAgents, unsigned int nbObst
yGoalDelta = envMap_.geometry.size(1) / 5 ; yGoalDelta = envMap_.geometry.size(1) / 5 ;
yGoalMin = envMap_.geometry.max()[1] - yBorder - yGoalDelta ; yGoalMin = envMap_.geometry.max()[1] - yBorder - yGoalDelta ;
VEC3 xSide (15.0f,0.0f,0.0f); VEC3 xSide (10.0f,0.0f,0.0f);
VEC3 ySide (0.0f,10.0f,0.0f); VEC3 ySide (0.0f,15.0f,0.0f);
std::vector<VEC3> vPos; std::vector<VEC3> vPos;
MovingObstacle* mo4; MovingObstacle* mo4;
for (unsigned int i = 0 ; i < nbObstacles ; i++) for (unsigned int i = 0 ; i < nbObstacles ; i++)
{ {
float x = xStartMin + rand() % xStartDelta; float x = xStartMin + ((int)i*30) % xStartDelta;
std::cout << "x ? " << x << " xStartDelta " << xStartDelta << std::endl;
VEC3 start(x, yStartMin + rand() % yStartDelta, 0) ; VEC3 start(x, yStartMin + rand() % yStartDelta, 0) ;
VEC3 goal(x, yGoalMin + rand() % yGoalDelta, 0) ; VEC3 goal(x, yGoalMin + rand() % yGoalDelta, 0) ;
......
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