From 9415878f57afe382820d444be22208ba0a63eb6e Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 21 Oct 2025 13:33:32 +0200 Subject: [PATCH] Remove warning about combination of RefDirection as Axis #7251 --- .../mapping/IfcAxis2PlacementLinear.cpp | 86 +++++++++---------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/src/ifcgeom/mapping/IfcAxis2PlacementLinear.cpp b/src/ifcgeom/mapping/IfcAxis2PlacementLinear.cpp index 8e50f24c5c..b11b61b46b 100644 --- a/src/ifcgeom/mapping/IfcAxis2PlacementLinear.cpp +++ b/src/ifcgeom/mapping/IfcAxis2PlacementLinear.cpp @@ -25,62 +25,58 @@ using namespace ifcopenshell::geometry; taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAxis2PlacementLinear* inst) { - if (!inst->Location()->as()) - Logger::Error(std::runtime_error("Location must be IfcPointByDistanceExpression for IfcAxis2PlacementLinear")); + if (!inst->Location()->as()) { + Logger::Error(std::runtime_error("Location must be IfcPointByDistanceExpression for IfcAxis2PlacementLinear")); + } - Eigen::Vector3d o, axis(0, 0, 1), refDirection; + Eigen::Vector3d o, axis(0, 0, 1), refDirection; - taxonomy::matrix4::ptr m = taxonomy::cast(map(inst->Location())); - o = m->components().col(3).head<3>(); + taxonomy::matrix4::ptr m = taxonomy::cast(map(inst->Location())); + o = m->components().col(3).head<3>(); - // From 8.9.3.4 IfcAxis2PlacementLinear there are 4 cases that need to be considered - // 1) Axis is given but not RefDirection - // 2) RefDirection is given but not Axis - // 3) Neither Axis or RefDirection are provided - // 4) Both Axis and RefDirection are provided + // From 8.9.3.4 IfcAxis2PlacementLinear there are 4 cases that need to be considered + // 1) Axis is given but not RefDirection + // 2) RefDirection is given but not Axis + // 3) Neither Axis or RefDirection are provided + // 4) Both Axis and RefDirection are provided - const bool hasAxis = inst->Axis() != nullptr; - const bool hasRef = inst->RefDirection() != nullptr; + const bool hasAxis = inst->Axis() != nullptr; + const bool hasRef = inst->RefDirection() != nullptr; - if (hasAxis != hasRef) { + /* + if (hasAxis != hasRef) { Logger::Warning("Axis and RefDirection should be specified together", inst); } + */ - if (hasAxis && !hasRef) - { - taxonomy::direction3::ptr a = taxonomy::cast(map(inst->Axis())); - axis = *a->components_; + if (hasAxis && !hasRef) { + taxonomy::direction3::ptr a = taxonomy::cast(map(inst->Axis())); + axis = *a->components_; - refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted - // refDirection is not necessarily orthogonal to axis. - // axis.cross(refDirection) gives y. y.cross(axis) gives x=refDirection - refDirection = axis.cross(refDirection).cross(axis); - } - else if (!hasAxis && hasRef) - { - taxonomy::direction3::ptr r = taxonomy::cast(map(inst->RefDirection())); - refDirection = *r->components_; - Eigen::Vector3d up(0, 0, 1); - axis = refDirection.cross(up.cross(refDirection)); - } - else if (!hasAxis && !hasRef) - { - refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted - Eigen::Vector3d up(0, 0, 1); - axis = refDirection.cross(up.cross(refDirection)); - } - else - { - taxonomy::direction3::ptr a = taxonomy::cast(map(inst->Axis())); - axis = *a->components_; + refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted + // refDirection is not necessarily orthogonal to axis. + // axis.cross(refDirection) gives y. y.cross(axis) gives x=refDirection + refDirection = axis.cross(refDirection).cross(axis); + } else if (!hasAxis && hasRef) { + taxonomy::direction3::ptr r = taxonomy::cast(map(inst->RefDirection())); + refDirection = *r->components_; + Eigen::Vector3d up(0, 0, 1); + axis = refDirection.cross(up.cross(refDirection)); + } else if (!hasAxis && !hasRef) { + refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted + Eigen::Vector3d up(0, 0, 1); + axis = refDirection.cross(up.cross(refDirection)); + } else { + taxonomy::direction3::ptr a = taxonomy::cast(map(inst->Axis())); + axis = *a->components_; - taxonomy::direction3::ptr r = taxonomy::cast(map(inst->RefDirection())); - refDirection = *r->components_; - refDirection = axis.cross(refDirection).cross(axis); // refDirection needs to be orthogonal to axis - } + taxonomy::direction3::ptr r = taxonomy::cast(map(inst->RefDirection())); + refDirection = *r->components_; + refDirection = axis.cross(refDirection).cross(axis); // refDirection needs to be orthogonal to axis + } - // axis and refDirection need to be orthogonal - return taxonomy::make(o, axis, refDirection); + // axis and refDirection need to be orthogonal + return taxonomy::make(o, axis, refDirection); } #endif