Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 06:58:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

taxonomy.h - move upgrades code to cpp

Browse Source
This commit is contained in:
Andrej730
2024-09-11 11:56:49 +05:00
parent 11f017e715
commit 37315e941a
2 changed files with 165 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/taxonomy.cpp
+153
View File
@@ -599,3 +599,156 @@ void ifcopenshell::geometry::taxonomy::extrusion::print(std::ostream& o, int ind
direction->print(o, indent + 4); direction->print(o, indent + 4);
basis->print(o, indent + 4); basis->print(o, indent + 4);
} }
boost::optional<face::ptr> ifcopenshell::geometry::taxonomy::loop_to_face_upgrade_impl(ptr item) {
boost::optional<face::ptr> face_;
auto loop_ = dcast<loop>(item);
if (loop_) {
loop_->external = true;
face_ = make<face>();
(*face_)->instance = loop_->instance;
(*face_)->matrix = loop_->matrix;
(*face_)->children = { clone(loop_) };
}
return face_;
}
boost::optional<edge::ptr> ifcopenshell::geometry::taxonomy::curve_to_edge_upgrade_impl(ptr item) {
boost::optional<edge::ptr> edge_;
auto circle_ = dcast<circle>(item);
auto ellipse_ = dcast<ellipse>(item);
auto line_ = dcast<line>(item);
auto bspline_curve_ = dcast<bspline_curve>(item);
if (circle_ || ellipse_ || line_ || bspline_curve_) {
edge_ = make<edge>();
if (circle_) {
(*edge_)->basis = circle_;
} else if (ellipse_) {
(*edge_)->basis = ellipse_;
} else if (line_) {
(*edge_)->basis = line_;
} else if (bspline_curve_) {
(*edge_)->basis = bspline_curve_;
}
if (circle_ || ellipse_) {
// @todo
(*edge_)->start = 0.;
(*edge_)->end = 2 * boost::math::constants::pi<double>();
}
}
return edge_;
}
boost::optional<loop::ptr> ifcopenshell::geometry::taxonomy::curve_to_loop_upgrade_impl(ptr item) {
boost::optional<loop::ptr> loop_;
auto circle_ = dcast<circle>(item);
auto ellipse_ = dcast<ellipse>(item);
auto line_ = dcast<line>(item);
auto bspline_curve_ = dcast<bspline_curve>(item);
if (circle_ || ellipse_ || line_ || bspline_curve_) {
auto edge_ = make<edge>();
if (circle_) {
edge_->basis = circle_;
} else if (ellipse_) {
edge_->basis = ellipse_;
} else if (line_) {
edge_->basis = line_;
} else if (bspline_curve_) {
edge_->basis = bspline_curve_;
}
if (circle_ || ellipse_) {
// @todo
edge_->start = 0.;
edge_->end = 2 * boost::math::constants::pi<double>();
}
loop_ = make<loop>();
(*loop_)->children.push_back(edge_);
}
return loop_;
}
boost::optional<loop::ptr> ifcopenshell::geometry::taxonomy::edge_to_loop_upgrade_impl(ptr item) {
boost::optional<loop::ptr> loop_;
auto edge_ = dcast<edge>(item);
if (edge_) {
loop_ = make<loop>();
(*loop_)->children.push_back(edge_);
}
return loop_;
}
boost::optional<face::ptr> ifcopenshell::geometry::taxonomy::curve_to_face_upgrade_impl(ptr item) {
boost::optional<face::ptr> face_;
auto circle_ = dcast<circle>(item);
auto ellipse_ = dcast<ellipse>(item);
auto line_ = dcast<line>(item);
auto bspline_curve_ = dcast<bspline_curve>(item);
if (circle_ || ellipse_ || line_ || bspline_curve_) {
auto edge_ = make<edge>();
if (circle_) {
edge_->basis = circle_;
} else if (ellipse_) {
edge_->basis = ellipse_;
} else if (line_) {
edge_->basis = line_;
} else if (bspline_curve_) {
edge_->basis = bspline_curve_;
}
if (circle_ || ellipse_) {
// @todo
edge_->start = 0.;
edge_->end = 2 * boost::math::constants::pi<double>();
}
auto loop_ = make<loop>();
loop_->children.push_back(edge_);
face_ = make<face>();
(*face_)->instance = loop_->instance;
(*face_)->matrix = loop_->matrix;
(*face_)->children = { clone(loop_) };
}
return face_;
}
boost::optional<piecewise_function::ptr> ifcopenshell::geometry::taxonomy::loop_to_piecewise_function_upgrade_impl(ptr item) {
boost::optional<piecewise_function::ptr> pwf_;
auto loop_ = dcast<loop>(item);
if (loop_) {
if (loop_->pwf.is_initialized()) {
pwf_ = loop_->pwf;
} else {
piecewise_function::spans_t spans;
spans.reserve(loop_->children.size());
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<point3::ptr>(edge_->start)->ccomponents();
const auto& e = boost::get<point3::ptr>(edge_->end)->ccomponents();
Eigen::Vector3d v = e - s;
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
std::function<Eigen::Matrix4d(double)> fn = [s, v](double u) {
Eigen::Vector3d o(s + u * v), axis(0, 0, 1), refDirection(v);
auto Y = axis.cross(refDirection).normalized();
axis = refDirection.cross(Y).normalized();
return make<matrix4>(o, axis, refDirection)->components();
};
spans.emplace_back(l, fn);
}
pwf_ = make<piecewise_function>(0.0,spans);
loop_->pwf = pwf_;
}
}
return pwf_;
}
src/ifcgeom/taxonomy.h
+12 -123
View File
@@ -1089,6 +1089,7 @@ typedef item const* ptr;
static const size_t max = std::tuple_size<impl::SurfacesTuple>::value; static const size_t max = std::tuple_size<impl::SurfacesTuple>::value;
}; };
boost::optional<face::ptr> loop_to_face_upgrade_impl(ptr item);
template <typename T> template <typename T>
class loop_to_face_upgrade { class loop_to_face_upgrade {
private: private:
@@ -1096,15 +1097,7 @@ typedef item const* ptr;
public: public:
loop_to_face_upgrade(taxonomy::ptr item) { loop_to_face_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, face>) { if constexpr (std::is_same_v<T, face>) {
auto loop = taxonomy::dcast<taxonomy::loop>(item); face_ = loop_to_face_upgrade_impl(item);
if (loop) {
loop->external = true;
face_ = taxonomy::make<taxonomy::face>();
(*face_)->instance = loop->instance;
(*face_)->matrix = loop->matrix;
(*face_)->children = { taxonomy::clone(loop) };
}
} }
} }
@@ -1122,6 +1115,7 @@ typedef item const* ptr;
} }
}; };
boost::optional<edge::ptr> curve_to_edge_upgrade_impl(ptr item);
template <typename T> template <typename T>
class curve_to_edge_upgrade { class curve_to_edge_upgrade {
private: private:
@@ -1129,28 +1123,7 @@ typedef item const* ptr;
public: public:
curve_to_edge_upgrade(taxonomy::ptr item) { curve_to_edge_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, edge>) { if constexpr (std::is_same_v<T, edge>) {
auto circle = taxonomy::dcast<taxonomy::circle>(item); edge_ = taxonomy::curve_to_edge_upgrade_impl(item);
auto ellipse = taxonomy::dcast<taxonomy::ellipse>(item);
auto line = taxonomy::dcast<taxonomy::line>(item);
auto bspline_curve = taxonomy::dcast<taxonomy::bspline_curve>(item);
if (circle || ellipse || line || bspline_curve) {
edge_ = taxonomy::make<taxonomy::edge>();
if (circle) {
(*edge_)->basis = circle;
} else if (ellipse) {
(*edge_)->basis = ellipse;
} else if (line) {
(*edge_)->basis = line;
} else if (bspline_curve) {
(*edge_)->basis = bspline_curve;
}
if (circle || ellipse) {
// @todo
(*edge_)->start = 0.;
(*edge_)->end = 2 * boost::math::constants::pi<double>();
}
}
} }
} }
@@ -1168,7 +1141,7 @@ typedef item const* ptr;
} }
}; };
boost::optional<loop::ptr> curve_to_loop_upgrade_impl(ptr item);
template <typename T> template <typename T>
class curve_to_loop_upgrade { class curve_to_loop_upgrade {
private: private:
@@ -1176,31 +1149,7 @@ typedef item const* ptr;
public: public:
curve_to_loop_upgrade(taxonomy::ptr item) { curve_to_loop_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, loop>) { if constexpr (std::is_same_v<T, loop>) {
auto circle = taxonomy::dcast<taxonomy::circle>(item); loop_ = curve_to_loop_upgrade_impl(item);
auto ellipse = taxonomy::dcast<taxonomy::ellipse>(item);
auto line = taxonomy::dcast<taxonomy::line>(item);
auto bspline_curve = taxonomy::dcast<taxonomy::bspline_curve>(item);
if (circle || ellipse || line || bspline_curve) {
auto edge = taxonomy::make<taxonomy::edge>();
if (circle) {
edge->basis = circle;
} else if (ellipse) {
edge->basis = ellipse;
} else if (line) {
edge->basis = line;
} else if (bspline_curve) {
edge->basis = bspline_curve;
}
if (circle || ellipse) {
// @todo
edge->start = 0.;
edge->end = 2 * boost::math::constants::pi<double>();
}
loop_ = taxonomy::make<taxonomy::loop>();
(*loop_)->children.push_back(edge);
}
} }
} }
@@ -1218,6 +1167,7 @@ typedef item const* ptr;
} }
}; };
boost::optional<loop::ptr> edge_to_loop_upgrade_impl(ptr item);
template <typename T> template <typename T>
class edge_to_loop_upgrade { class edge_to_loop_upgrade {
private: private:
@@ -1225,11 +1175,7 @@ typedef item const* ptr;
public: public:
edge_to_loop_upgrade(taxonomy::ptr item) { edge_to_loop_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, loop>) { if constexpr (std::is_same_v<T, loop>) {
auto edge = taxonomy::dcast<taxonomy::edge>(item); loop_ = edge_to_loop_upgrade_impl(item);
if (edge) {
loop_ = taxonomy::make<taxonomy::loop>();
(*loop_)->children.push_back(edge);
}
} }
} }
@@ -1247,7 +1193,7 @@ typedef item const* ptr;
} }
}; };
boost::optional<face::ptr> curve_to_face_upgrade_impl(ptr item);
template <typename T> template <typename T>
class curve_to_face_upgrade { class curve_to_face_upgrade {
private: private:
@@ -1255,36 +1201,7 @@ typedef item const* ptr;
public: public:
curve_to_face_upgrade(taxonomy::ptr item) { curve_to_face_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, edge>) { if constexpr (std::is_same_v<T, edge>) {
auto circle = taxonomy::dcast<taxonomy::circle>(item); face_ = curve_to_face_upgrade_impl(item);
auto ellipse = taxonomy::dcast<taxonomy::ellipse>(item);
auto line = taxonomy::dcast<taxonomy::line>(item);
auto bspline_curve = taxonomy::dcast<taxonomy::bspline_curve>(item);
if (circle || ellipse || line || bspline_curve) {
auto edge = taxonomy::make<taxonomy::edge>();
if (circle) {
edge->basis = circle;
} else if (ellipse) {
edge->basis = ellipse;
} else if (line) {
edge->basis = line;
} else if (bspline_curve) {
edge->basis = bspline_curve;
}
if (circle || ellipse) {
// @todo
edge->start = 0.;
edge->end = 2 * boost::math::constants::pi<double>();
}
auto loop = taxonomy::make<taxonomy::loop>();
loop->children.push_back(edge);
face_ = taxonomy::make<taxonomy::face>();
(*face_)->instance = loop->instance;
(*face_)->matrix = loop->matrix;
(*face_)->children = { taxonomy::clone(loop) };
}
} }
} }
@@ -1302,6 +1219,7 @@ typedef item const* ptr;
} }
}; };
boost::optional<piecewise_function::ptr> loop_to_piecewise_function_upgrade_impl(ptr item);
template <typename T> template <typename T>
class loop_to_piecewise_function_upgrade { class loop_to_piecewise_function_upgrade {
private: private:
@@ -1310,36 +1228,7 @@ typedef item const* ptr;
public: public:
loop_to_piecewise_function_upgrade(taxonomy::ptr item) { loop_to_piecewise_function_upgrade(taxonomy::ptr item) {
if constexpr (std::is_same_v<T, piecewise_function>) { if constexpr (std::is_same_v<T, piecewise_function>) {
auto loop = taxonomy::dcast<taxonomy::loop>(item); pwf_ = loop_to_piecewise_function_upgrade_impl(item);
if (loop) {
if (loop->pwf.is_initialized()) {
pwf_ = loop->pwf;
} else {
taxonomy::piecewise_function::spans_t spans;
spans.reserve(loop->children.size());
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& e = boost::get<taxonomy::point3::ptr>(edge->end)->ccomponents();
Eigen::Vector3d v = e - s;
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
std::function<Eigen::Matrix4d(double)> fn = [s, v](double u) {
Eigen::Vector3d o(s + u * v), axis(0, 0, 1), refDirection(v);
auto Y = axis.cross(refDirection).normalized();
axis = refDirection.cross(Y).normalized();
return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection)->components();
};
spans.emplace_back(l, fn);
}
pwf_ = taxonomy::make<taxonomy::piecewise_function>(0.0,spans);
loop->pwf = pwf_;
}
}
} }
} }