Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 23:29:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolve_boolean_modifier

Browse Source 
Use matrix col for axis instead of row ..
Store product indexes in resolve_boolean_modifier
Remove get_product_from_raw_name
This commit is contained in:
s-leger
2019-11-18 07:51:09 +01:00
committed by GitHub
parent 34c2cd3c06
commit e510d5a197
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcblenderexport/blenderbim/export_ifc.py
+17 -21
View File
@@ -240,24 +240,24 @@ class IfcParser():
instance_objects.extend(created_instances) instance_objects.extend(created_instances)
def resolve_boolean_modifiers(self): def resolve_boolean_modifiers(self):
for product in self.products: for i, product in enumerate(self.products):
obj = product['raw'] obj = product['raw']
for m in obj.modifiers: for m in obj.modifiers:
if m.type == 'BOOLEAN' and m.object is not None: if m.type == 'BOOLEAN' and m.object is not None:
void = self.get_product_from_raw_name(m.object.name) void = self.get_product_index_from_raw_name(m.object.name)
if void is not None: if void is not None:
if product['ifc'] not in self.rel_voids_elements: if i not in self.rel_voids_elements:
self.rel_voids_elements[product['ifc']] = [] self.rel_voids_elements[i] = []
self.rel_voids_elements[product['ifc']].append(void['ifc']) self.rel_voids_elements[i].append(void)
if m.object.parent: if m.object.parent:
fill = self.get_product_from_raw_name(m.object.parent.name) fill = self.get_product_index_from_raw_name(m.object.parent.name)
if fill is not None: if fill is not None:
if void['ifc'] not in self.rel_fills_elements: if void not in self.rel_fills_elements:
self.rel_fills_elements[void['ifc']] = [] self.rel_fills_elements[void] = []
self.rel_fills_elements[void['ifc']].append(fill['ifc']) self.rel_fills_elements[void].append(fill)
def get_axis(self, matrix, axis): def get_axis(self, matrix, axis):
return matrix.row[axis].to_3d().normalized() return matrix.col[axis].to_3d().normalized()
def get_parametric_global_id(self, obj, index): def get_parametric_global_id(self, obj, index):
global_ids = obj.BIMObjectProperties.global_ids global_ids = obj.BIMObjectProperties.global_ids
@@ -278,11 +278,6 @@ class IfcParser():
if product['raw'].name == name: if product['raw'].name == name:
return index return index
def get_product_from_raw_name(self, name):
for index, product in enumerate(self.products):
if product['raw'].name == name:
return product
def get_product(self, selected_product, metadata_override={}, attribute_override={}): def get_product(self, selected_product, metadata_override={}, attribute_override={}):
obj = selected_product['raw'] obj = selected_product['raw']
product = { product = {
@@ -291,7 +286,7 @@ class IfcParser():
'location': obj.matrix_world.translation, 'location': obj.matrix_world.translation,
'up_axis': self.get_axis(obj.matrix_world, 2), 'up_axis': self.get_axis(obj.matrix_world, 2),
'forward_axis': self.get_axis(obj.matrix_world, 0), 'forward_axis': self.get_axis(obj.matrix_world, 0),
'right_axis': self.get_axis(obj.matrix_world, 1), 'right_axis': -self.get_axis(obj.matrix_world, 1),
'has_scale': obj.scale != Vector((1, 1, 1)), 'has_scale': obj.scale != Vector((1, 1, 1)),
'scale': obj.scale, 'scale': obj.scale,
'class': self.get_ifc_class(obj.name), 'class': self.get_ifc_class(obj.name),
@@ -342,6 +337,7 @@ class IfcParser():
product['location'] = inverted @ product['location'] product['location'] = inverted @ product['location']
product['up_axis'] = self.get_axis(inverted @ obj.matrix_world, 2) product['up_axis'] = self.get_axis(inverted @ obj.matrix_world, 2)
product['forward_axis'] = self.get_axis(inverted @ obj.matrix_world, 0) product['forward_axis'] = self.get_axis(inverted @ obj.matrix_world, 0)
product['right_axis'] = self.get_axis(inverted @ obj.matrix_world, 1)
self.aggregates.setdefault(relating_object.name, []).append(self.product_index) self.aggregates.setdefault(relating_object.name, []).append(self.product_index)
if obj.name in self.qtos: if obj.name in self.qtos:
@@ -1755,8 +1751,8 @@ class IfcExporter():
for related_opening_element in related_opening_elements: for related_opening_element in related_opening_elements:
self.file.createIfcRelVoidsElement( self.file.createIfcRelVoidsElement(
ifcopenshell.guid.new(), self.owner_history, None, None, ifcopenshell.guid.new(), self.owner_history, None, None,
related_building_element, self.ifc_parser.products[relating_building_element]['ifc'],
related_opening_element self.ifc_parser.products[related_opening_element]['ifc']
) )
def relate_opening_elements_to_fillings(self): def relate_opening_elements_to_fillings(self):
@@ -1764,10 +1760,10 @@ class IfcExporter():
for related_building_element in related_building_elements: for related_building_element in related_building_elements:
self.file.createIfcRelFillsElement( self.file.createIfcRelFillsElement(
ifcopenshell.guid.new(), self.owner_history, None, None, ifcopenshell.guid.new(), self.owner_history, None, None,
relating_opening_element, self.ifc_parser.products[relating_opening_element]['ifc'],
related_building_element self.ifc_parser.products[related_building_element]['ifc']
) )
def relate_elements_to_spatial_structures(self): def relate_elements_to_spatial_structures(self):
for relating_structure, related_elements in self.ifc_parser.rel_contained_in_spatial_structure.items(): for relating_structure, related_elements in self.ifc_parser.rel_contained_in_spatial_structure.items():
self.file.createIfcRelContainedInSpatialStructure( self.file.createIfcRelContainedInSpatialStructure(