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

Allow BOPAlgo_AlertAcquiredSelfIntersection when its our final fuzziness attempt

Browse Source
This commit is contained in:
Thomas Krijnen
2024-12-10 21:18:20 +01:00
parent 72eed36313
commit a728470b76
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/opencascade/boolean_utils.cpp
+16 -3
View File
@@ -1029,6 +1029,9 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To
Logger::Notice("Used fuzziness: " + std::to_string(fuzz)); Logger::Notice("Used fuzziness: " + std::to_string(fuzz));
const double new_fuzziness = fuzziness * 10.;
const bool allow_retry = new_fuzziness - 1e-15 <= settings.precision * 10000. && new_fuzziness < min_length_orig;
TopTools_ListOfShape s1s; TopTools_ListOfShape s1s;
s1s.Append(copy_operand(a)); s1s.Append(copy_operand(a));
@@ -1152,9 +1155,20 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To
builder->Build(); builder->Build();
} }
if (builder->IsDone()) { if (builder->IsDone()) {
if (builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertAcquiredSelfIntersection))) { if (allow_retry && builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertAcquiredSelfIntersection))) {
Logger::Notice("Builder reports self-intersection in output"); Logger::Notice("Builder reports self-intersection in output");
success = false; success = false;
/*
const auto& ws = builder->DSFiller()->GetReport()->GetAlerts(Message_Warning);
for (const auto& w : ws) {
if (w->DynamicType() == STANDARD_TYPE(BOPAlgo_AlertAcquiredSelfIntersection)) {
const auto& x = Handle(BOPAlgo_AlertAcquiredSelfIntersection)::DownCast(w)->GetShape();
BRepTools::Write(x, "debug_x.brep");
BRepTools::Write(*builder, "debug_r.brep");
}
}
*/
} else if(builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertBadPositioning)) && !TopoDS_Iterator(*builder).More()) { } else if(builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertBadPositioning)) && !TopoDS_Iterator(*builder).More()) {
Logger::Notice("Builder reports bad positioning and result is empty"); Logger::Notice("Builder reports bad positioning and result is empty");
success = false; success = false;
@@ -1414,8 +1428,7 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To
} }
delete builder; delete builder;
if (!success) { if (!success) {
const double new_fuzziness = fuzziness * 10.; if (allow_retry) {
if (new_fuzziness - 1e-15 <= settings.precision * 10000. && new_fuzziness < min_length_orig) {
return boolean_operation(settings, a, b, op, result, new_fuzziness); return boolean_operation(settings, a, b, op, result, new_fuzziness);
} else { } else {
Logger::Notice("No longer attempting boolean operation with higher fuzziness"); Logger::Notice("No longer attempting boolean operation with higher fuzziness");