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

Door modifier - double doors type support

Browse Source
This commit is contained in:
Andrej730
2023-02-11 14:55:07 +05:00
parent d4eb56e360
commit 0d0691a012
4 changed files with 153 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/door.py
+47 -30
View File
@@ -253,6 +253,7 @@ def update_door_modifier_bmesh(context):
overall_height = props.overall_height * si_conversion
door_type = props.door_type
double_swing_door = "DOUBLE_SWING" in door_type
double_door = "DOUBLE_DOOR" in door_type
# lining params
lining_depth = props.lining_depth * si_conversion
@@ -340,39 +341,55 @@ def update_door_modifier_bmesh(context):
inner_casing_verts = create_bm_door_lining(bm, casing_size, inner_casing_thickness, inner_casing_position)
casing_verts.extend(inner_casing_verts)
# add door panel
def create_bm_door_panel(panel_size, panel_position, door_swing_type):
door_verts = []
# add door panel
door_verts.extend(create_bm_box(bm, panel_size, panel_position))
# add door handle
handle_points = [
V(0, 0, 0),
V(0, -handle_size.y, 0),
V(handle_size.x, -handle_size.y, 0),
V(handle_size.x, -handle_size.y / 2, 0),
V(handle_size.y / 2, -handle_size.y / 2, 0),
V(handle_size.y / 2, 0, 0),
]
handle_position = panel_position + handle_offset - handle_center_offset
door_handle_verts = create_bm_extruded_profile(
bm, handle_points, magnitude=handle_size.z, position=handle_position
)
door_verts.extend(door_handle_verts)
if door_swing_type == "LEFT":
bm_mirror(
bm, door_handle_verts, mirror_axes=V(1, 0, 0), mirror_point=panel_position + V(panel_size.x / 2, 0, 0)
)
door_handle_mirrored_verts = bm_mirror(
bm,
door_handle_verts,
mirror_axes=V(0, 1, 0),
mirror_point=handle_position + V(0, panel_size.y / 2, 0),
create_copy=True,
)
door_verts.extend(door_handle_mirrored_verts)
return door_verts
door_verts = []
panel_size = V(panel_width, panel_depth, panel_height)
panel_position = V(lining_to_panel_offset_x, lining_to_panel_offset_y, threshold_thickness)
panel_verts = create_bm_box(bm, panel_size, panel_position)
# add door handle
door_handles_verts = []
handle_points = [
V(0, 0, 0),
V(0, -handle_size.y, 0),
V(handle_size.x, -handle_size.y, 0),
V(handle_size.x, -handle_size.y / 2, 0),
V(handle_size.y / 2, -handle_size.y / 2, 0),
V(handle_size.y / 2, 0, 0),
]
handle_position = panel_position + handle_offset - handle_center_offset
door_handle_verts = create_bm_extruded_profile(bm, handle_points, magnitude=handle_size.z, position=handle_position)
door_handles_verts.extend(door_handle_verts)
if double_door:
# TODO: keep a little space between doors for readibility?
double_door_offset = 0.001 * si_conversion
panel_size.x = panel_size.x / 2 - double_door_offset
door_verts.extend(create_bm_door_panel(panel_size, panel_position, "LEFT"))
if door_type.endswith("LEFT"):
bm_mirror(
bm, door_handle_verts, mirror_axes=V(1, 0, 0), mirror_point=panel_position + V(panel_size.x / 2, 0, 0)
)
# TODO: test it
door_handle_mirrored_verts = bm_mirror(
bm,
door_handle_verts,
mirror_axes=V(0, 1, 0),
mirror_point=handle_position + V(0, panel_size.y / 2, 0),
create_copy=True,
)
door_handles_verts.extend(door_handle_mirrored_verts)
mirror_point = panel_position + V(door_opening_width / 2, 0, 0)
door_verts.extend(bm_mirror(bm, door_verts, V(1, 0, 0), mirror_point, create_copy=True))
else:
door_swing_type = "LEFT" if door_type.endswith("LEFT") else "RIGHT"
door_verts.extend(create_bm_door_panel(panel_size, panel_position, door_swing_type))
# add on top window
if not transom_thickness:
@@ -402,7 +419,7 @@ def update_door_modifier_bmesh(context):
window_position,
)
lining_offset_verts = lining_verts + panel_verts + window_lining_verts + frame_verts + glass_verts
lining_offset_verts = lining_verts + door_verts + window_lining_verts + frame_verts + glass_verts
bmesh.ops.translate(bm, vec=V(0, lining_offset, 0), verts=lining_offset_verts)
bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
src/blenderbim/blenderbim/bim/module/model/prop.py
+2
View File
@@ -442,6 +442,8 @@ class BIMDoorProperties(PropertyGroup):
("SINGLE_SWING_RIGHT", "SINGLE_SWING_RIGHT", ""),
("DOUBLE_SWING_LEFT", "DOUBLE_SWING_LEFT", ""),
("DOUBLE_SWING_RIGHT", "DOUBLE_SWING_RIGHT", ""),
("DOUBLE_DOOR_SINGLE_SWING", "DOUBLE_DOOR_SINGLE_SWING", ""),
("DOUBLE_DOOR_DOUBLE_SWING", "DOUBLE_DOOR_DOUBLE_SWING", ""),
)
door_added_previously: bpy.props.BoolProperty(default=False)
src/ifcopenshell-python/ifcopenshell/api/geometry/add_door_representation.py
+103 -49
View File
@@ -24,7 +24,14 @@ from mathutils import Vector
import collections
SUPPORTED_DOOR_TYPES = ("SINGLE_SWING_LEFT", "SINGLE_SWING_RIGHT", "DOUBLE_SWING_RIGHT", "DOUBLE_SWING_LEFT")
SUPPORTED_DOOR_TYPES = (
"SINGLE_SWING_LEFT",
"SINGLE_SWING_RIGHT",
"DOUBLE_SWING_RIGHT",
"DOUBLE_SWING_LEFT",
"DOUBLE_DOOR_SINGLE_SWING",
"DOUBLE_DOOR_DOUBLE_SWING",
)
def create_ifc_door_lining(
@@ -138,6 +145,7 @@ class Usecase:
overall_width = self.settings["overall_width"]
door_type = self.settings["operation_type"]
double_swing_door = "DOUBLE_SWING" in door_type
double_door = "DOUBLE_DOOR" in door_type
if door_type not in SUPPORTED_DOOR_TYPES:
raise NotImplementedError(f'Door type "{door_type}" is not currently supported.')
@@ -235,27 +243,53 @@ class Usecase:
)
# TODO: make second swing lines dashed
# create semi-semi-circle
if double_swing_door:
trim_points_mask = (3, 1)
second_swing_line = builder.polyline((V(0, 0), V(0, -panel_width), V(panel_depth, -panel_width)))
door_items.append(second_swing_line)
def create_ifc_door_panel_2d(panel_size, panel_position, door_swing_type):
door_items = []
panel_size = panel_size.yx
# create semi-semi-circle
if double_swing_door:
trim_points_mask = (3, 1)
second_swing_line = builder.polyline(
points=(V(0, 0), V(0, -panel_size.y), V(panel_size.x, -panel_size.y))
)
door_items.append(second_swing_line)
else:
trim_points_mask = (0, 1)
semicircle = builder.create_ellipse_curve(
panel_size.y - panel_size.x,
panel_size.y,
trim_points_mask=trim_points_mask,
position=V(panel_size.x, 0),
)
door_items.append(semicircle)
# create door
door = builder.rectangle(panel_size)
door_items.append(door)
builder.translate(door_items, panel_position)
if door_swing_type == "RIGHT":
mirror_point = panel_position + V(panel_size.y / 2, 0)
builder.mirror(door_items, mirror_axes=V(1, 0), mirror_point=mirror_point)
return door_items
door_items = []
panel_size = V(panel_width, panel_depth)
panel_position = V(lining_to_panel_offset_x, lining_depth)
if double_door:
panel_size.x = panel_size.x / 2
door_items.extend(create_ifc_door_panel_2d(panel_size, panel_position, "LEFT"))
mirror_point = panel_position + V(door_opening_width / 2, 0)
door_items.extend(
builder.mirror(door_items, mirror_axes=V(1, 0), mirror_point=mirror_point, create_copy=True)
)
else:
trim_points_mask = (0, 1)
semicircle = builder.create_ellipse_curve(
panel_width - panel_depth, panel_width, trim_points_mask=trim_points_mask, position=V(panel_depth, 0)
)
door_items.append(semicircle)
# create door
door = builder.rectangle(V(panel_depth, panel_width))
door_items.append(door)
builder.translate(door_items, V(lining_to_panel_offset_x, lining_depth))
if door_type == "SINGLE_SWING_RIGHT":
builder.mirror(door_items, mirror_axes=V(1, 0), mirror_point=V(overall_width / 2, 0))
items_2d += door_items
door_swing_type = "LEFT" if door_type.endswith("LEFT") else "RIGHT"
door_items.extend(create_ifc_door_panel_2d(panel_size, panel_position, door_swing_type))
items_2d.extend(door_items)
representation_2d = builder.get_representation(self.settings["context"], items_2d)
return representation_2d
@@ -309,35 +343,57 @@ class Usecase:
inner_casing = create_ifc_door_lining(builder, casing_size, inner_casing_thickness, inner_casing_position)
casing_items.append(inner_casing)
# add door panel
def create_ifc_door_panel(panel_size, panel_position, door_swing_type):
door_items = []
# add door panel
door_items.append(create_ifc_box(builder, panel_size, panel_position))
# add door handle
handle_points = [
V(0, 0),
V(0, -handle_size.y),
V(handle_size.x, -handle_size.y),
V(handle_size.x, -handle_size.y / 2),
V(handle_size.y / 2, -handle_size.y / 2),
V(handle_size.y / 2, 0),
]
handle_polyline = builder.polyline(handle_points, closed=True)
handle_position = panel_position + handle_offset - handle_center_offset
door_handle = builder.extrude(handle_polyline, handle_size.z, position=handle_position)
door_items.append(door_handle)
if door_swing_type == "LEFT":
builder.mirror(
door_handle, mirror_axes=V(1, 0), mirror_point=panel_position.xy + V(panel_size.x / 2, 0)
)
door_handle_mirrored = builder.mirror(
door_handle,
mirror_axes=V(0, 1),
mirror_point=handle_position.xy + V(0, panel_size.y / 2),
create_copy=True,
)
door_items.append(door_handle_mirrored)
return door_items
door_items = []
panel_size = V(panel_width, panel_depth, panel_height)
panel_position = V(lining_to_panel_offset_x, lining_to_panel_offset_y_full, threshold_thickness)
panel_items = [create_ifc_box(builder, panel_size, panel_position)]
# add door handle
door_handles_items = []
handle_points = [
V(0, 0),
V(0, -handle_size.y),
V(handle_size.x, -handle_size.y),
V(handle_size.x, -handle_size.y / 2),
V(handle_size.y / 2, -handle_size.y / 2),
V(handle_size.y / 2, 0),
]
handle_polyline = builder.polyline(handle_points, closed=True)
if double_door:
# TODO: keep a little space between doors for readibility?
double_door_offset = self.convert_si_to_unit(0.001)
panel_size.x = panel_size.x / 2 - double_door_offset
door_items.extend(create_ifc_door_panel(panel_size, panel_position, "LEFT"))
handle_position = panel_position + handle_offset - handle_center_offset
door_handle = builder.extrude(handle_polyline, handle_size.z, position=handle_position)
door_handles_items.append(door_handle)
if door_type.endswith("LEFT"):
builder.mirror(door_handle, mirror_axes=V(1, 0), mirror_point=panel_position.xy + V(panel_size.x / 2, 0))
door_handle_mirrored = builder.mirror(
door_handle, mirror_axes=V(0, 1), mirror_point=handle_position.xy + V(0, panel_size.y / 2), create_copy=True
)
door_handles_items.append(door_handle_mirrored)
mirror_point = panel_position + V(door_opening_width / 2, 0, 0)
door_items.extend(
builder.mirror(door_items, mirror_axes=V(1, 0), mirror_point=mirror_point.xy, create_copy=True)
)
else:
door_swing_type = "LEFT" if door_type.endswith("LEFT") else "RIGHT"
door_items.extend(create_ifc_door_panel(panel_size, panel_position, door_swing_type))
# add on top window
if not transom_thickness:
@@ -367,9 +423,7 @@ class Usecase:
window_position,
)
lining_offset_items = (
lining_items + panel_items + window_lining_items + frame_items + glass_items + door_handles_items
)
lining_offset_items = lining_items + door_items + window_lining_items + frame_items + glass_items
builder.translate(lining_offset_items, V(0, lining_offset, 0))
output_items = lining_offset_items + threshold_items + casing_items
src/ifcopenshell-python/ifcopenshell/util/shape_builder.py
+1 -1
View File
@@ -344,7 +344,7 @@ class ShapeBuilder:
):
"""mirror_axes - along which axes mirror will be applied
For example, mirroring A(1,0) by axis (1,0) will result in A'(-1,0)
For example, mirroring `A(1,0)` by axis `(1,0)` will result in `A'(-1,0)`
"""
# > curve_or_item - could be a list of curves or items
# > mirror_axes - could be a list of mirrors to apply to curve_or_item