Commit a81a5d60 authored by pitiot's avatar pitiot

ok

parent 56ab8a8e
......@@ -11,7 +11,7 @@
// #define SECURED
//#define EXPORTING_AGENT
#define EXPORTING_OBJ
//#define EXPORTING_OBJ
#define ARASH
......
......@@ -19,7 +19,7 @@
#endif
#endif
// #define EXPORTING_BOXES
#define EXPORTING_BOXES
#ifdef EXPORTING_BOXES
#include "Algo/Render/GL2/mapRender.h"
......
......@@ -835,9 +835,10 @@ void Simulator::addMovingObstacles(unsigned int nb, unsigned int type, float are
Dart dCell ;
while (!found && d != tF.end())
{
std::vector<Obstacle*>& obst = envMap_.obstvect[d];
if (!envMap_.buildingMark.isMarked(d)
&& !envMap_.pedWayMark.isMarked(d)
// && envMap_.obstvect[d].size() == 0
&& obst.size() == 0
)
{
float area = Algo::Surface::Geometry::convexFaceArea<PFP>(envMap_.map, d, envMap_.position);
......
......@@ -801,8 +801,8 @@ void SocialAgents::cb_redraw()
}
// Commente par Arash
for (std::vector<MovingMesh*>::iterator it = simulator.movingMeshes_.begin() ; it != simulator.movingMeshes_.end() ; ++it)
(*it)->draw();
// for (std::vector<MovingMesh*>::iterator it = simulator.movingMeshes_.begin() ; it != simulator.movingMeshes_.end() ; ++it)
// (*it)->draw();
}
......
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