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

Loft all wires not only the outer one #7251

Browse Source
This commit is contained in:
Thomas Krijnen
2025-10-21 13:09:10 +02:00
parent 28f5d6e91c
commit 80093f3777
1 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/opencascade/loft.cpp
+43 -30
View File
@@ -118,7 +118,8 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
auto jt = it + 1; auto jt = it + 1;
std::array<taxonomy::item::ptr, 2> fa = { *it, *jt }; std::array<taxonomy::item::ptr, 2> fa = { *it, *jt };
std::array<TopoDS_Shape, 2> shps; std::array<TopoDS_Shape, 2> shps;
std::array<TopoDS_Wire, 2> ws; std::vector<std::array<TopoDS_Wire, 2>> ws;
ws.emplace_back();
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
if (fa[i]->kind() == taxonomy::FACE) { if (fa[i]->kind() == taxonomy::FACE) {
if (!convert(std::static_pointer_cast<taxonomy::face>(fa[i]), shps[i])) { if (!convert(std::static_pointer_cast<taxonomy::face>(fa[i]), shps[i])) {
@@ -135,11 +136,20 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
if (shps[i].ShapeType() != TopAbs_FACE && shps[i].ShapeType() != TopAbs_WIRE) { if (shps[i].ShapeType() != TopAbs_FACE && shps[i].ShapeType() != TopAbs_WIRE) {
return false; return false;
} }
// @todo this is only outer wire
if (shps[i].ShapeType() == TopAbs_FACE) { if (shps[i].ShapeType() == TopAbs_FACE) {
ws[i] = BRepTools::OuterWire(TopoDS::Face(shps[i])); ws[0][i] = BRepTools::OuterWire(TopoDS::Face(shps[i]));
size_t j = 1;
for (TopExp_Explorer exp(shps[i], TopAbs_WIRE); exp.More(); exp.Next()) {
if (exp.Current() != ws[0][i]) {
while (ws.size() <= j) {
ws.emplace_back();
}
ws[j++][i] = TopoDS::Wire(exp.Current());
}
}
} else { } else {
ws[i] = TopoDS::Wire(shps[i]); ws[0][i] = TopoDS::Wire(shps[i]);
} }
} }
if (shps[0].ShapeType() == TopAbs_FACE) { if (shps[0].ShapeType() == TopAbs_FACE) {
@@ -154,35 +164,38 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
BB.Add(comp, shps[1]); BB.Add(comp, shps[1]);
} }
} }
BRepTools_WireExplorer a(ws[0]);
BRepTools_WireExplorer b(ws[1]);
for (; a.More() && b.More(); a.Next(), b.Next()) {
auto& e1 = a.Current();
// auto e3 = TopoDS::Edge(b.Current().Reversed());
auto& e3 = b.Current();
// Documentation says unconnected edges are automatically connected, but this is not the case for (auto& wp : ws) {
TopoDS_Vertex e1a, e1b, e3a, e3b; BRepTools_WireExplorer a(wp[0]);
TopExp::Vertices(e1, e1a, e1b, true); BRepTools_WireExplorer b(wp[1]);
TopExp::Vertices(e3, e3a, e3b, true); for (; a.More() && b.More(); a.Next(), b.Next()) {
auto e2 = BRepBuilderAPI_MakeEdge(e1b, e3a).Edge(); auto& e1 = a.Current();
auto e4 = BRepBuilderAPI_MakeEdge(e3b, e1a).Edge(); // auto e3 = TopoDS::Edge(b.Current().Reversed());
auto& e3 = b.Current();
/* // Documentation says unconnected edges are automatically connected, but this is not the case
BRepFill_Filling fill; TopoDS_Vertex e1a, e1b, e3a, e3b;
fill.Add(e1, GeomAbs_C0); TopExp::Vertices(e1, e1a, e1b, true);
fill.Add(e2, GeomAbs_C0); TopExp::Vertices(e3, e3a, e3b, true);
fill.Add(e3, GeomAbs_C0); auto e2 = BRepBuilderAPI_MakeEdge(e1b, e3a).Edge();
fill.Add(e4, GeomAbs_C0); auto e4 = BRepBuilderAPI_MakeEdge(e3b, e1a).Edge();
fill.Build();
// faces.Append(fill.Face());
BB.Add(comp, fill.Face());
*/
auto f = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e1a, e1b, e3b, true).Wire()).Face(); /*
BB.Add(comp, f); BRepFill_Filling fill;
auto g = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e3b, e3a, e1a, true).Wire()).Face(); fill.Add(e1, GeomAbs_C0);
BB.Add(comp, g); fill.Add(e2, GeomAbs_C0);
fill.Add(e3, GeomAbs_C0);
fill.Add(e4, GeomAbs_C0);
fill.Build();
// faces.Append(fill.Face());
BB.Add(comp, fill.Face());
*/
auto f = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e1a, e1b, e3b, true).Wire()).Face();
BB.Add(comp, f);
auto g = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e3b, e3a, e1a, true).Wire()).Face();
BB.Add(comp, g);
}
} }
} }