Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit b4dc5ce8 authored by Thomas's avatar Thomas
Browse files

Merge branch 'master' of cgogn:~kraemer/CGoGN

parents 789c24ee 1b3808a2
......@@ -164,7 +164,7 @@ void coarsenFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
assert(map.faceIsSubdividedOnce(d) || !"Trying to coarsen a non-subdivided face or a more than once subdivided face") ;
unsigned int cur = map.getCurrentLevel() ;
map.setCurrentLevel(cur + 1) ;
map.setCurrentLevel(map.getMaxLevel()) ;
map.deleteVertex(map.phi1(map.phi1(d))) ;
map.setCurrentLevel(cur) ;
Dart fit = d ;
......
......@@ -91,7 +91,6 @@ class ParticleCell2D : public ParticleBase
};
#include "particle_cell_2D.hpp"
//namespace
}
......
......@@ -89,12 +89,12 @@ void ParticleCell2D<PFP>::vertexState(const VEC3& current)
if(dd_vert==d) {
//orbit with 2 edges : point on one edge
if(m.alpha1(m.alpha1(d))==d) {
if(!Algo::Geometry::isPointOnHalfEdge<PFP>(m,d,m_positions,current)) {
d = m.alpha1(d);
}
if(!Algo::Geometry::isPointOnHalfEdge<PFP>(m,d,m_positions,current)) {
d = m.alpha1(d);
}
}
else {
state = VERTEX_ORBIT;
state = VERTEX_ORBIT;
return;
}
}
......@@ -103,7 +103,6 @@ void ParticleCell2D<PFP>::vertexState(const VEC3& current)
Dart dd_vert = m.alpha1(d);
while(getOrientationEdge(current,d)==Geom::RIGHT && dd_vert!=d) {
d = m.alpha_1(d);
if(m_positions[d][0]==m_positions[m.phi1(d)][0] && m_positions[d][1]==m_positions[m.phi1(d)][1]) {
d=m.alpha_1(d);
}
......
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