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

use column-major reshape for matrices #4565

Browse Source
This commit is contained in:
Andrej730
2024-04-22 14:48:21 +05:00
parent 133b420a54
commit 0ddbcd98ea
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/import_ifc.py
+4 -3
View File
@@ -693,7 +693,7 @@ class IfcImporter:
shape = self.create_generic_shape(element) shape = self.create_generic_shape(element)
if not shape: if not shape:
continue continue
mat = np.array(shape.transformation.matrix).reshape((4,4)) mat = np.array(shape.transformation.matrix).reshape((4, 4), order="F")
point = np.array( point = np.array(
( (
shape.geometry.verts[0] / self.unit_scale, shape.geometry.verts[0] / self.unit_scale,
@@ -1150,7 +1150,8 @@ class IfcImporter:
self.link_element(element, obj) self.link_element(element, obj)
if shape: if shape:
mat = np.array(shape.transformation.matrix).reshape((4,4)) # We use numpy here because Blender mathutils.Matrix is not accurate enough
mat = np.array(shape.transformation.matrix).reshape((4, 4), order="F")
self.set_matrix_world(obj, self.apply_blender_offset_to_matrix_world(obj, mat)) self.set_matrix_world(obj, self.apply_blender_offset_to_matrix_world(obj, mat))
self.material_creator.create(element, obj, mesh) self.material_creator.create(element, obj, mesh)
elif mesh: elif mesh:
@@ -1886,7 +1887,7 @@ 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]))
): ):
mat = np.array(shape.transformation.matrix).reshape((4,4)) mat = np.array(shape.transformation.matrix).reshape((4, 4), order="F")
offset_point = np.linalg.inv(mat) @ np.array( offset_point = np.linalg.inv(mat) @ np.array(
( (
float(props.blender_eastings), float(props.blender_eastings),
src/ifcopenshell-python/ifcopenshell/util/placement.py
+1 -1
View File
@@ -73,7 +73,7 @@ def get_axis2placement(placement: ifcopenshell.entity_instance) -> MatrixType:
st = ifcopenshell.geom.settings() st = ifcopenshell.geom.settings()
st.set('convert-back-units', True) st.set('convert-back-units', True)
shp = ifcopenshell.geom.create_shape(st, placement) shp = ifcopenshell.geom.create_shape(st, placement)
return np.array(shp.matrix).reshape((4,4)) return np.array(shp.matrix).reshape((4, 4), order="F")
elif ifc_class == "IfcAxis2Placement2D": elif ifc_class == "IfcAxis2Placement2D":
z = np.array((0, 0, 1)) z = np.array((0, 0, 1))