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

Work around private copy constructor on older versions of occt

Browse Source
This commit is contained in:
Thomas Krijnen
2018-09-21 11:21:51 +02:00
parent bf4b5928dd
commit 7205f0165e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+5 -4
View File
@@ -157,7 +157,7 @@
#endif #endif
namespace { namespace {
TopTools_ListOfShape copy_operand(const TopTools_ListOfShape& l) { void copy_operand(const TopTools_ListOfShape& l, TopTools_ListOfShape& r) {
#if OCC_VERSION_HEX < 0x70000 #if OCC_VERSION_HEX < 0x70000
TopTools_ListOfShape r; TopTools_ListOfShape r;
TopTools_ListIteratorOfListOfShape it(l); TopTools_ListIteratorOfListOfShape it(l);
@@ -169,7 +169,7 @@ namespace {
// On OCCT 7.0 and higher BRepAlgoAPI_BuilderAlgo::SetNonDestructive(true) is // On OCCT 7.0 and higher BRepAlgoAPI_BuilderAlgo::SetNonDestructive(true) is
// called. Not entirely sure on the behaviour before 7.0, so overcautiously // called. Not entirely sure on the behaviour before 7.0, so overcautiously
// create copies. // create copies.
return l; r.Assign(l);
#endif #endif
} }
@@ -3381,7 +3381,7 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopoDS_Shap
bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_ListOfShape& b_, BOPAlgo_Operation op, TopoDS_Shape& result, double fuzziness) { bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_ListOfShape& b_, BOPAlgo_Operation op, TopoDS_Shape& result, double fuzziness) {
bool success = false; bool success = false;
BRepAlgoAPI_BooleanOperation* builder; BRepAlgoAPI_BooleanOperation* builder;
TopTools_ListOfShape b; TopTools_ListOfShape B, b;
if (op == BOPAlgo_CUT) { if (op == BOPAlgo_CUT) {
builder = new BRepAlgoAPI_Cut(); builder = new BRepAlgoAPI_Cut();
bounding_box_overlap(getValue(GV_PRECISION), a, b_, b); bounding_box_overlap(getValue(GV_PRECISION), a, b_, b);
@@ -3420,7 +3420,8 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_Li
#endif #endif
builder->SetFuzzyValue(fuzz); builder->SetFuzzyValue(fuzz);
builder->SetArguments(s1s); builder->SetArguments(s1s);
builder->SetTools(copy_operand(b)); copy_operand(b, B);
builder->SetTools(B);
builder->Build(); builder->Build();
if (builder->IsDone()) { if (builder->IsDone()) {
TopoDS_Shape r = *builder; TopoDS_Shape r = *builder;