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

Fix bug where grid axes didn't accommodate cartesian offsets

Browse Source
This commit is contained in:
Dion Moult
2024-06-09 16:52:26 +10:00
parent cdce612566
commit 6e0665bd31
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/import_ifc.py
+12 -7
View File
@@ -743,7 +743,12 @@ class IfcImporter:
def apply_blender_offset_to_matrix_world(self, obj: bpy.types.Object, matrix: np.ndarray) -> mathutils.Matrix: def apply_blender_offset_to_matrix_world(self, obj: bpy.types.Object, matrix: np.ndarray) -> mathutils.Matrix:
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset: if props.has_blender_offset:
if not obj.data and tool.Cad.is_x(matrix[0][3], 0) and tool.Cad.is_x(matrix[1][3], 0) and tool.Cad.is_x(matrix[2][3], 0): if (
not obj.data
and tool.Cad.is_x(matrix[0][3], 0)
and tool.Cad.is_x(matrix[1][3], 0)
and tool.Cad.is_x(matrix[2][3], 0)
):
# We assume any non-geometric matrix at 0,0,0 is not # We assume any non-geometric matrix at 0,0,0 is not
# positionally significant and is left alone. This handles # positionally significant and is left alone. This handles
# scenarios where often spatial elements are left at 0,0,0 and # scenarios where often spatial elements are left at 0,0,0 and
@@ -796,6 +801,7 @@ class IfcImporter:
if grid.Representation: if grid.Representation:
shape = self.create_generic_shape(grid) shape = self.create_generic_shape(grid)
grid_obj = self.create_product(grid, shape) grid_obj = self.create_product(grid, shape)
grid_placement = self.get_element_matrix(grid)
if bpy.context.preferences.addons["blenderbim"].preferences.lock_grids_on_import: if bpy.context.preferences.addons["blenderbim"].preferences.lock_grids_on_import:
grid_obj.lock_location = (True, True, True) grid_obj.lock_location = (True, True, True)
grid_obj.lock_rotation = (True, True, True) grid_obj.lock_rotation = (True, True, True)
@@ -804,14 +810,14 @@ class IfcImporter:
collection.children.link(u_axes) collection.children.link(u_axes)
v_axes = bpy.data.collections.new("VAxes") v_axes = bpy.data.collections.new("VAxes")
collection.children.link(v_axes) collection.children.link(v_axes)
self.create_grid_axes(grid.UAxes, u_axes, grid_obj) self.create_grid_axes(grid.UAxes, grid_obj, grid_placement)
self.create_grid_axes(grid.VAxes, v_axes, grid_obj) self.create_grid_axes(grid.VAxes, grid_obj, grid_placement)
if grid.WAxes: if grid.WAxes:
w_axes = bpy.data.collections.new("WAxes") w_axes = bpy.data.collections.new("WAxes")
collection.children.link(w_axes) collection.children.link(w_axes)
self.create_grid_axes(grid.WAxes, w_axes, grid_obj) self.create_grid_axes(grid.WAxes, grid_obj)
def create_grid_axes(self, axes, grid_collection, grid_obj): def create_grid_axes(self, axes, grid_obj, grid_placement):
for axis in axes: for axis in axes:
shape = self.create_generic_shape(axis.AxisCurve) shape = self.create_generic_shape(axis.AxisCurve)
mesh = self.create_mesh(axis, shape) mesh = self.create_mesh(axis, shape)
@@ -820,8 +826,7 @@ class IfcImporter:
obj.lock_location = (True, True, True) obj.lock_location = (True, True, True)
obj.lock_rotation = (True, True, True) obj.lock_rotation = (True, True, True)
self.link_element(axis, obj) self.link_element(axis, obj)
self.set_matrix_world(obj, grid_obj.matrix_world) self.set_matrix_world(obj, self.apply_blender_offset_to_matrix_world(obj, grid_placement.copy()))
grid_collection.objects.link(obj)
def create_element_types(self): def create_element_types(self):
for element_type in self.element_types: for element_type in self.element_types: