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

Set precision on fix after boolean op

Browse Source
This commit is contained in:
Thomas Krijnen
2018-06-08 14:12:01 +02:00
parent 3205013d20
commit 7f8df04b2a
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+31 -21
View File
@@ -3065,17 +3065,33 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopoDS_Shap
} }
#else #else
TopTools_ListOfShape copy_operand(const TopTools_ListOfShape& l) { namespace {
TopTools_ListOfShape r; TopTools_ListOfShape copy_operand(const TopTools_ListOfShape& l) {
TopTools_ListIteratorOfListOfShape it(l); TopTools_ListOfShape r;
for (; it.More(); it.Next()) { TopTools_ListIteratorOfListOfShape it(l);
r.Append(BRepBuilderAPI_Copy(it.Value())); for (; it.More(); it.Next()) {
r.Append(BRepBuilderAPI_Copy(it.Value()));
}
return r;
} }
return r;
}
TopoDS_Shape copy_operand(const TopoDS_Shape& s) { TopoDS_Shape copy_operand(const TopoDS_Shape& s) {
return BRepBuilderAPI_Copy(s); return BRepBuilderAPI_Copy(s);
}
double min_edge_length(const TopoDS_Shape& a) {
double min_edge_len = std::numeric_limits<double>::infinity();
TopExp_Explorer exp(a, TopAbs_EDGE);
for (; exp.More(); exp.Next()) {
GProp_GProps prop;
BRepGProp::LinearProperties(exp.Current(), prop);
double l = prop.Mass();
if (l < min_edge_len) {
min_edge_len = l;
}
}
return min_edge_len;
}
} }
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) {
@@ -3094,21 +3110,12 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_Li
fuzziness = getValue(GV_PRECISION); fuzziness = getValue(GV_PRECISION);
} }
double min_edge_len = std::numeric_limits<double>::infinity(); const double min_edge_len = min_edge_length(a);
// ... to be sure to get consecutive edges const double fuzz = (std::min)(min_edge_len / 3., fuzziness);
TopExp_Explorer exp(a, TopAbs_EDGE);
for (; exp.More(); exp.Next()) {
GProp_GProps prop;
BRepGProp::LinearProperties(exp.Current(), prop);
double l = prop.Mass();
if (l < min_edge_len) {
min_edge_len = l;
}
}
TopTools_ListOfShape s1s; TopTools_ListOfShape s1s;
s1s.Append(copy_operand(a)); s1s.Append(copy_operand(a));
builder->SetFuzzyValue((std::min)(min_edge_len / 3., fuzziness)); builder->SetFuzzyValue(fuzz);
builder->SetArguments(s1s); builder->SetArguments(s1s);
builder->SetTools(copy_operand(b)); builder->SetTools(copy_operand(b));
builder->Build(); builder->Build();
@@ -3117,6 +3124,9 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_Li
ShapeFix_Shape fix(r); ShapeFix_Shape fix(r);
try { try {
fix.SetMinTolerance(fuzz);
fix.SetMaxTolerance(fuzz);
fix.SetPrecision(fuzz);
fix.Perform(); fix.Perform();
r = fix.Shape(); r = fix.Shape();
} catch (...) { } catch (...) {