Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-28 11:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes problem with constant cant

Browse Source
This commit is contained in:
Richard Brice
2024-05-08 10:28:01 -07:00
parent a0b4c24224
commit 507e4a8211
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/IfcCurveSegment.cpp
+7 -13
View File
@@ -231,7 +231,7 @@ class curve_segment_evaluator {
return m; return m;
}; };
parent_curve_placement_ = (*parent_curve_fn_)(0); parent_curve_placement_ = (*parent_curve_fn_)(0.0);
} }
#ifdef SCHEMA_HAS_IfcClothoid #ifdef SCHEMA_HAS_IfcClothoid
@@ -511,7 +511,7 @@ class curve_segment_evaluator {
return m; return m;
}; };
parent_curve_placement_ = (*parent_curve_fn_)(0.0); parent_curve_placement_ = (*parent_curve_fn_)(start_);
} else if (segment_type_ == ST_CANT) { } else if (segment_type_ == ST_CANT) {
Logger::Warning(std::runtime_error("Use of IfcCircle for cant is not supported")); Logger::Warning(std::runtime_error("Use of IfcCircle for cant is not supported"));
parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); }; parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); };
@@ -543,15 +543,9 @@ class curve_segment_evaluator {
auto pcDx = dr[0]; auto pcDx = dr[0];
auto pcDy = dr[1]; auto pcDy = dr[1];
Eigen::Matrix4d p = Eigen::Matrix4d::Identity(); if (segment_type_ == ST_HORIZONTAL || segment_type_ == ST_VERTICAL || segment_type_ == ST_CANT) {
p.col(0) = Eigen::Vector4d(pcDx, pcDy, 0, 0);
p.col(1) = Eigen::Vector4d(-pcDy, pcDx, 0, 0);
p.col(3) = Eigen::Vector4d(pcX, pcY, 0, 1);
parent_curve_placement_ = p;
if (segment_type_ == ST_HORIZONTAL || segment_type_ == ST_VERTICAL) {
std::function<double(double)> convert_u; std::function<double(double)> convert_u;
if (segment_type_ == ST_HORIZONTAL) { if (segment_type_ == ST_HORIZONTAL || segment_type_ == ST_CANT) {
convert_u = [](double u) { return u; }; // u is along curve convert_u = [](double u) { return u; }; // u is along curve
} else { } else {
// u is along horizontal, convert to along curve // u is along horizontal, convert to along curve
@@ -570,8 +564,8 @@ class curve_segment_evaluator {
m.col(3) = Eigen::Vector4d(x, y, 0.0, 1.0); m.col(3) = Eigen::Vector4d(x, y, 0.0, 1.0);
return m; return m;
}; };
} else if (segment_type_ == ST_CANT) {
parent_curve_fn_ = [](double /*u*/) { Eigen::Matrix4d m = Eigen::Matrix4d::Identity(); return m; }; parent_curve_placement_ = (*parent_curve_fn_)(start_);
} else { } else {
Logger::Warning(std::runtime_error("Unexpected segment type encountered")); Logger::Warning(std::runtime_error("Unexpected segment type encountered"));
parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); }; parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); };
@@ -693,7 +687,7 @@ class curve_segment_evaluator {
return m; return m;
}; };
parent_curve_placement_ = (*parent_curve_fn_)(0.0); parent_curve_placement_ = (*parent_curve_fn_)(start_);
} else if (segment_type_ == ST_CANT) { } else if (segment_type_ == ST_CANT) {
Logger::Warning(std::runtime_error("Use of IfcPolynomialCurve for cant is not supported")); Logger::Warning(std::runtime_error("Use of IfcPolynomialCurve for cant is not supported"));
parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); }; parent_curve_fn_ = [](double /*u*/) -> Eigen::Matrix4d { return Eigen::Matrix4d::Identity(); };