Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 06:58:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source
This commit is contained in:
Thomas Krijnen
2018-12-10 10:41:58 +01:00
parent 7ed47dee67 f849434f24
commit 0fcf1f14c8
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomShapes.cpp
+15 -7
View File
@@ -842,24 +842,32 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcCsgSolid* l, TopoDS_Shape& sha
bool IfcGeom::Kernel::convert(const IfcSchema::IfcCurveBoundedPlane* l, TopoDS_Shape& face) { bool IfcGeom::Kernel::convert(const IfcSchema::IfcCurveBoundedPlane* l, TopoDS_Shape& face) {
gp_Pln pln; gp_Pln pln;
IfcGeom::Kernel::convert(l->BasisSurface(), pln); if (!IfcGeom::Kernel::convert(l->BasisSurface(), pln)) {
return false;
}
gp_Trsf trsf; gp_Trsf trsf;
trsf.SetTransformation(pln.Position(), gp::XOY()); trsf.SetTransformation(pln.Position(), gp::XOY());
TopoDS_Wire outer; TopoDS_Wire outer;
convert_wire(l->OuterBoundary(), outer); if (!convert_wire(l->OuterBoundary(), outer)) {
return false;
}
BRepBuilderAPI_MakeFace mf (outer); BRepBuilderAPI_MakeFace mf(outer);
mf.Add(outer);
if (!mf.IsDone() || mf.Shape().IsNull()) {
Logger::Error("Invalid outer boundary:", l->OuterBoundary());
return false;
}
IfcSchema::IfcCurve::list::ptr boundaries = l->InnerBoundaries(); IfcSchema::IfcCurve::list::ptr boundaries = l->InnerBoundaries();
for (IfcSchema::IfcCurve::list::it it = boundaries->begin(); it != boundaries->end(); ++it) { for (IfcSchema::IfcCurve::list::it it = boundaries->begin(); it != boundaries->end(); ++it) {
TopoDS_Wire inner; TopoDS_Wire inner;
convert_wire(*it, inner); if (convert_wire(*it, inner)) {
mf.Add(inner);
mf.Add(inner); }
} }
ShapeFix_Shape sfs(mf.Face()); ShapeFix_Shape sfs(mf.Face());
src/ifcgeom_schema_agnostic/Kernel.cpp
+18 -8
View File
@@ -177,14 +177,24 @@ std::map<std::string, IfcUtil::IfcBaseEntity*> IfcGeom::Kernel::get_layers(IfcUt
} }
bool IfcGeom::Kernel::is_manifold(const TopoDS_Shape& a) { bool IfcGeom::Kernel::is_manifold(const TopoDS_Shape& a) {
TopTools_IndexedDataMapOfShapeListOfShape map; if (a.ShapeType() == TopAbs_COMPOUND) {
TopExp::MapShapesAndAncestors(a, TopAbs_EDGE, TopAbs_FACE, map); TopoDS_Iterator it(a);
for (; it.More(); it.Next()) {
for (int i = 1; i <= map.Extent(); ++i) { if (!is_manifold(it.Value())) {
if (map.FindFromIndex(i).Extent() != 2) { return false;
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;
}
} }