From 0caa53f89fd0b8fd2537de4ea84f88295d0506a6 Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Thu, 27 Jan 2011 17:24:45 +0100 Subject: [PATCH] modif social agent -> small city example --- Apps/Examples/SocialAgents/src/env_map.cpp | 4 ++-- Apps/Examples/SocialAgents/src/simulator.cpp | 11 +++++------ Apps/Examples/SocialAgents/src/viewer.cpp | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Apps/Examples/SocialAgents/src/env_map.cpp b/Apps/Examples/SocialAgents/src/env_map.cpp index 5a57fec34..198392f56 100644 --- a/Apps/Examples/SocialAgents/src/env_map.cpp +++ b/Apps/Examples/SocialAgents/src/env_map.cpp @@ -339,8 +339,8 @@ void EnvMap::addNeighborAgents(PFP::AGENTS agentsFrom,PFP::AGENTS agentsTo) void EnvMap::updateMap() { // simplifyFaces(); -// subdivideFaces() ; -// map.setCurrentLevel(map.getMaxLevel()) ; + subdivideFaces() ; + map.setCurrentLevel(map.getMaxLevel()) ; } void EnvMap::subdivideFaces() diff --git a/Apps/Examples/SocialAgents/src/simulator.cpp b/Apps/Examples/SocialAgents/src/simulator.cpp index 1fbd8aa75..a8a31d5bc 100644 --- a/Apps/Examples/SocialAgents/src/simulator.cpp +++ b/Apps/Examples/SocialAgents/src/simulator.cpp @@ -14,18 +14,17 @@ Simulator::Simulator() : agents_(), defaultAgent_(0), globalTime_(0.0f), timeSte // CGoGN::CityGenerator::generateGrid(envMap.map,envMap.position,100,100,50.0f,envMap.closeMark); envMap.sideSize = 70.0f; -// CGoGN::CityGenerator::generateSmallCity(envMap.map,envMap.position,envMap.closeMark,envMap.sideSize); + CGoGN::CityGenerator::generateSmallCity(envMap.map,envMap.position,envMap.closeMark,envMap.sideSize); // CGoGN::CityGenerator::generateAbsolutSpiralOfDeath(envMap.map,envMap.position,envMap.closeMark,2000,0.25,110,100); - CGoGN::CityGenerator::generateToboggan(envMap.map,envMap.position,envMap.closeMark,100,0.25,200,10); - +// CGoGN::CityGenerator::generateToboggan(envMap.map,envMap.position,envMap.closeMark,100,0.25,200,10); // std::cout << "simplify" << std::endl; // envMap.simplify(); -// envMap.map.init(); + envMap.map.init(); std::cout << "setup scenario" << std::endl; -// setupScenario(); - setupHelicoidScenario(1,50); + setupScenario(); +// setupHelicoidScenario(1,50); // Dart dStop=envMap.map.begin(); // for(unsigned int i=0;i<5000;++i) envMap.map.next(dStop); diff --git a/Apps/Examples/SocialAgents/src/viewer.cpp b/Apps/Examples/SocialAgents/src/viewer.cpp index e315d5ff9..0cdfca686 100644 --- a/Apps/Examples/SocialAgents/src/viewer.cpp +++ b/Apps/Examples/SocialAgents/src/viewer.cpp @@ -388,9 +388,9 @@ void MyGlutWin::animate(void) // std::cout << "pos to reach : " << posToReach << std::endl; // std::cout << sim->getGlobalTime() << " " << std::endl; updateVisualization(sim); -// sim->setPreferredVelocities(posToReach); + sim->setPreferredVelocities(posToReach); // sim->setPreferredPathVelocities(); - sim->setPreferredNextCellVelocities(); +// sim->setPreferredNextCellVelocities(); sim->doStep(); // sim->envMap.simplify(); glutPostRedisplay(); -- GitLab