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

Merge branch 'v0.8.0' into ifcmax/initial-refresh

Browse Source
This commit is contained in:
Josef Wienerroither
2026-03-09 09:23:03 +01:00
parent 5aca9ca67e 610d639c21
commit c7cde331e9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/infra_sweep_helper.cpp
+3 -3
View File
@@ -160,12 +160,12 @@ 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 && rotation_a) { if (rotation_a.has_value() && rotation_b.has_value() ) {
// @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 if (rotation_a != rotation_b) { } 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;
src/ifcgeom/taxonomy.h
+4 -2
View File
@@ -1068,8 +1068,10 @@ typedef item const* ptr;
virtual kinds kind() const { return LOFT; } virtual kinds kind() const { return LOFT; }
virtual void print_impl(std::ostream& o, int indent) const { virtual void print_impl(std::ostream& o, int indent) const {
o << std::string(indent, ' ') << "axis" << std::endl; if (axis) {
axis->print(o, indent + 4); o << std::string(indent, ' ') << "axis" << std::endl;
axis->print(o, indent + 4);
}
} }
virtual size_t calc_hash() const { virtual size_t calc_hash() const {