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

do not calculate reuse_ok multiple times for mapped representations

Browse Source
This commit is contained in:
Otso Alho
2018-04-12 16:42:46 +03:00
committed by Thomas Krijnen
parent 637d3e2eb6
commit 37460d3df9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomIterator.h
+8 -1
View File
@@ -116,6 +116,9 @@ namespace IfcGeom {
IfcSchema::IfcProduct::list::ptr ifcproducts; IfcSchema::IfcProduct::list::ptr ifcproducts;
IfcSchema::IfcProduct::list::it ifcproduct_iterator; IfcSchema::IfcProduct::list::it ifcproduct_iterator;
IfcSchema::IfcRepresentation::list::ptr ok_mapped_representations;
int done; int done;
int total; int total;
@@ -187,6 +190,7 @@ namespace IfcGeom {
bool any_precision_encountered = false; bool any_precision_encountered = false;
representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list); representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
ok_mapped_representations = IfcSchema::IfcRepresentation::list::ptr(new IfcSchema::IfcRepresentation::list);
IfcSchema::IfcGeometricRepresentationContext::list::it it; IfcSchema::IfcGeometricRepresentationContext::list::it it;
IfcSchema::IfcGeometricRepresentationSubContext::list::it jt; IfcSchema::IfcGeometricRepresentationSubContext::list::it jt;
@@ -384,6 +388,7 @@ namespace IfcGeom {
// Note that this can be a nullptr (!), but the fact that set size should be one still holds // Note that this can be a nullptr (!), but the fact that set size should be one still holds
associated_single_materials.insert(kernel.get_single_material_association(product)); associated_single_materials.insert(kernel.get_single_material_association(product));
if (associated_single_materials.size() > 1) return false;
} }
return associated_single_materials.size() == 1; return associated_single_materials.size() == 1;
@@ -428,10 +433,12 @@ namespace IfcGeom {
IfcSchema::IfcRepresentation* representation_mapped_to = kernel.representation_mapped_to(representation); IfcSchema::IfcRepresentation* representation_mapped_to = kernel.representation_mapped_to(representation);
if (representation_mapped_to) { if (representation_mapped_to) {
// Check if this represenation has (or will be) processed as part its mapped representation // Check if this represenation has (or will be) processed as part its mapped representation
representation_processed_as_mapped_item = reuse_ok_(kernel.products_represented_by(representation_mapped_to)); representation_processed_as_mapped_item = ok_mapped_representations->contains(representation_mapped_to) ||
reuse_ok_(kernel.products_represented_by(representation_mapped_to));
} }
if (representation_processed_as_mapped_item) { if (representation_processed_as_mapped_item) {
ok_mapped_representations->push(representation_mapped_to);
_nextShape(); _nextShape();
continue; continue;
} }