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

Handle infra sweeps of open loops #7338

Browse Source
This commit is contained in:
Thomas Krijnen
2025-11-13 12:43:41 +01:00
parent 6a7ecf7f58
commit a34e42a519
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/infra_sweep_helper.cpp
+17 -9
View File
@@ -136,11 +136,11 @@ taxonomy::loft::ptr ifcopenshell::geometry::make_loft(const Settings& settings_,
} }
auto interpolated_offset = lerp(offset_a, offset_b, relative_dist_along); auto interpolated_offset = lerp(offset_a, offset_b, relative_dist_along);
if (rotation_a && rotation_b) { if (rotation_a == rotation_b && rotation_a) {
// @todo we don't support an overridden rotation on only one of the placements // @todo we don't support an overridden rotation on only one of the placements
// in which case we would need to lerp with the rotation component below in m4b. // in which case we would need to lerp with the rotation component below in m4b.
interpolated_rotation = lerp(*rotation_a, *rotation_b, relative_dist_along); interpolated_rotation = lerp(*rotation_a, *rotation_b, relative_dist_along);
} else { } else if (rotation_a != rotation_b) {
Logger::Error("Direction vectors on cross section placements only supported when used consistently"); Logger::Error("Direction vectors on cross section placements only supported when used consistently");
} }
taxonomy::loop::ptr w1, w2; taxonomy::loop::ptr w1, w2;
@@ -165,10 +165,18 @@ taxonomy::loft::ptr ifcopenshell::geometry::make_loft(const Settings& settings_,
// auto p4 = (interpolated_rotation * p3).eval(); // auto p4 = (interpolated_rotation * p3).eval();
points.push_back(taxonomy::make<taxonomy::point3>(p3)); points.push_back(taxonomy::make<taxonomy::point3>(p3));
} }
if (!points.empty()) { if (!points.empty()) {
// close polygon by referencing first point if (!w1->closed.get_value_or(true) && !w2->closed.get_value_or(true)) {
// @todo add a closed=true|false to polygon_from_points()? // open polygon, add last point
points.push_back(points.front()); auto& p1 = boost::get<taxonomy::point3::ptr>(w1->children.back()->end);
auto& p2 = boost::get<taxonomy::point3::ptr>(w2->children.back()->end);
auto p3 = (lerp(p1->ccomponents(), p2->ccomponents(), relative_dist_along) + interpolated_offset).eval();
points.push_back(taxonomy::make<taxonomy::point3>(p3));
} else if (w1->closed.get_value_or(true) && w2->closed.get_value_or(true)) {
// close polygon by referencing first point
// @todo add a closed=true|false to polygon_from_points()?
points.push_back(points.front());
}
} }
auto interpolated_loop = polygon_from_points(points); auto interpolated_loop = polygon_from_points(points);
src/ifcgeom/mapping/IfcArbitraryOpenProfileDef.cpp
+7 -1
View File
@@ -24,5 +24,11 @@
using namespace ifcopenshell::geometry; using namespace ifcopenshell::geometry;
taxonomy::ptr mapping::map_impl(const IfcSchema::IfcArbitraryOpenProfileDef* inst) { taxonomy::ptr mapping::map_impl(const IfcSchema::IfcArbitraryOpenProfileDef* inst) {
return map(inst->Curve()); auto mapped = map(inst->Curve());
if (mapped->kind() == taxonomy::LOOP) {
auto r = taxonomy::loop::ptr((taxonomy::loop*)mapped->clone_());
r->closed = false;
return r;
}
return mapped;
} }