Commit 9a4e744f authored by Thomas Pitiot 's avatar Thomas Pitiot

changement mineurs particules a tester vertexstate et modif subdivide

parent 36158b13
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "Algo/Modelisation/extrusion.h" #include "Algo/Modelisation/extrusion.h"
#include "Topology/generic/dartmarker.h" #include "Topology/generic/dartmarker.h"
#define DEBUG_affichage //#define DEBUG_affichage
namespace CGoGN namespace CGoGN
{ {
...@@ -214,13 +214,15 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type ...@@ -214,13 +214,15 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
if(OneLevelDifference) if(OneLevelDifference)
{ {
Traversor3WF<typename PFP::MAP> traF(map, old); Traversor3WF<typename PFP::MAP> traF(map, old);
for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next()) for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
{ {
Dart nv = map.phi3(dit); Dart nv = map.phi3(dit);
if(!map.isBoundaryMarked(3, nv)) if(!map.isBoundaryMarked(3, nv))
if(map.volumeLevel(nv) == vLevel - 1) if(map.volumeLevel(nv) == vLevel - 1)
subdivideVolumeClassic<PFP>(map,nv,position,OneLevelDifference);
subdivideVolumeClassic<PFP>(map,nv,position,OneLevelDifference);
} }
} }
...@@ -354,7 +356,7 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type ...@@ -354,7 +356,7 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
// v.push_back(map.phi1(e)); // v.push_back(map.phi1(e));
// v.push_back(map.phi1(map.phi1(e))); // v.push_back(map.phi1(map.phi1(e)));
std::cout << "v size = " << v.size() << std::endl; // std::cout << "v size = " << v.size() << std::endl;
e = map.phi2(map.phi_1(e)); e = map.phi2(map.phi_1(e));
} }
while(e != *edge); while(e != *edge);
......
...@@ -366,7 +366,7 @@ void ParticleCell3D<PFP>::vertexState(const VEC3& current) ...@@ -366,7 +366,7 @@ void ParticleCell3D<PFP>::vertexState(const VEC3& current)
#ifdef DEBUG #ifdef DEBUG
std::cout << "points equal vrai :" << current << " || "<<this->m_position<<" || "<<d<<" || "<<position[d]<< std::endl; std::cout << "points equal vrai :" << current << " || "<<this->m_position<<" || "<<d<<" || "<<position[d]<< std::endl;
#endif #endif
// this->m_position = som; this->m_position = som;
this->m_positionFace = som; this->m_positionFace = som;
state = VERTEX; state = VERTEX;
return; return;
...@@ -535,11 +535,14 @@ void ParticleCell3D<PFP>::edgeState(const VEC3& current) ...@@ -535,11 +535,14 @@ void ParticleCell3D<PFP>::edgeState(const VEC3& current)
} }
else { // sur le sommet de l'arete else { // sur le sommet de l'arete
this->m_position = position[2]; this->m_position = position[2];
std::cout << "edgeState va dans sommet cas 1 position :"<< this->m_position << std::endl;
vertexState(current); vertexState(current);
} }
} }
else { // sur l'autre sommet de l'arete else { // sur l'autre sommet de l'arete
d=m.phi1(d); d=m.phi1(d);
std::cout << "edgeState va dans sommet cas 1 position :"<< this->m_position << std::endl;
vertexState(current); vertexState(current);
} }
} }
......
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