Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 01:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep a set of visited edges in sort

Browse Source
This commit is contained in:
Thomas Krijnen
2021-03-23 10:43:12 +01:00
parent eb09cc8af8
commit b0358a5a7b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomShapes.cpp
+11 -1
View File
@@ -1338,6 +1338,15 @@ namespace {
void sort_edges(const TopoDS_Wire& wire, std::vector<TopoDS_Edge>& sorted_edges) { void sort_edges(const TopoDS_Wire& wire, std::vector<TopoDS_Edge>& sorted_edges) {
TopTools_IndexedDataMapOfShapeListOfShape map; TopTools_IndexedDataMapOfShapeListOfShape map;
TopExp::MapShapesAndAncestors(wire, TopAbs_VERTEX, TopAbs_EDGE, map); TopExp::MapShapesAndAncestors(wire, TopAbs_VERTEX, TopAbs_EDGE, map);
for (int i = 1; i <= map.Extent(); ++i) {
if (map.FindFromIndex(i).Extent() > 2) {
Logger::Warning("Self-intersecting Directrix");
}
}
std::set<TopoDS_TShape*> seen;
auto num_edges = IfcGeom::Kernel::count(wire, TopAbs_EDGE); auto num_edges = IfcGeom::Kernel::count(wire, TopAbs_EDGE);
TopoDS_Vertex v0, v1; TopoDS_Vertex v0, v1;
@@ -1362,10 +1371,11 @@ namespace {
for (; it.More(); it.Next()) { for (; it.More(); it.Next()) {
const TopoDS_Edge& e = TopoDS::Edge(it.Value()); const TopoDS_Edge& e = TopoDS::Edge(it.Value());
TopExp::Vertices(e, ve0, ve1, true); TopExp::Vertices(e, ve0, ve1, true);
if (ve0.IsSame(v0)) { if (ve0.IsSame(v0) && seen.find(e.TShape().get()) == seen.end()) {
sorted_edges.push_back(e); sorted_edges.push_back(e);
v0 = ve1; v0 = ve1;
added = true; added = true;
seen.insert(e.TShape().get());
break; break;
} }
} }