Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-10 06:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

IFC Stair - added "Wood / Steel" stair type

Browse Source 
Added new stair type "Wood / Steel" to IFC Stair modifier. It's less sophisticated than "Concrete" stair type - it acts more like a "Dumb stair" operator we have.
This commit is contained in:
Andrej730
2022-11-11 17:32:57 +06:00
parent 31b633b8b6
commit 9dfd7e03f7
2 changed files with 92 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/prop.py
+21 -12
View File
@@ -273,15 +273,24 @@ class BIMStairProperties(PropertyGroup):
stair_type: bpy.props.EnumProperty(name="Stair type", items=stair_types, default="CONCRETE") stair_type: bpy.props.EnumProperty(name="Stair type", items=stair_types, default="CONCRETE")
def get_props_kwargs(self): def get_props_kwargs(self):
kwargs = { if self.stair_type == "CONCRETE":
"stair_type": self.stair_type, return {
"width": self.width, "stair_type": self.stair_type,
"height": self.height, "width": self.width,
"number_of_treads": self.number_of_treads, "height": self.height,
"tread_depth": self.tread_depth, "number_of_treads": self.number_of_treads,
"tread_run": self.tread_run, "tread_depth": self.tread_depth,
"base_slab_depth": self.base_slab_depth, "tread_run": self.tread_run,
"top_slab_depth": self.top_slab_depth, "base_slab_depth": self.base_slab_depth,
"has_top_nib": self.has_top_nib, "top_slab_depth": self.top_slab_depth,
} "has_top_nib": self.has_top_nib,
return kwargs }
elif self.stair_type == "WOOD/STEEL":
return {
"stair_type": self.stair_type,
"width": self.width,
"height": self.height,
"number_of_treads": self.number_of_treads,
"tread_depth": self.tread_depth,
"tread_run": self.tread_run,
}
src/blenderbim/blenderbim/bim/module/model/stair.py
+71 -50
View File
@@ -89,72 +89,93 @@ def generate_stair_2d_profile(
width, width,
tread_run, tread_run,
tread_depth, tread_depth,
has_top_nib,
top_slab_depth,
base_slab_depth,
stair_type, stair_type,
# CONCRETE STAIR ARGUMENTS
has_top_nib=None,
top_slab_depth=None,
base_slab_depth=None,
): ):
vertices = [] vertices = []
edges = [] edges = []
faces = []
number_of_risers = number_of_treads + 1 number_of_risers = number_of_treads + 1
tread_rise = height / number_of_risers tread_rise = height / number_of_risers
length = tread_run * number_of_risers length = tread_run * number_of_risers
for i in range(number_of_risers): if stair_type == "WOOD/STEEL":
vertices.extend([ for i in range(number_of_risers):
Vector((tread_run*i, 0, tread_rise*i)), v1 = Vector(((i + 1) * tread_run, 0, (i + 1) * tread_rise))
Vector((tread_run*i, 0, tread_rise*(i+1))) v0 = v1 - Vector((tread_run, 0, 0))
]) v2 = v1 - Vector((0, 0, tread_depth))
cur_vertex = i * 2 v3 = v0 - Vector((0, 0, tread_depth))
if i != 0: vertices.extend([v0, v1, v2, v3])
edges.append((cur_vertex - 1, cur_vertex))
edges.append((cur_vertex, cur_vertex + 1))
vertices.append(Vector((tread_run * number_of_risers, 0, tread_rise * number_of_risers))) cur_vertex = i * 4
edges.append((number_of_risers * 2, number_of_risers * 2 - 1)) edges.extend([
(cur_vertex, cur_vertex+1),
(cur_vertex+1, cur_vertex+2),
(cur_vertex+2, cur_vertex+3),
(cur_vertex+3, cur_vertex),
])
faces.append(list(range(4 * i, 4 * i + 1)))
td_vector = Vector((vertices[2][2], 0, -vertices[2][0])).normalized() * tread_depth return (vertices, edges, faces)
elif stair_type == "CONCRETE":
for i in range(number_of_risers):
vertices.extend([
Vector((tread_run*i, 0, tread_rise*i)),
Vector((tread_run*i, 0, tread_rise*(i+1)))
])
cur_vertex = i * 2
if i != 0:
edges.append((cur_vertex - 1, cur_vertex))
edges.append((cur_vertex, cur_vertex + 1))
k = tread_rise / tread_run vertices.append(Vector((tread_run * number_of_risers, 0, tread_rise * number_of_risers)))
s0 = vertices[0] + td_vector edges.append((number_of_risers * 2, number_of_risers * 2 - 1))
b = s0.z - k * s0.x # comes from y = kx + b
# you could use td_vector as depth_vector
# but then stair won't be perpendicular to the X+
# b is kind of vertical tread_depth (along Z+)
depth_vector = Vector((0, 0, b))
# top nib td_vector = Vector((vertices[2][2], 0, -vertices[2][0])).normalized() * tread_depth
if has_top_nib:
vertices.append( vertices[number_of_risers * 2] + Vector((0, 0, -top_slab_depth)) )
vertices.append( vertices[number_of_risers * 2] + Vector(((-top_slab_depth - b) / k, 0, -top_slab_depth)) )
last_vertex_i = len(vertices) - 1
edges.append( (number_of_risers * 2, last_vertex_i - 1) )
edges.append( (last_vertex_i - 1, last_vertex_i) )
else:
vertices.append(vertices[number_of_risers * 2] + depth_vector)
last_vertex_i = len(vertices) - 1
edges.append((number_of_risers * 2, last_vertex_i))
top_nib_end = len(vertices) - 1 k = tread_rise / tread_run
s0 = vertices[0] + td_vector
b = s0.z - k * s0.x # comes from y = kx + b
# you could use td_vector as depth_vector
# but then stair won't be perpendicular to the X+
# b is kind of vertical tread_depth (along Z+)
depth_vector = Vector((0, 0, b))
# bottom nib # top nib
if abs(b) <= base_slab_depth: if has_top_nib:
vertices.append(vertices[0] + depth_vector) vertices.append( vertices[number_of_risers * 2] + Vector((0, 0, -top_slab_depth)) )
edges.append((0, len(vertices) - 1)) vertices.append( vertices[number_of_risers * 2] + Vector(((-top_slab_depth - b) / k, 0, -top_slab_depth)) )
bottom_nib_end = len(vertices) - 1 last_vertex_i = len(vertices) - 1
else: edges.append( (number_of_risers * 2, last_vertex_i - 1) )
vertices.append(vertices[0] + Vector(((-base_slab_depth - b) / k, 0, -base_slab_depth))) edges.append( (last_vertex_i - 1, last_vertex_i) )
vertices.append(vertices[0] + Vector((0, 0, -base_slab_depth))) else:
last_vertex_i = len(vertices) - 1 vertices.append(vertices[number_of_risers * 2] + depth_vector)
edges.append( (0, last_vertex_i) ) last_vertex_i = len(vertices) - 1
edges.append( (last_vertex_i - 1, last_vertex_i) ) edges.append((number_of_risers * 2, last_vertex_i))
bottom_nib_end = len(vertices) - 2
edges.append( (bottom_nib_end, top_nib_end) ) top_nib_end = len(vertices) - 1
faces = [list(range(len(vertices)))]
return (vertices, edges, faces) # bottom nib
if abs(b) <= base_slab_depth:
vertices.append(vertices[0] + depth_vector)
edges.append((0, len(vertices) - 1))
bottom_nib_end = len(vertices) - 1
else:
vertices.append(vertices[0] + Vector(((-base_slab_depth - b) / k, 0, -base_slab_depth)))
vertices.append(vertices[0] + Vector((0, 0, -base_slab_depth)))
last_vertex_i = len(vertices) - 1
edges.append( (0, last_vertex_i) )
edges.append( (last_vertex_i - 1, last_vertex_i) )
bottom_nib_end = len(vertices) - 2
edges.append( (bottom_nib_end, top_nib_end) )
faces = [list(range(len(vertices)))]
return (vertices, edges, faces)
def update_stair_modifier(context): def update_stair_modifier(context):
@@ -177,7 +198,7 @@ def update_stair_modifier(context):
bmesh.ops.contextual_create(bm, geom=new_edges) bmesh.ops.contextual_create(bm, geom=new_edges)
bm.faces.ensure_lookup_table() bm.faces.ensure_lookup_table()
faces = [bm.faces[0]] faces = bm.faces
extruded = bmesh.ops.extrude_face_region(bm, geom=faces) extruded = bmesh.ops.extrude_face_region(bm, geom=faces)
extrusion_vector = Vector((0, 1, 0)) * props.width extrusion_vector = Vector((0, 1, 0)) * props.width
translate_verts = [v for v in extruded["geom"] if isinstance(v, BMVert)] translate_verts = [v for v in extruded["geom"] if isinstance(v, BMVert)]