From 8c0c216a1d7af37de3b15992243649be6f59413a Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 8 Dec 2018 10:37:54 +0100 Subject: [PATCH] Check boolean result manifoldness for shells individually. Fixes #516. --- src/ifcgeom/IfcGeomFunctions.cpp | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp index 7ae87d9954..53013da932 100644 --- a/src/ifcgeom/IfcGeomFunctions.cpp +++ b/src/ifcgeom/IfcGeomFunctions.cpp @@ -235,16 +235,26 @@ namespace { } bool is_manifold(const TopoDS_Shape& a) { - TopTools_IndexedDataMapOfShapeListOfShape map; - TopExp::MapShapesAndAncestors(a, TopAbs_EDGE, TopAbs_FACE, map); - - for (int i = 1; i <= map.Extent(); ++i) { - if (map.FindFromIndex(i).Extent() != 2) { - return false; + if (a.ShapeType() == TopAbs_COMPOUND) { + TopoDS_Iterator it(a); + for (; it.More(); it.Next()) { + if (!is_manifold(it.Value())) { + return false; + } } - } + return true; + } else { + TopTools_IndexedDataMapOfShapeListOfShape map; + TopExp::MapShapesAndAncestors(a, TopAbs_EDGE, TopAbs_FACE, map); - return true; + for (int i = 1; i <= map.Extent(); ++i) { + if (map.FindFromIndex(i).Extent() != 2) { + return false; + } + } + + return true; + } } bool is_manifold(const TopTools_ListOfShape& l) {