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

Fix bug where false geolocation offsets did not take into account rotation.

Browse Source
This commit is contained in:
Dion Moult
2022-02-06 20:04:33 +11:00
parent f909adc2dc
commit b151ec2b0e
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/import_ifc.py
+16 -14
View File
@@ -452,7 +452,9 @@ class IfcImporter:
def apply_blender_offset_to_matrix_world(self, obj, matrix): def apply_blender_offset_to_matrix_world(self, obj, matrix):
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset: if props.has_blender_offset:
if self.is_point_far_away((matrix[0, 3], matrix[1, 3], matrix[2, 3])): if obj.data and obj.data.get("has_cartesian_point_offset", None):
obj.BIMObjectProperties.blender_offset_type = "CARTESIAN_POINT"
elif self.is_point_far_away((matrix[0, 3], matrix[1, 3], matrix[2, 3])):
obj.BIMObjectProperties.blender_offset_type = "OBJECT_PLACEMENT" obj.BIMObjectProperties.blender_offset_type = "OBJECT_PLACEMENT"
matrix = ifcopenshell.util.geolocation.global2local( matrix = ifcopenshell.util.geolocation.global2local(
matrix, matrix,
@@ -462,8 +464,6 @@ class IfcImporter:
float(props.blender_x_axis_abscissa), float(props.blender_x_axis_abscissa),
float(props.blender_x_axis_ordinate), float(props.blender_x_axis_ordinate),
) )
else:
obj.BIMObjectProperties.blender_offset_type = "CARTESIAN_POINT"
if self.ifc_import_settings.should_offset_model: if self.ifc_import_settings.should_offset_model:
matrix[0, 3] += self.ifc_import_settings.model_offset_coordinates[0] matrix[0, 3] += self.ifc_import_settings.model_offset_coordinates[0]
@@ -1510,20 +1510,22 @@ class IfcImporter:
and geometry.verts and geometry.verts
and self.is_point_far_away((geometry.verts[0], geometry.verts[1], geometry.verts[2])) and self.is_point_far_away((geometry.verts[0], geometry.verts[1], geometry.verts[2]))
): ):
ordinate_index = 0
verts = [None] * len(geometry.verts) verts = [None] * len(geometry.verts)
offset_point = ( for i in range(0, len(geometry.verts), 3):
float(props.blender_eastings) * self.unit_scale, verts[i], verts[i+1], verts[i+2] = ifcopenshell.util.geolocation.enh2xyz(
float(props.blender_northings) * self.unit_scale, geometry.verts[i],
float(props.blender_orthogonal_height) * self.unit_scale, geometry.verts[i+1],
) geometry.verts[i+2],
for i, vert in enumerate(geometry.verts): float(props.blender_eastings) * self.unit_scale,
if ordinate_index > 2: float(props.blender_northings) * self.unit_scale,
ordinate_index = 0 float(props.blender_orthogonal_height) * self.unit_scale,
verts[i] = vert - offset_point[ordinate_index] float(props.blender_x_axis_abscissa),
ordinate_index += 1 float(props.blender_x_axis_ordinate),
)
mesh["has_cartesian_point_offset"] = True
else: else:
verts = geometry.verts verts = geometry.verts
mesh["has_cartesian_point_offset"] = False
if geometry.faces: if geometry.faces:
num_vertices = len(verts) // 3 num_vertices = len(verts) // 3