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

IfcGeomIterator: check the filtered products, not unfiltered ones, for reusability. Speeds up things significantly and also fixes geometry reusability in many cases.

Browse Source
This commit is contained in:
Stinkfist0
2018-08-23 10:33:43 +03:00
committed by Thomas Krijnen
parent fbc0215ef1
commit ffa282af9d
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomIterator.h
+8 -10
View File
@@ -405,18 +405,17 @@ namespace IfcGeom {
for (;;) { for (;;) {
IfcSchema::IfcRepresentation* representation; IfcSchema::IfcRepresentation* representation;
// Have we reached the end of our list of representations?
if ( representation_iterator == representations->end() ) { if ( representation_iterator == representations->end() ) {
representations.reset(); representations.reset();
return 0; return 0; // reached the end of our list of representations
} }
representation = *representation_iterator; representation = *representation_iterator;
// Has the list of IfcProducts for this representation been initialized?
if (!ifcproducts) { if (!ifcproducts) {
// Init. the list of filtered IfcProducts for this representation
ifcproducts = IfcSchema::IfcProduct::list::ptr(new IfcSchema::IfcProduct::list); ifcproducts = IfcSchema::IfcProduct::list::ptr(new IfcSchema::IfcProduct::list);
IfcSchema::IfcProduct::list::ptr unfiltered_products = kernel.products_represented_by(representation); IfcSchema::IfcProduct::list::ptr unfiltered_products = kernel.products_represented_by(representation);
// Filter the products based on the set of entities and/or names being included or excluded for processing. // Include only the desired products for processing.
for (IfcSchema::IfcProduct::list::it jt = unfiltered_products->begin(); jt != unfiltered_products->end(); ++jt) { for (IfcSchema::IfcProduct::list::it jt = unfiltered_products->begin(); jt != unfiltered_products->end(); ++jt) {
IfcSchema::IfcProduct* prod = *jt; IfcSchema::IfcProduct* prod = *jt;
if (boost::all(filters_, filter_match(prod))) { if (boost::all(filters_, filter_match(prod))) {
@@ -429,7 +428,7 @@ namespace IfcGeom {
continue; continue;
} }
geometry_reuse_ok_for_current_representation_ = reuse_ok_(unfiltered_products); geometry_reuse_ok_for_current_representation_ = reuse_ok_(ifcproducts);
IfcSchema::IfcRepresentationMap::list::ptr maps = representation->RepresentationMap(); IfcSchema::IfcRepresentationMap::list::ptr maps = representation->RepresentationMap();
@@ -447,13 +446,12 @@ namespace IfcGeom {
} }
} }
// Check if this represenation has (or will be) processed as part its mapped representation
bool representation_processed_as_mapped_item = false; bool representation_processed_as_mapped_item = false;
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 representation has (or will be) processed as part its mapped representation representation_processed_as_mapped_item = geometry_reuse_ok_for_current_representation_ ||
representation_processed_as_mapped_item = ok_mapped_representations->contains(representation_mapped_to) || 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) {