Commit a6be0f0f authored by Thomas Pitiot 's avatar Thomas Pitiot

rdy to test surfaces

parent 98430ec3
......@@ -25,8 +25,6 @@
#include "Algo/Geometry/volume.h"
#include "Algo/Geometry/area.h"
//#include "Algo/ImplicitHierarchicalMesh/subdivision3.hxx"
/////////////////particules
#include "Algo/MovingObjects/particle_cell_3D_memo.h"
......@@ -56,6 +54,7 @@ public:
VEC3 mapMaxY;
VEC3 mapMinZ;
VEC3 mapMaxZ;
float maxCellSize;
bool subdivideVolume(Dart d );
Dart getBelongingCell(const PFP::VEC3& pos);
......
......@@ -12,6 +12,8 @@
#include "Algo/ImplicitHierarchicalMesh/ihm3.h"
#include "Algo/ImplicitHierarchicalMesh/subdivision3.h"
#endif
#include "Topology/ihmap/ihm2.h"
#include "Topology/generic/parameters.h"
struct PFP : public PFP_STANDARD
{
......@@ -20,16 +22,26 @@ struct PFP : public PFP_STANDARD
#ifndef IHMap
typedef EmbeddedMap3 MAP;
#else
typedef Algo::Volume::IHM::ImplicitHierarchicalMap3 MAP;
typedef CGoGN::Algo::Volume::IHM::ImplicitHierarchicalMap3 MAP;
#endif
// definition des listes d'arêtes
typedef std::vector<Segment*> ARETE ;
typedef NoTypeNameAttribute<ARETE> ARETES ;
//
// typedef NoMathIONameAttribute<std::pair<bool, bool> > BOOLATTRIB ;
} ;
struct PFPSurface : public PFP_STANDARD
{
// definition de la carte
typedef CGoGN::ImplicitHierarchicalMap2 MAP;
} ;
typedef PFPSurface::MAP SURFACE;
typedef PFP::MAP MAP;
typedef PFP::VEC3 VEC3 ;
typedef PFP::REAL REAL ;
......
......@@ -5,6 +5,7 @@
#include "needle.h"
#include "knife.h"
#include "tree.h"
#include "surface.h"
#include "segment.h"
using namespace CGoGN ;
......
......@@ -22,6 +22,7 @@ EnvMap::EnvMap()
void EnvMap::init(int argc, char **argv)
{
maxCellSize = 10.0f;
std::cout << "Init EnvMap" << std::endl ;
if (argc>2)
{
......@@ -667,9 +668,9 @@ bool EnvMap::subdivideVolume(Dart dglobal)
#ifdef DEBUG_affichage
CGoGNout<<"fin refine principal"<<CGoGNendl;
#endif
#endif
return res;
......
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