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

Adds caching of loop upgraded to pwf to loop class

Browse Source
This commit is contained in:
Richard Brice
2024-01-15 15:52:26 -08:00
parent a8b88b8ae1
commit f12c3aae09
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/taxonomy.h
+24 -18
View File
@@ -759,6 +759,7 @@ typedef item const* ptr;
DECLARE_PTR(loop) DECLARE_PTR(loop)
boost::optional<bool> external, closed; boost::optional<bool> external, closed;
boost::optional<taxonomy::piecewise_function::ptr> pwf;
bool is_polyhedron() const { bool is_polyhedron() const {
for (auto& e : children) { for (auto& e : children) {
@@ -1130,25 +1131,30 @@ typedef item const* ptr;
loop_to_piecewise_function_upgrade(taxonomy::ptr item) { loop_to_piecewise_function_upgrade(taxonomy::ptr item) {
auto loop = taxonomy::dcast<taxonomy::loop>(item); auto loop = taxonomy::dcast<taxonomy::loop>(item);
if (loop) { if (loop) {
pwf_ = taxonomy::make<taxonomy::piecewise_function>(); if (loop->pwf.is_initialized()) {
for (auto& edge : loop->children) { pwf_ = loop->pwf;
// the edge could be an arc or trimmed circle in the case of IfcIndexPolyCurve - support for this isn't implemented yet } else {
if (edge->basis) { pwf_ = taxonomy::make<taxonomy::piecewise_function>();
Logger::Message(Logger::Severity::LOG_NOTICE, "Shape of basis curve ignored - edge is treated as a straight line edge"); for (auto& edge : loop->children) {
} // the edge could be an arc or trimmed circle in the case of IfcIndexPolyCurve - support for this isn't implemented yet
if (edge->basis) {
Logger::Message(Logger::Severity::LOG_NOTICE, "Shape of basis curve ignored - edge is treated as a straight line edge");
}
const auto& s = boost::get<taxonomy::point3::ptr>(edge->start)->ccomponents(); const auto& s = boost::get<taxonomy::point3::ptr>(edge->start)->ccomponents();
const auto& e = boost::get<taxonomy::point3::ptr>(edge->end)->ccomponents(); const auto& e = boost::get<taxonomy::point3::ptr>(edge->end)->ccomponents();
Eigen::Vector3d v = e - s; Eigen::Vector3d v = e - s;
auto l = v.norm(); // the norm of a vector is a measure of its length auto l = v.norm(); // the norm of a vector is a measure of its length
v.normalize(); // normalize the vector so that it is a unit direction vector v.normalize(); // normalize the vector so that it is a unit direction vector
std::function<Eigen::Matrix4d(double)> fn = [s, v](double u) { std::function<Eigen::Matrix4d(double)> fn = [s, v](double u) {
Eigen::Vector3d o(s + u * v), axis(0, 0, 1), refDirection(v); Eigen::Vector3d o(s + u * v), axis(0, 0, 1), refDirection(v);
auto Y = axis.cross(refDirection).normalized(); auto Y = axis.cross(refDirection).normalized();
axis = refDirection.cross(Y).normalized(); axis = refDirection.cross(Y).normalized();
return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection)->components(); return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection)->components();
}; };
(*pwf_)->spans.emplace_back(l, fn); (*pwf_)->spans.emplace_back(l, fn);
}
loop->pwf = pwf_;
} }
} }
} }