Commit 56ab8a8e authored by pitiot's avatar pitiot
Browse files

ok

parents d3f5c92d 05dc0550
......@@ -8,10 +8,10 @@
#include "spatialHashing.h"
//#define SECURED
// #define SECURED
//#define EXPORTING_AGENT
//#define EXPORTING_OBJ
#define EXPORTING_OBJ
#define ARASH
......
......@@ -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) ;
......@@ -132,6 +134,7 @@ public:
void popObstNeighborInCells(Obstacle* o, Dart d);
void find_next(Obstacle* o,Dart * d, CellMarkerMemo<FACE>& cms);
bool movingObstacleFree(Dart d);
bool movingObstacleNeighborFree(Dart d);
#ifdef EXPORTING3
std::vector<PFP::MAP *> m_map_Export;
std::vector<Algo::Surface::Import::OBJModel<PFP2> *> m_obj_Export;
......
......@@ -19,7 +19,7 @@
#endif
#endif
#define EXPORTING_BOXES
// #define EXPORTING_BOXES
#ifdef EXPORTING_BOXES
#include "Algo/Render/GL2/mapRender.h"
......@@ -74,10 +74,15 @@ public:
unsigned int nbVertices;
#ifdef TWO_AND_HALF_DIM
CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP>* * parts_;
#else
CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>* * parts_;
#ifdef SECURED
CGoGN::Algo::Surface::MovingObjects::ParticleCell2DSecured<PFP> * * parts_ ;
#else
#ifdef TWO_AND_HALF_DIM
CGoGN::Algo::Surface::MovingObjects::ParticleCell2DAndHalf<PFP> * * parts_ ;
#else
CGoGN::Algo::Surface::MovingObjects::ParticleCell2D<PFP>* * parts_ ;
#endif
#endif
PFP::MAP map;
......
This diff is collapsed.
# 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.
# 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 torusBuilding.png
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