Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 13:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

speed-up min_vertex_edge_distance(). Fixes #518

Browse Source
This commit is contained in:
Thomas Krijnen
2018-12-19 16:39:54 +01:00
parent 94f49af00b
commit f5af6ee6c0
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+29 -15
View File
@@ -196,22 +196,33 @@ namespace {
return min_edge_len; return min_edge_len;
} }
double min_vertex_edge_distance(const TopoDS_Shape& a, double t) { double min_vertex_edge_distance(const TopoDS_Shape& a, double min_search, double max_search) {
TopExp_Explorer exp(a, TopAbs_VERTEX);
double M = std::numeric_limits<double>::infinity(); double M = std::numeric_limits<double>::infinity();
for (; exp.More(); exp.Next()) { TopTools_IndexedMapOfShape vertices, edges;
if (exp.Current().Orientation() != TopAbs_FORWARD) {
continue;
}
const TopoDS_Vertex& v = TopoDS::Vertex(exp.Current()); TopExp::MapShapes(a, TopAbs_VERTEX, vertices);
TopExp::MapShapes(a, TopAbs_EDGE, edges);
IfcGeom::impl::tree<int> tree;
// Add edges to tree
for (int i = 1; i <= edges.Extent(); ++i) {
tree.add(i, edges(i));
}
for (int j = 1; j <= vertices.Extent(); ++j) {
const TopoDS_Vertex& v = TopoDS::Vertex(vertices(j));
gp_Pnt p = BRep_Tool::Pnt(v); gp_Pnt p = BRep_Tool::Pnt(v);
TopExp_Explorer exp2(a, TopAbs_EDGE); Bnd_Box b;
for (; exp2.More(); exp2.Next()) { b.Add(p);
const TopoDS_Edge& e = TopoDS::Edge(exp2.Current()); b.Enlarge(max_search);
std::vector<int> edge_idxs = tree.select_box(b, false);
std::vector<int>::const_iterator it = edge_idxs.begin();
for (; it != edge_idxs.end(); ++it) {
const TopoDS_Edge& e = TopoDS::Edge(edges(*it));
TopoDS_Vertex v1, v2; TopoDS_Vertex v1, v2;
TopExp::Vertices(e, v1, v2); TopExp::Vertices(e, v1, v2);
@@ -227,7 +238,7 @@ namespace {
for (int i = 1; i <= ext.NbExt(); ++i) { for (int i = 1; i <= ext.NbExt(); ++i) {
const double m = sqrt(ext.SquareDistance(i)); const double m = sqrt(ext.SquareDistance(i));
if (m < M && m > t) { if (m < M && m > min_search) {
M = m; M = m;
} }
} }
@@ -3607,14 +3618,17 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_Li
fuzziness = getValue(GV_PRECISION); fuzziness = getValue(GV_PRECISION);
} }
double min_len = (std::min)(min_edge_length(a), min_vertex_edge_distance(a, getValue(GV_PRECISION))); // Find a sensible value for the fuzziness, based on precision
// and limited by edge lengths and vertex-edge distances.
const double len_a = min_edge_length(a);
double min_len = (std::min)(len_a, min_vertex_edge_distance(a, getValue(GV_PRECISION), len_a));
TopTools_ListIteratorOfListOfShape it(b); TopTools_ListIteratorOfListOfShape it(b);
for (; it.More(); it.Next()) { for (; it.More(); it.Next()) {
double d = min_edge_length(it.Value()); double d = min_edge_length(it.Value());
if (d < min_len) { if (d < min_len) {
min_len = d; min_len = d;
} }
d = min_vertex_edge_distance(it.Value(), getValue(GV_PRECISION)); d = min_vertex_edge_distance(it.Value(), getValue(GV_PRECISION), d);
if (d < min_len) { if (d < min_len) {
min_len = d; min_len = d;
} }
@@ -3656,7 +3670,7 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopTools_Li
// when there are edges or vertex-edge distances close to the used fuzziness, the // when there are edges or vertex-edge distances close to the used fuzziness, the
// output is not trusted and the operation is attempted with a higher fuzziness. // output is not trusted and the operation is attempted with a higher fuzziness.
double min_len_check = (std::min)(min_edge_length(r), min_vertex_edge_distance(r, getValue(GV_PRECISION))); double min_len_check = (std::min)(min_edge_length(r), min_vertex_edge_distance(r, getValue(GV_PRECISION), fuzziness * 10.));
success = min_len_check > fuzziness * 10.; success = min_len_check > fuzziness * 10.;
if (success) { if (success) {