Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 04:44:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

#996 Handle CompSolid/Compound in Slicer output

Browse Source
This commit is contained in:
Thomas Krijnen
2020-09-20 11:12:57 +02:00
parent 757e3b5272
commit 32ebd08158
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+18 -10
View File
@@ -2849,6 +2849,13 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre
namespace { namespace {
void subshapes(const TopoDS_Shape& in, std::list<TopoDS_Shape>& out) {
TopoDS_Iterator sit(in);
for (; sit.More(); sit.Next()) {
out.push_back(sit.Value());
}
}
#if OCC_VERSION_HEX >= 0x70200 #if OCC_VERSION_HEX >= 0x70200
bool split(IfcGeom::Kernel&, const TopoDS_Shape& input, const TopTools_ListOfShape& operands, double eps, std::vector<TopoDS_Shape>& slices) { bool split(IfcGeom::Kernel&, const TopoDS_Shape& input, const TopTools_ListOfShape& operands, double eps, std::vector<TopoDS_Shape>& slices) {
if (operands.Extent() < 2) { if (operands.Extent() < 2) {
@@ -2880,18 +2887,19 @@ namespace {
} }
} }
// Count subshapes auto result_shape = split.Shape();
size_t n = 0; std::list<TopoDS_Shape> subs;
TopoDS_Iterator sit(split.Shape()); subshapes(result_shape, subs);
for (; sit.More(); sit.Next()) { if (subs.size() == 1 && operands.Size() - 2 > subs.size() && (subs.front().ShapeType() == TopAbs_COMPSOLID || subs.front().ShapeType() == TopAbs_COMPOUND)) {
++n; auto s = subs.front();
subs.clear();
subshapes(s, subs);
} }
// Initialize storage // Initialize storage
slices.resize(n); slices.resize(subs.size());
sit.Initialize(split.Shape()); for (auto& s : subs) {
for (; sit.More(); sit.Next()) {
// Iterate over the faces of solid to find correspondence to original // Iterate over the faces of solid to find correspondence to original
// splitting surfaces. For the outmost slices, there will be a single // splitting surfaces. For the outmost slices, there will be a single
@@ -2900,7 +2908,7 @@ namespace {
// slices, two surface indices should be find that should be next to // slices, two surface indices should be find that should be next to
// each other in the array of input surfaces. // each other in the array of input surfaces.
TopExp_Explorer exp(sit.Value(), TopAbs_FACE); TopExp_Explorer exp(s, TopAbs_FACE);
int min = std::numeric_limits<int>::max(); int min = std::numeric_limits<int>::max();
int max = std::numeric_limits<int>::min(); int max = std::numeric_limits<int>::min();
for (; exp.More(); exp.Next()) { for (; exp.More(); exp.Next()) {
@@ -2928,7 +2936,7 @@ namespace {
if (idx < (int) slices.size()) { if (idx < (int) slices.size()) {
if (slices[idx].IsNull()) { if (slices[idx].IsNull()) {
slices[idx] = sit.Value(); slices[idx] = s;
continue; continue;
} }
} }