Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 11:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where large resizing of walls could result in broken geometry.

Browse Source
This commit is contained in:
Dion Moult
2021-10-22 15:21:26 +11:00
parent a5b8728aec
commit f19e334cd5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/wall.py
+10 -5
View File
@@ -76,7 +76,7 @@ class JoinWall(bpy.types.Operator):
bl_options = {"REGISTER", "UNDO"} bl_options = {"REGISTER", "UNDO"}
bl_description = """ Trim/Extend the selected walls to the last selected wall: bl_description = """ Trim/Extend the selected walls to the last selected wall:
'T' mode: Trim/Extend to the virtual projection 'T' mode: Trim/Extend to the virtual projection
'L' mode: Chamfer the walls 'L' mode: Chamfer the walls
'V' mode: Chamfer the walls keeping the angle""" 'V' mode: Chamfer the walls keeping the angle"""
join_type: bpy.props.StringProperty() join_type: bpy.props.StringProperty()
@@ -121,7 +121,7 @@ class AlignWall(bpy.types.Operator):
bl_label = "Align Wall" bl_label = "Align Wall"
bl_options = {"REGISTER", "UNDO"} bl_options = {"REGISTER", "UNDO"}
bl_description = """ Align the selected walls to the last selected wall: bl_description = """ Align the selected walls to the last selected wall:
'Ext.': align to the EXTERIOR face 'Ext.': align to the EXTERIOR face
'C/L': align to wall CENTERLINE 'C/L': align to wall CENTERLINE
'Int.': align to the INTERIOR face""" 'Int.': align to the INTERIOR face"""
align_type: bpy.props.StringProperty() align_type: bpy.props.StringProperty()
@@ -965,8 +965,11 @@ class DumbWallPlaner:
min_face, max_face = self.get_wall_end_faces(obj, bm) min_face, max_face = self.get_wall_end_faces(obj, bm)
self.thicken_face(min_face, delta_thickness) verts_to_move = []
self.thicken_face(max_face, delta_thickness) verts_to_move.extend(self.thicken_face(min_face, delta_thickness))
verts_to_move.extend(self.thicken_face(max_face, delta_thickness))
for vert_to_move in verts_to_move:
vert_to_move["vert"].co += vert_to_move["vector"]
bm.to_mesh(obj.data) bm.to_mesh(obj.data)
obj.data.update() obj.data.update()
@@ -975,6 +978,7 @@ class DumbWallPlaner:
def thicken_face(self, face, delta_thickness): def thicken_face(self, face, delta_thickness):
slide_magnitude = abs(delta_thickness) slide_magnitude = abs(delta_thickness)
results = []
for vert in face.verts: for vert in face.verts:
slide_vector = None slide_vector = None
for edge in vert.link_edges: for edge in vert.link_edges:
@@ -994,7 +998,8 @@ class DumbWallPlaner:
if not slide_vector: if not slide_vector:
continue continue
slide_vector *= slide_magnitude / abs(slide_vector.y) slide_vector *= slide_magnitude / abs(slide_vector.y)
vert.co += slide_vector results.append({"vert":vert, "vector":slide_vector})
return results
# An end face is a quad that is on one end of the wall or the other. It must # An end face is a quad that is on one end of the wall or the other. It must
# have at least one vertex on either extreme X-axis, and a non-insignificant # have at least one vertex on either extreme X-axis, and a non-insignificant