Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-10-02 04:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cgal loop handling

Browse Source
This commit is contained in:
Thomas Krijnen
2020-07-29 11:14:45 +02:00
parent 606dbf7226
commit 23a05c47d4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalKernel.cpp
+10 -5
View File
@@ -386,6 +386,7 @@ namespace {
void extend_wire(std::vector<taxonomy::point3>& a, const std::vector<taxonomy::point3>& b) { void extend_wire(std::vector<taxonomy::point3>& a, const std::vector<taxonomy::point3>& b) {
if (a.empty()) { if (a.empty()) {
a = b; a = b;
return;
} }
if (b.empty()) { if (b.empty()) {
return; return;
@@ -403,25 +404,29 @@ bool CgalKernel::convert(const taxonomy::loop* loop, cgal_wire_t& result) {
std::vector<taxonomy::point3> points; std::vector<taxonomy::point3> points;
for (auto& e : edges) { for (auto& e : edges) {
std::vector<taxonomy::point3> edge;
if (e->basis) { if (e->basis) {
std::vector<taxonomy::point3> edge;
convert_curve(e, edge); convert_curve(e, edge);
if (!e->orientation_2.get_value_or(true)) { if (!e->orientation_2.get_value_or(true)) {
std::reverse(edge.begin(), edge.end()); std::reverse(edge.begin(), edge.end());
} }
extend_wire(points, edge);
} else { } else {
extend_wire(points, { edge = {
boost::get<taxonomy::point3>(e->start), boost::get<taxonomy::point3>(e->start),
boost::get<taxonomy::point3>(e->end) boost::get<taxonomy::point3>(e->end)
}); };
} }
extend_wire(points, edge);
} }
if (points.size() >= 2) { if (points.size() >= 2) {
// the edges -> <p0, ... pn> conversion left us with a duplicate global begin,end point. // the edges -> <p0, ... pn> conversion left us with a duplicate global begin,end point.
double d = (*points.back().components - *points.front().components).norm(); double d = (*points.back().components - *points.front().components).norm();
points.erase(points.end() - 1); if (d < 1.e-5) {
points.erase(points.end() - 1);
} else {
Logger::Warning("Loop not closed", loop->instance);
}
} }
// Parse and store the points in a sequence // Parse and store the points in a sequence