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

Break out multiple tasks per representation when rep is directly reused #5978

Browse Source
This commit is contained in:
Thomas Krijnen
2025-01-15 10:24:52 +01:00
parent c37fd6ae0b
commit a687a90039
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/mapping.cpp
+20 -9
View File
@@ -229,7 +229,7 @@ void mapping::get_representations(std::vector<geometry_conversion_task>& tasks,
int task_index = 0; int task_index = 0;
for (auto representation : *representations) { for (auto representation : *representations) {
IfcSchema::IfcRepresentationMap* rmap; IfcSchema::IfcRepresentationMap* rmap = nullptr;
IfcSchema::IfcProduct::list::ptr ifcproducts = filter_products(products_represented_by(representation, rmap, false), filters); IfcSchema::IfcProduct::list::ptr ifcproducts = filter_products(products_represented_by(representation, rmap, false), filters);
if (ifcproducts->size() == 0) { if (ifcproducts->size() == 0) {
@@ -237,7 +237,7 @@ void mapping::get_representations(std::vector<geometry_conversion_task>& tasks,
} }
auto geometry_reuse_ok_for_current_representation_ = reuse_ok_(ifcproducts); auto geometry_reuse_ok_for_current_representation_ = reuse_ok_(ifcproducts);
if (!geometry_reuse_ok_for_current_representation_) { if (!geometry_reuse_ok_for_current_representation_ && rmap != nullptr) {
not_reusable_maps_.insert(rmap); not_reusable_maps_.insert(rmap);
} }
@@ -269,13 +269,24 @@ void mapping::get_representations(std::vector<geometry_conversion_task>& tasks,
continue; continue;
} }
// @todo, fix this properly by considering the mapped geometry types in the representation. if (!geometry_reuse_ok_for_current_representation_ && ifcproducts->size() > 1) {
geometry_conversion_task task; // reuse_ok is taken into account in products_represented_by(), but not when
task.index = task_index++; // the same IfcRepresentation is directly assigned to multiple products.
task.representation = representation; for (auto& p : *ifcproducts) {
task.products = ifcproducts->generalize(); geometry_conversion_task task;
task.index = task_index++;
tasks.emplace_back(task); task.representation = representation;
task.products = aggregate_of_instance::ptr(new aggregate_of_instance);
task.products->push(p);
tasks.emplace_back(task);
}
} else {
geometry_conversion_task task;
task.index = task_index++;
task.representation = representation;
task.products = ifcproducts->generalize();
tasks.emplace_back(task);
}
} }
} }