Commit 88e09374 authored by Thomas Jund's avatar Thomas Jund
Browse files

on avance

parents 76f1ee4a 9734ba27
......@@ -11,7 +11,7 @@
//#define SECURED
//#define EXPORTING_AGENT
//#define EXPORTING_OBJ
#define EXPORTING_OBJ
#define ARASH
......
......@@ -92,7 +92,7 @@ void generateCity(EnvMap& envMap, unsigned int nbBuildings, float minArea, float
#ifndef TWO_AND_HALF_DIM
generateBuilding<PFP>(envMap, d, (1 + (rand() % 3)) * maxHeight, rand() % 4) ;
#else
generateBuilding<PFP>(envMap, d, (1 + (rand() % 3)) * maxHeight, rand() % 3) ;
generateBuilding<PFP>(envMap, d, (1 + (rand() % 3)) * maxHeight, rand() % 4) ;
#endif
--nbBuilding ;
......@@ -485,7 +485,9 @@ Dart generateBuilding(EnvMap& envMap, Dart d, float height, unsigned int buildin
dRoof = extrudeFaceAndMark<PFP>(map, position, dRoofSmall, buildingMark,
height / 2.0f) ;
}
#ifndef TWO_AND_HALF_DIM
bool spike = rand() % 2 ;
if (spike)
{
typename PFP::VEC3 c = Algo::Surface::Geometry::faceCentroid<PFP>(map, dRoof, position) ;
......@@ -493,6 +495,7 @@ Dart generateBuilding(EnvMap& envMap, Dart d, float height, unsigned int buildin
dRoof = Algo::Surface::Modelisation::trianguleFace<PFP>(map, dRoof) ;
position[dRoof] = c ;
}
#endif
break ;
}
}
......
......@@ -32,7 +32,7 @@ class ArticulatedObstacle;
#include "pfp.h"
//#define EXPORTING3
#define EXPORTING3
#define TWO_AND_HALF_DIM
......@@ -60,6 +60,8 @@ public:
REAL maxCellSize ;
REAL minCellSize ;
REAL obstacleDistance ;
unsigned int config;
EnvMap() ;
void init(unsigned int config, REAL width, REAL height, REAL minSize, REAL maxSize) ;
......@@ -131,7 +133,7 @@ public:
void pushObstNeighborInCells(Obstacle* o, Dart d);
void popObstNeighborInCells(Obstacle* o, Dart d);
void find_next(Obstacle* o,Dart * d, CellMarkerMemo<FACE>& cms);
bool movingObstacleFree(Dart d);
#ifdef EXPORTING3
std::vector<PFP::MAP *> m_map_Export;
std::vector<Algo::Surface::Import::OBJModel<PFP2> *> m_obj_Export;
......
......@@ -18,7 +18,7 @@
using namespace std;
//#define EXPORTING2
#define EXPORTING2
float get_angle3D(VEC3 v1, VEC3 v2);
......
......@@ -19,7 +19,7 @@
#endif
#endif
#define EXPORTING_BOXES
// #define EXPORTING_BOXES
#ifdef EXPORTING_BOXES
#include "Algo/Render/GL2/mapRender.h"
......
......@@ -98,9 +98,9 @@ public:
void setupCityScenario(int nbLines, int nbRank) ;
void setupScenario(unsigned int nbMaxAgent, bool pedWay=false) ;
void setupPlanetScenario(unsigned int nbAgents, unsigned int nbObstacles);
void setupPlanetScenario(unsigned int nbAgents, unsigned int nbObstacles, unsigned int nbx = 2,unsigned int nby= 2, float areaMin = 100.0f);
void addMovingObstacles(unsigned int nb, unsigned int type, float areaMin = 1400);
void addMovingObstacles(unsigned int nb, unsigned int type, float areaMin = 1400, int randLimace=12);
void addMovingObstacle(Dart d, unsigned int obstType=0);
void addAgent(const VEC3& start,const VEC3& goals);
......
# Blender MTL File: 'None'
# Material Count: 1
newmtl _untitled.001
Ns 0
Ka 0.000000 0.000000 0.000000
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2
map_Kd .
This diff is collapsed.
# Blender MTL File: 'None'
# Material Count: 1
newmtl _untitled
Ns 0
Ka 0.000000 0.000000 0.000000
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2
map_Kd .
This diff is collapsed.
# Blender MTL File: 'taches.blend'
# Material Count: 1
newmtl _untitled.001
Ns 0
Ka 0.000000 0.000000 0.000000
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2
map_Kd .
This diff is collapsed.
# Blender MTL File: 'taches.blend'
# Material Count: 1
newmtl _untitled
Ns 0
Ka 0.000000 0.000000 0.000000
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2
map_Kd .
This diff is collapsed.
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