mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-27 02:31:09 +00:00
Remove warning about combination of RefDirection as Axis #7251
This commit is contained in:
@@ -25,62 +25,58 @@ using namespace ifcopenshell::geometry;
|
|||||||
|
|
||||||
taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAxis2PlacementLinear* inst) {
|
taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAxis2PlacementLinear* inst) {
|
||||||
|
|
||||||
if (!inst->Location()->as<IfcSchema::IfcPointByDistanceExpression>())
|
if (!inst->Location()->as<IfcSchema::IfcPointByDistanceExpression>()) {
|
||||||
Logger::Error(std::runtime_error("Location must be IfcPointByDistanceExpression for IfcAxis2PlacementLinear"));
|
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<taxonomy::matrix4>(map(inst->Location()));
|
taxonomy::matrix4::ptr m = taxonomy::cast<taxonomy::matrix4>(map(inst->Location()));
|
||||||
o = m->components().col(3).head<3>();
|
o = m->components().col(3).head<3>();
|
||||||
|
|
||||||
// From 8.9.3.4 IfcAxis2PlacementLinear there are 4 cases that need to be considered
|
// From 8.9.3.4 IfcAxis2PlacementLinear there are 4 cases that need to be considered
|
||||||
// 1) Axis is given but not RefDirection
|
// 1) Axis is given but not RefDirection
|
||||||
// 2) RefDirection is given but not Axis
|
// 2) RefDirection is given but not Axis
|
||||||
// 3) Neither Axis or RefDirection are provided
|
// 3) Neither Axis or RefDirection are provided
|
||||||
// 4) Both Axis and RefDirection are provided
|
// 4) Both Axis and RefDirection are provided
|
||||||
|
|
||||||
const bool hasAxis = inst->Axis() != nullptr;
|
const bool hasAxis = inst->Axis() != nullptr;
|
||||||
const bool hasRef = inst->RefDirection() != nullptr;
|
const bool hasRef = inst->RefDirection() != nullptr;
|
||||||
|
|
||||||
if (hasAxis != hasRef) {
|
/*
|
||||||
|
if (hasAxis != hasRef) {
|
||||||
Logger::Warning("Axis and RefDirection should be specified together", inst);
|
Logger::Warning("Axis and RefDirection should be specified together", inst);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
if (hasAxis && !hasRef)
|
if (hasAxis && !hasRef) {
|
||||||
{
|
taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
|
||||||
taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
|
axis = *a->components_;
|
||||||
axis = *a->components_;
|
|
||||||
|
|
||||||
refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
|
refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
|
||||||
// refDirection is not necessarily orthogonal to axis.
|
// refDirection is not necessarily orthogonal to axis.
|
||||||
// axis.cross(refDirection) gives y. y.cross(axis) gives x=refDirection
|
// axis.cross(refDirection) gives y. y.cross(axis) gives x=refDirection
|
||||||
refDirection = axis.cross(refDirection).cross(axis);
|
refDirection = axis.cross(refDirection).cross(axis);
|
||||||
}
|
} else if (!hasAxis && hasRef) {
|
||||||
else if (!hasAxis && hasRef)
|
taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
|
||||||
{
|
refDirection = *r->components_;
|
||||||
taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
|
Eigen::Vector3d up(0, 0, 1);
|
||||||
refDirection = *r->components_;
|
axis = refDirection.cross(up.cross(refDirection));
|
||||||
Eigen::Vector3d up(0, 0, 1);
|
} else if (!hasAxis && !hasRef) {
|
||||||
axis = refDirection.cross(up.cross(refDirection));
|
refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
|
||||||
}
|
Eigen::Vector3d up(0, 0, 1);
|
||||||
else if (!hasAxis && !hasRef)
|
axis = refDirection.cross(up.cross(refDirection));
|
||||||
{
|
} else {
|
||||||
refDirection = m->components().col(0).head<3>(); // RefDirection is the curve tangent when omitted
|
taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
|
||||||
Eigen::Vector3d up(0, 0, 1);
|
axis = *a->components_;
|
||||||
axis = refDirection.cross(up.cross(refDirection));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
taxonomy::direction3::ptr a = taxonomy::cast<taxonomy::direction3>(map(inst->Axis()));
|
|
||||||
axis = *a->components_;
|
|
||||||
|
|
||||||
taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
|
taxonomy::direction3::ptr r = taxonomy::cast<taxonomy::direction3>(map(inst->RefDirection()));
|
||||||
refDirection = *r->components_;
|
refDirection = *r->components_;
|
||||||
refDirection = axis.cross(refDirection).cross(axis); // refDirection needs to be orthogonal to axis
|
refDirection = axis.cross(refDirection).cross(axis); // refDirection needs to be orthogonal to axis
|
||||||
}
|
}
|
||||||
|
|
||||||
// axis and refDirection need to be orthogonal
|
// axis and refDirection need to be orthogonal
|
||||||
return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection);
|
return taxonomy::make<taxonomy::matrix4>(o, axis, refDirection);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user