Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 17:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression for switching to Point/PointCloud representations

Browse Source
This commit is contained in:
Andrej730
2024-12-06 13:25:16 +05:00
parent 73185293df
commit 6fe5af3170
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/geometry.py
+28 -24
View File
@@ -679,8 +679,8 @@ class Geometry(bonsai.core.tool.Geometry):
assert element
ifc_file = tool.Ifc.get()
elements = set()
element_types = set()
elements: set[ifcopenshell.entity_instance] = set()
element_types: set[ifcopenshell.entity_instance] = set()
representation = ifcopenshell.util.representation.resolve_representation(representation)
context = representation.ContextOfItems
for mapped_element in ifcopenshell.util.element.get_elements_by_representation(tool.Ifc.get(), representation):
@@ -691,6 +691,30 @@ class Geometry(bonsai.core.tool.Geometry):
if element_type := ifcopenshell.util.element.get_type(mapped_element):
element_types.add(element_type)
def change_data(obj: bpy.types.Object, element: ifcopenshell.entity_instance, data: bpy.types.ID) -> None:
old_data = obj.data
if type(old_data) == type(data):
cls.change_object_data(obj, data, is_global=False)
else:
obj = cls.recreate_object_with_data(obj, data, is_global=False)
cls.record_object_materials(obj)
if not cls.has_data_users(old_data):
cls.delete_data(old_data)
cls.clear_modifiers(obj)
cls.clear_cache(element)
# Fallback to custom methods as IOS doesn't process points, see #5218.
if representation.RepresentationType in ("PointCloud", "Point"):
mesh = tool.Loader.create_point_cloud_mesh(representation)
if mesh is None:
raise Exception(f"Failed to process point cloud representation: {representation}.")
tool.Ifc.link(representation, mesh)
for element in elements | element_types:
obj = tool.Ifc.get_object(element)
change_data(obj, element, mesh)
return
logger = logging.getLogger("ImportIFC")
ifc_import_settings = bonsai.bim.import_ifc.IfcImportSettings.factory(bpy.context, None, logger)
settings = ifcopenshell.geom.settings()
@@ -703,8 +727,6 @@ class Geometry(bonsai.core.tool.Geometry):
ifc_importer = bonsai.bim.import_ifc.IfcImporter(ifc_import_settings)
ifc_importer.file = tool.Ifc.get()
# TODO support fallbacks like for point clouds
settings.set("context-ids", [context.id()])
if not apply_openings:
settings.set("disable-opening-subtractions", True)
@@ -757,16 +779,7 @@ class Geometry(bonsai.core.tool.Geometry):
tool.Loader.link_mesh(shape, mesh)
meshes[mesh_name] = mesh
old_mesh = obj.data
if type(old_mesh) == type(mesh):
cls.change_object_data(obj, mesh, is_global=False)
else:
obj = cls.recreate_object_with_data(obj, mesh, is_global=False)
cls.record_object_materials(obj)
if not cls.has_data_users(old_mesh):
cls.delete_data(old_mesh)
cls.clear_modifiers(obj)
cls.clear_cache(element)
change_data(obj, element, mesh)
if not iterator.next():
break
@@ -791,16 +804,7 @@ class Geometry(bonsai.core.tool.Geometry):
tool.Loader.link_mesh(geometry, mesh)
meshes[mesh_name] = mesh
old_mesh = obj.data
if type(old_mesh) == type(mesh):
cls.change_object_data(obj, mesh, is_global=False)
else:
obj = cls.recreate_object_with_data(obj, mesh, is_global=False)
cls.record_object_materials(obj)
if not cls.has_data_users(old_mesh):
cls.delete_data(old_mesh)
cls.clear_modifiers(obj)
cls.clear_cache(element)
change_data(obj, element, mesh)
@classmethod
def does_shape_has_openings(