Commit 0caa53f8 authored by Pierre Kraemer's avatar Pierre Kraemer

modif social agent -> small city example

parent 32c0c874
...@@ -339,8 +339,8 @@ void EnvMap::addNeighborAgents(PFP::AGENTS agentsFrom,PFP::AGENTS agentsTo) ...@@ -339,8 +339,8 @@ void EnvMap::addNeighborAgents(PFP::AGENTS agentsFrom,PFP::AGENTS agentsTo)
void EnvMap::updateMap() void EnvMap::updateMap()
{ {
// simplifyFaces(); // simplifyFaces();
// subdivideFaces() ; subdivideFaces() ;
// map.setCurrentLevel(map.getMaxLevel()) ; map.setCurrentLevel(map.getMaxLevel()) ;
} }
void EnvMap::subdivideFaces() void EnvMap::subdivideFaces()
......
...@@ -14,18 +14,17 @@ Simulator::Simulator() : agents_(), defaultAgent_(0), globalTime_(0.0f), timeSte ...@@ -14,18 +14,17 @@ Simulator::Simulator() : agents_(), defaultAgent_(0), globalTime_(0.0f), timeSte
// CGoGN::CityGenerator::generateGrid<PFP,PFP::TVEC3>(envMap.map,envMap.position,100,100,50.0f,envMap.closeMark); // CGoGN::CityGenerator::generateGrid<PFP,PFP::TVEC3>(envMap.map,envMap.position,100,100,50.0f,envMap.closeMark);
envMap.sideSize = 70.0f; envMap.sideSize = 70.0f;
// CGoGN::CityGenerator::generateSmallCity<PFP,PFP::TVEC3>(envMap.map,envMap.position,envMap.closeMark,envMap.sideSize); CGoGN::CityGenerator::generateSmallCity<PFP,PFP::TVEC3>(envMap.map,envMap.position,envMap.closeMark,envMap.sideSize);
// CGoGN::CityGenerator::generateAbsolutSpiralOfDeath<PFP>(envMap.map,envMap.position,envMap.closeMark,2000,0.25,110,100); // CGoGN::CityGenerator::generateAbsolutSpiralOfDeath<PFP>(envMap.map,envMap.position,envMap.closeMark,2000,0.25,110,100);
CGoGN::CityGenerator::generateToboggan<PFP>(envMap.map,envMap.position,envMap.closeMark,100,0.25,200,10); // CGoGN::CityGenerator::generateToboggan<PFP>(envMap.map,envMap.position,envMap.closeMark,100,0.25,200,10);
// std::cout << "simplify" << std::endl; // std::cout << "simplify" << std::endl;
// envMap.simplify(); // envMap.simplify();
// envMap.map.init(); envMap.map.init();
std::cout << "setup scenario" << std::endl; std::cout << "setup scenario" << std::endl;
// setupScenario(); setupScenario();
setupHelicoidScenario(1,50); // setupHelicoidScenario(1,50);
// Dart dStop=envMap.map.begin(); // Dart dStop=envMap.map.begin();
// for(unsigned int i=0;i<5000;++i) envMap.map.next(dStop); // for(unsigned int i=0;i<5000;++i) envMap.map.next(dStop);
......
...@@ -388,9 +388,9 @@ void MyGlutWin::animate(void) ...@@ -388,9 +388,9 @@ void MyGlutWin::animate(void)
// std::cout << "pos to reach : " << posToReach << std::endl; // std::cout << "pos to reach : " << posToReach << std::endl;
// std::cout << sim->getGlobalTime() << " " << std::endl; // std::cout << sim->getGlobalTime() << " " << std::endl;
updateVisualization(sim); updateVisualization(sim);
// sim->setPreferredVelocities(posToReach); sim->setPreferredVelocities(posToReach);
// sim->setPreferredPathVelocities(); // sim->setPreferredPathVelocities();
sim->setPreferredNextCellVelocities(); // sim->setPreferredNextCellVelocities();
sim->doStep(); sim->doStep();
// sim->envMap.simplify(); // sim->envMap.simplify();
glutPostRedisplay(); glutPostRedisplay();
......
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