IfcOpenShell · aothms · Mar 15, 2024 · Mar 15, 2024
diff --git a/src/ifcgeom/kernels/opencascade/loft.cpp b/src/ifcgeom/kernels/opencascade/loft.cpp
@@ -24,6 +24,8 @@
 #include <BRepFill_Filling.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
 
 using namespace ifcopenshell::geometry;
 using namespace ifcopenshell::geometry::kernels;
@@ -56,6 +58,7 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
 			if (shps[i].ShapeType() != TopAbs_FACE) {
 				return false;
 			}
+			// @todo this is only outer wire
 			ws[i] = BRepTools::OuterWire(TopoDS::Face(shps[i]));
 		}
 		if (it == loft->children.begin()) {
@@ -69,24 +72,32 @@ bool OpenCascadeKernel::convert(const taxonomy::loft::ptr loft, TopoDS_Shape& re
 		BRepTools_WireExplorer a(ws[0]);
 		BRepTools_WireExplorer b(ws[1]);
 		for (; a.More() && b.More(); a.Next(), b.Next()) {
-			BRepFill_Filling fill;
 			auto& e1 = a.Current();
-			auto e3 = TopoDS::Edge(b.Current().Reversed());
-
+			// auto e3 = TopoDS::Edge(b.Current().Reversed());
+			auto& e3 = b.Current();
+
 			// Documentation says unconnected edges are automatically connected, but this is not the case
 			TopoDS_Vertex e1a, e1b, e3a, e3b;
 			TopExp::Vertices(e1, e1a, e1b, true);
 			TopExp::Vertices(e3, e3a, e3b, true);
 			auto e2 = BRepBuilderAPI_MakeEdge(e1b, e3a).Edge();
 			auto e4 = BRepBuilderAPI_MakeEdge(e3b, e1a).Edge();
 
+			/*
+			BRepFill_Filling fill;
 			fill.Add(e1, GeomAbs_C0);
 			fill.Add(e2, GeomAbs_C0);
 			fill.Add(e3, GeomAbs_C0);
 			fill.Add(e4, GeomAbs_C0);
 			fill.Build();
 			// faces.Append(fill.Face());
 			BB.Add(comp, fill.Face());
+			*/
+
+			auto f = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e1a, e1b, e3b, true).Wire()).Face();
+			BB.Add(comp, f);
+			auto g = BRepBuilderAPI_MakeFace(BRepBuilderAPI_MakePolygon(e3b, e3a, e1a, true).Wire()).Face();
+			BB.Add(comp, g);
 		}
 	}
 

diff --git a/src/ifcgeom/mapping/IfcSectionedSolidHorizontal.cpp b/src/ifcgeom/mapping/IfcSectionedSolidHorizontal.cpp
@@ -0,0 +1,197 @@
+/********************************************************************************
+ *                                                                              *
+ * This file is part of IfcOpenShell.                                           *
+ *                                                                              *
+ * IfcOpenShell is free software: you can redistribute it and/or modify         *
+ * it under the terms of the Lesser GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3.0 of the License, or          *
+ * (at your option) any later version.                                          *
+ *                                                                              *
+ * IfcOpenShell is distributed in the hope that it will be useful,              *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
+ * Lesser GNU General Public License for more details.                          *
+ *                                                                              *
+ * You should have received a copy of the Lesser GNU General Public License     *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
+ *                                                                              *
+ ********************************************************************************/
+
+#include "mapping.h"
+#define mapping POSTFIX_SCHEMA(mapping)
+using namespace ifcopenshell::geometry;
+
+#include "../../ifcgeom/profile_helper.h"
+
+#include <boost/range/combine.hpp>
+
+#ifdef SCHEMA_HAS_IfcSectionedSolidHorizontal
+
+namespace {
+	// std::lerp when upgrading to C++ 20
+	template <typename T>
+	T lerp(const T& a, const T& b, double t) {
+		return a + t * (b - a);
+	}
+}
+
+taxonomy::ptr mapping::map_impl(const IfcSchema::IfcSectionedSolidHorizontal* inst) {
+	auto dir = map(inst->Directrix());
+	auto css = inst->CrossSections();
+	auto csps = inst->CrossSectionPositions();
+	std::vector<taxonomy::face::ptr> cross_sections;
+
+	// The PointByDistanceExpressesions are factored out into (a) a cartesian offset relative to the
+	// reference frame along a certain curve location (b) the longitude.
+
+	// The longitudes determine the range of the sweep and the offsets are interpolated in between
+	// sweep segments. 
+	std::vector<Eigen::Vector3d> profile_offsets;
+	std::vector<double> longitudes;
+
+	auto pwf = taxonomy::dcast<taxonomy::piecewise_function>(dir);
+	if (!pwf) {
+		// Only implement on alignment curves
+		return nullptr;
+	}
+
+	for (auto& cs : *css) {
+		cross_sections.push_back(std::move(taxonomy::cast<taxonomy::face>(map(cs))));
+	}
+	for (auto& csp : *csps) {
+		auto pbde = csp->Location()->as<IfcSchema::IfcPointByDistanceExpression>(true);
+
+		longitudes.push_back(*pbde->DistanceAlong()->as<IfcSchema::IfcLengthMeasure>(true) * length_unit_);
+
+		// Corresponds to the profile X, Y directions (hopefully).
+		Eigen::Vector3d po(
+			pbde->OffsetLateral().get_value_or(0.),
+			// @todo I don't understand whether vertical is an offset relative to the tangent plane or to the global XY plane
+			pbde->OffsetVertical().get_value_or(0.),
+			0.
+		);
+
+		profile_offsets.push_back(po);
+	}
+	if (cross_sections.size() != profile_offsets.size()) {
+		Logger::Error("Expected CrossSections and CrossSectionPositions to be equal length, but got " + std::to_string(cross_sections.size()) + " and " + std::to_string(profile_offsets.size())  + " respectively", inst);
+		return nullptr;
+	}
+	if (cross_sections.size() < 2) {
+		Logger::Error("Expected at least two cross sections, but got " + std::to_string(cross_sections.size()), inst);
+		return nullptr;
+	}
+
+	auto loft = taxonomy::make<taxonomy::loft>();
+	// @todo intialize as default
+	loft->axis = nullptr;
+
+	// @todo currently only the case is handled where directrix returns a piecewise_function
+	if (pwf) {
+		double start = std::max(0., longitudes.front());
+		double end = std::min(pwf->length(), longitudes.back());
+
+		auto curve_length = end - start;
+		auto param_type = settings_.get<ifcopenshell::geometry::settings::PiecewiseStepType>().get();
+		auto param = settings_.get<ifcopenshell::geometry::settings::PiecewiseStepParam>().get();
+		size_t num_steps = 0;
+		if (param_type == ifcopenshell::geometry::settings::PiecewiseStepMethod::MAXSTEPSIZE) {
+			// parameter is max step size
+			num_steps = (size_t) std::ceil(curve_length / param);
+		} else {
+			// parameter is minimum number of steps
+			num_steps = (size_t) std::ceil(param);
+		}
+		longitudes.push_back(std::numeric_limits<double>::infinity());
+		auto profile_index = longitudes.begin();
+		for (size_t i = 0; i <= num_steps; ++i) {
+			auto dist_along = start + curve_length / num_steps * i;
+			while (dist_along > *(profile_index+1)) {
+				profile_index++;
+				if (profile_index == longitudes.end()) {
+					// @todo handle this? 
+				}
+			}
+
+			auto relative_dist_along = (dist_along - *profile_index) / (*(profile_index+1) - *profile_index);
+			const auto& profile_a = cross_sections[std::distance(longitudes.begin(), profile_index)];
+			const auto& offset_a = profile_offsets[std::distance(longitudes.begin(), profile_index)];
+
+			taxonomy::face::ptr interpolated = nullptr;
+
+			// Only interpolate if:
+			//  - there is a profile ahead of us, and
+			//  - we're not exactly at the location of the current profile or whether there is an offset involved.
+			bool should_interpolate =
+				(profile_index + 1 < longitudes.end()) &&
+				(relative_dist_along >= 1.e-9 || offset_a.cwiseAbs().maxCoeff() > 0.);
+
+			if (should_interpolate) {
+				taxonomy::face::ptr profile_b;
+				Eigen::Vector3d offset_b;
+				if ((profile_index + 1 < longitudes.end())) {
+					profile_b = cross_sections[std::distance(longitudes.begin(), profile_index) + 1];
+					offset_b = profile_offsets[std::distance(longitudes.begin(), profile_index) + 1];
+				} else {
+					profile_b = profile_a;
+					offset_b = offset_a;
+				}
+
+				// Only interpolate if the profiles are different or either of the offsets is non-zero
+				bool should_interpolate2 =
+					(profile_a->instance != profile_b->instance) ||
+					(offset_a.cwiseAbs().maxCoeff() > 0. || offset_b.cwiseAbs().maxCoeff() > 0.);
+
+				if (should_interpolate2) {
+					if (profile_a->children.size() != profile_b->children.size()) {
+						return nullptr;
+					}
+					interpolated = taxonomy::make<taxonomy::face>();
+					auto interpolated_offset = lerp(offset_a, offset_b, relative_dist_along);
+					taxonomy::loop::ptr w1, w2;
+					taxonomy::edge::ptr e1, e2;
+					for (auto tmp_ : boost::combine(profile_a->children, profile_b->children)) {
+						boost::tie(w1, w2) = tmp_;
+						if (w1->children.size() != w2->children.size()) {
+							return nullptr;
+						}
+						std::vector<taxonomy::point3::ptr> points;
+						for (auto tmp__ : boost::combine(w1->children, w2->children)) {
+							boost::tie(e1, e2) = tmp__;
+							auto& p1 = boost::get<taxonomy::point3::ptr>(e1->start);
+							auto& p2 = boost::get<taxonomy::point3::ptr>(e2->start);
+
+							auto p3 = lerp(p1->ccomponents(), p2->ccomponents(), relative_dist_along) + interpolated_offset;
+							points.push_back(taxonomy::make<taxonomy::point3>(p3));
+						}
+						if (!points.empty()) {
+							// close polygon by referencing first point
+							// @todo add a closed=true|false to polygon_from_points()?
+							points.push_back(points.front());
+						}
+						interpolated->children.push_back(polygon_from_points(points));
+					}
+				}
+			}
+
+			auto m4 = pwf->evaluate(dist_along);
+
+			Eigen::Matrix4d m4b = Eigen::Matrix4d::Identity();
+			m4b.col(0).head<3>() = m4.col(1).head<3>().normalized();
+			m4b.col(1).head<3>() = m4.col(2).head<3>().normalized();
+			m4b.col(2).head<3>() = m4.col(0).head<3>().normalized();
+			m4b.col(3).head<3>() = m4.col(3).head<3>();
+
+			if (interpolated) {
+				loft->children.push_back(interpolated);
+			} else {
+				loft->children.push_back(taxonomy::face::ptr(profile_a->clone_()));
+			}
+			loft->children.back()->matrix = taxonomy::make<taxonomy::matrix4>(m4b);
+		}
+	}
+
+	return loft;
+}
+
+#endif
diff --git a/src/ifcgeom/mapping/mapping.i b/src/ifcgeom/mapping/mapping.i
@@ -132,6 +132,9 @@ BIND(IfcIndexedPolyCurve);
 #ifdef SCHEMA_HAS_IfcFixedReferenceSweptAreaSolid
 BIND(IfcFixedReferenceSweptAreaSolid)
 #endif
+#ifdef SCHEMA_HAS_IfcSectionedSolidHorizontal
+BIND(IfcSectionedSolidHorizontal)
+#endif
 
 BIND(IfcCircle);
 BIND(IfcEllipse);