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 7c1c5c11 authored by Sylvain Thery's avatar Sylvain Thery Committed by Pierre Kraemer
Browse files

modif import (sewOrientedFaces)

simplif collapseEdge
parent a79af175
...@@ -108,7 +108,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts) ...@@ -108,7 +108,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts)
{ {
if (good_dart == map.phi2(good_dart)) if (good_dart == map.phi2(good_dart))
{ {
map.sewFaces(d, good_dart); map.sewOrientedFaces(d, good_dart);
m.unmarkOrbit(EDGE, d); m.unmarkOrbit(EDGE, d);
} }
} }
......
...@@ -227,24 +227,11 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces) ...@@ -227,24 +227,11 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
Dart e = phi2(d); Dart e = phi2(d);
phi2unsew(d); // Unlink the opposite edges phi2unsew(d); // Unlink the opposite edges
if (isBoundaryMarked(e))
{
Dart f = phi1(e) ;
Map1::collapseEdge(e) ; // Collapse edge e
if (f != e)
collapseDegeneratedFace(f) ;// and collapse its face if degenerated
}
else
{
Dart f = phi1(e) ; Dart f = phi1(e) ;
Dart g = phi_1(e) ; Dart h = alpha1(e);
if(f != d && !isFaceTriangle(e)) if (h != e)
resV = f ; resV=h;
else if(phi2(g) != g)
resV = phi2(g) ;
else if(f != d && phi2(f) != f)
resV = phi1(phi2(f)) ;
if (f != e && delDegenerateFaces) if (f != e && delDegenerateFaces)
{ {
...@@ -253,28 +240,13 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces) ...@@ -253,28 +240,13 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
} }
else else
Map1::collapseEdge(e) ; // Just collapse edge e Map1::collapseEdge(e) ; // Just collapse edge e
}
if (isBoundaryMarked(d))
{
Dart f = phi1(d) ;
Map1::collapseEdge(d) ; // Collapse edge d
if (f != d)
collapseDegeneratedFace(f) ;// and collapse its face if degenerated
}
else
{
Dart f = phi1(d) ;
Dart g = phi_1(d) ;
f = phi1(d) ;
if(resV == NIL) if(resV == NIL)
{ {
if(f != e && !isFaceTriangle(d)) h = alpha1(d);
resV = f ; if (h != d)
else if(phi2(g) != g) resV=h;
resV = phi2(g) ;
else if(f != e && phi2(f) != f)
resV = phi1(phi2(f)) ;
} }
if (f != d && delDegenerateFaces) if (f != d && delDegenerateFaces)
...@@ -284,7 +256,6 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces) ...@@ -284,7 +256,6 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
} }
else else
Map1::collapseEdge(d) ; // Just collapse edge d Map1::collapseEdge(d) ; // Just collapse edge d
}
return resV ; return resV ;
} }
......
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