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

Adds test of fallback placement for IfcLinearPlacement and reduces number of tests for placement type.

Browse Source 
Changed to if-else if so inst isn't tested to be every placement type, every time.
This commit is contained in:
Richard Brice
2023-10-24 18:28:23 -07:00
parent cefbf8b4f2
commit 6e8d635040
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/IfcObjectPlacement.cpp
+26 -8
View File
@@ -25,15 +25,23 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcObjectPlacement* inst) {
const IfcSchema::IfcObjectPlacement* relative_to = nullptr; const IfcSchema::IfcObjectPlacement* relative_to = nullptr;
const IfcUtil::IfcBaseInterface* transform; const IfcUtil::IfcBaseInterface* transform;
#ifdef SCHEMA_HAS_IfcLinearPlacement const IfcSchema::IfcAxis2Placement3D* fallback = nullptr;
if (inst->as<IfcSchema::IfcLinearPlacement>()) {
transform = inst->as<IfcSchema::IfcLinearPlacement>()->RelativePlacement();
}
#endif
if (inst->as<IfcSchema::IfcLocalPlacement>()) { if (inst->as<IfcSchema::IfcLocalPlacement>()) {
transform = inst->as<IfcSchema::IfcLocalPlacement>()->RelativePlacement(); transform = inst->as<IfcSchema::IfcLocalPlacement>()->RelativePlacement();
} }
if (inst->as<IfcSchema::IfcGridPlacement>()) { #ifdef SCHEMA_HAS_IfcLinearPlacement
else if (inst->as<IfcSchema::IfcLinearPlacement>()) {
#ifdef SCHEMA_IfcLinearPlacement_HAS_RelativePlacement
transform = inst->as<IfcSchema::IfcLinearPlacement>()->RelativePlacement();
fallback = inst->as<IfcSchema::IfcLinearPlacement>()->CartesianPosition();
#else
// @todo Ifc4x1 and Ifc4x2 don't have RelativePlacement
return nullptr;
#endif
}
#endif
else if (inst->as<IfcSchema::IfcGridPlacement>()) {
// @todo a bit harder to map without kernel // @todo a bit harder to map without kernel
return nullptr; return nullptr;
} }
@@ -57,17 +65,27 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcObjectPlacement* inst) {
} }
} }
taxonomy::ptr result;
if (!parent_placement_ignored && relative_to) { if (!parent_placement_ignored && relative_to) {
// The parent placement of the current is a placement for a type that is // The parent placement of the current is a placement for a type that is
// being ignored (Site or Building) or it is the host element of an opening. // being ignored (Site or Building) or it is the host element of an opening.
return taxonomy::make<taxonomy::matrix4>( result = taxonomy::make<taxonomy::matrix4>(
taxonomy::cast<taxonomy::matrix4>(map(relative_to))->ccomponents() * taxonomy::cast<taxonomy::matrix4>(map(relative_to))->ccomponents() *
taxonomy::cast<taxonomy::matrix4>(map(transform))->ccomponents() taxonomy::cast<taxonomy::matrix4>(map(transform))->ccomponents()
); );
} else { } else {
return map(transform); result = map(transform);
} }
if (fallback) {
auto mapped_fallback = taxonomy::cast<taxonomy::matrix4>(map(fallback));
if (mapped_fallback != result) {
Logger::Warning("Computed placement differs from fallback", inst);
}
}
return result;
// @todo // @todo
// m4->components() = offset_and_rotation_ * m4->components(); // m4->components() = offset_and_rotation_ * m4->components();
} }