Commit b352639d authored by Thomas Pitiot 's avatar Thomas Pitiot
Browse files

up

parent 9a4e744f
...@@ -542,7 +542,7 @@ void subdivideFaceGeom(typename PFP::MAP& map, Dart d, VertexAttribute<typename ...@@ -542,7 +542,7 @@ void subdivideFaceGeom(typename PFP::MAP& map, Dart d, VertexAttribute<typename
unsigned int cur = map.getCurrentLevel() ; unsigned int cur = map.getCurrentLevel() ;
map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges
unsigned int vLevel = map.volumeLevel(old); // unsigned int vLevel = map.volumeLevel(old);
//one level of subdivision in the neighbordhood //one level of subdivision in the neighbordhood
// Traversor3VW<typename PFP::MAP> trav3EW(map, old); // Traversor3VW<typename PFP::MAP> trav3EW(map, old);
// for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next()) // for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next())
...@@ -1003,7 +1003,7 @@ void subdivideFaceWrong(typename PFP::MAP& map, Dart d, VertexAttribute<typename ...@@ -1003,7 +1003,7 @@ void subdivideFaceWrong(typename PFP::MAP& map, Dart d, VertexAttribute<typename
unsigned int cur = map.getCurrentLevel() ; unsigned int cur = map.getCurrentLevel() ;
map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges
unsigned int vLevel = map.volumeLevel(old); // unsigned int vLevel = map.volumeLevel(old);
//one level of subdivision in the neighbordhood //one level of subdivision in the neighbordhood
// Traversor3VW<typename PFP::MAP> trav3EW(map, old); // Traversor3VW<typename PFP::MAP> trav3EW(map, old);
// for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next()) // for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next())
...@@ -1667,7 +1667,7 @@ void subdivideFaceLoop(typename PFP::MAP& map, Dart d, VertexAttribute<typename ...@@ -1667,7 +1667,7 @@ void subdivideFaceLoop(typename PFP::MAP& map, Dart d, VertexAttribute<typename
unsigned int cur = map.getCurrentLevel() ; unsigned int cur = map.getCurrentLevel() ;
map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges map.setCurrentLevel(fLevel) ; // go to the level of the face to subdivide its edges
unsigned int vLevel = map.volumeLevel(old); // unsigned int vLevel = map.volumeLevel(old);
//one level of subdivision in the neighbordhood //one level of subdivision in the neighbordhood
// Traversor3VW<typename PFP::MAP> trav3EW(map, old); // Traversor3VW<typename PFP::MAP> trav3EW(map, old);
// for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next()) // for(Dart dit = trav3EW.begin() ; dit != trav3EW.end() ; dit = trav3EW.next())
......
...@@ -396,7 +396,7 @@ bool MeshTablesSurface<PFP>::import3DMap(typename PFP3::MAP& map, std::vector<st ...@@ -396,7 +396,7 @@ bool MeshTablesSurface<PFP>::import3DMap(typename PFP3::MAP& map, std::vector<st
attrNames.push_back(positions.name()) ; attrNames.push_back(positions.name()) ;
AttributeContainer& container = m_map.template getAttributeContainer<VERTEX>() ; // AttributeContainer& container = m_map.template getAttributeContainer<VERTEX>() ;
// lecture des nombres de sommets / faces du bord // lecture des nombres de sommets / faces du bord
m_nbVertices = 0; m_nbVertices = 0;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* * * *
*******************************************************************************/ *******************************************************************************/
// #define DEBUG #define DEBUG
namespace CGoGN namespace CGoGN
{ {
...@@ -336,7 +336,6 @@ void ParticleCell3DMemo<PFP>::edgeState(const VEC3& current, CellMarkerMemo<MAP, ...@@ -336,7 +336,6 @@ void ParticleCell3DMemo<PFP>::edgeState(const VEC3& current, CellMarkerMemo<MAP,
Geom::Plane3D<typename PFP::REAL> pl = Algo::Surface::Geometry::facePlane<PFP>(this->m,this->d,this->position); Geom::Plane3D<typename PFP::REAL> pl = Algo::Surface::Geometry::facePlane<PFP>(this->m,this->d,this->position);
VEC3 p3 = pl.normal()+this->m_position; VEC3 p3 = pl.normal()+this->m_position;
Geom::Plane3D<typename PFP::REAL> plOrtho(this->m_position,current,p3); Geom::Plane3D<typename PFP::REAL> plOrtho(this->m_position,current,p3);
VEC3 e(this->position[this->m.phi1(this->d)]-this->position[this->d]);
Geom::intersectionPlaneRay(plOrtho,this->m_position,current-this->m_position,this->m_position); Geom::intersectionPlaneRay(plOrtho,this->m_position,current-this->m_position,this->m_position);
......
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
//! //!
/*! /*!
*/ */
virtual bool check(); virtual bool check();
} ; } ;
} // namespace CGoGN } // namespace CGoGN
......
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