mise a jour collapseEdge pour prendre en compte le cas des aretes pendantes

ce36e5a4 · Pierre Kraemer · 10c7d948 · ce36e5a4 · ce36e5a4
Commit ce36e5a4 authored Feb 11, 2011 by Pierre Kraemer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/Topology/gmap/gmap2.cpp src/Topology/gmap/gmap2.cpp +2 -2

src/Topology/map/map2.cpp src/Topology/map/map2.cpp +2 -2

No files found.
--- a/src/Topology/gmap/gmap2.cpp
+++ b/src/Topology/gmap/gmap2.cpp
@@ -97,11 +97,11 @@ Dart GMap2::collapseEdge(Dart d, bool delDegenerateFaces = true)
 		Dart f = phi1(e) ;
 		Dart g = phi_1(e) ;

-		if(!isFaceTriangle(e))
+		if(f != d && !isFaceTriangle(e))
 			resV = f ;
 		else if(phi2(g) != g)
 			resV = phi2(g) ;
-		else if(phi2(f) != f)
+		else if(f != d && phi2(f) != f)
 			resV = phi1(phi2(f)) ;

 		if (f != e && delDegenerateFaces)

--- a/src/Topology/map/map2.cpp
+++ b/src/Topology/map/map2.cpp
@@ -99,11 +99,11 @@ Dart Map2::collapseEdge(Dart d, bool delDegenerateFaces)
 		Dart f = phi1(e) ;
 		Dart g = phi_1(e) ;

-		if(!isFaceTriangle(e))
+		if(f != d && !isFaceTriangle(e))
 			resV = f ;
 		else if(phi2(g) != g)
 			resV = phi2(g) ;
-		else if(phi2(f) != f)
+		else if(f != d && phi2(f) != f)
 			resV = phi1(phi2(f)) ;

 		if (f != e && delDegenerateFaces)