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

Fixed #3262

Browse Source
This commit is contained in:
Andrej730
2023-07-31 15:17:45 +05:00
parent 60d62c2dd4
commit 81dc68d11d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/geometry/add_railing_representation.py
+6 -6
View File
@@ -210,21 +210,21 @@ class Usecase:
def add_cap(railing_coords, arc_points, start=False): def add_cap(railing_coords, arc_points, start=False):
"""add handrail terminal cap""" """add handrail terminal cap"""
# TODO: implement more cap types
railing_coords_for_cap = railing_coords[::-1] if start else railing_coords railing_coords_for_cap = railing_coords[::-1] if start else railing_coords
start_point = railing_coords_for_cap[-1] start_point = railing_coords_for_cap[-1]
cap_dir = (railing_coords_for_cap[-1] - railing_coords_for_cap[-2]).xy.to_3d().normalized() cap_dir = (railing_coords_for_cap[-1] - railing_coords_for_cap[-2]).to_3d().normalized()
ortho_dir = (cap_dir.yx * V(1, -1)).to_3d().normalized() ortho_dir = (cap_dir.yx * V(1, -1)).to_3d().normalized()
local_z_down = cap_dir.cross(ortho_dir)
if start: if start:
ortho_dir = -ortho_dir ortho_dir = -ortho_dir
arc_middle_point_cos = sin(radians(45)) arc_middle_point_cos = sin(radians(45))
if cap_type in ("180", "TO_END_POST"): if cap_type in ("180", "TO_END_POST"):
arc_point = start_point + cap_dir * terminal_radius + terminal_radius * z_down arc_point = start_point + cap_dir * terminal_radius + terminal_radius * local_z_down
arc_points.append(arc_point) arc_points.append(arc_point)
cap_coords = [arc_point, start_point + terminal_radius * 2 * z_down] cap_coords = [arc_point, start_point + terminal_radius * 2 * local_z_down]
if cap_type == "TO_END_POST": if cap_type == "TO_END_POST":
end_point = railing_coords_for_cap[-2].copy() end_point = railing_coords_for_cap[-2].copy()
@@ -255,7 +255,7 @@ class Usecase:
] ]
elif cap_type == "TO_END_POST_AND_FLOOR": elif cap_type == "TO_END_POST_AND_FLOOR":
first_arc_end = start_point + cap_dir * terminal_radius + terminal_radius * z_down first_arc_end = start_point + cap_dir * terminal_radius + terminal_radius * local_z_down
first_arc_coords = get_fillet_points( first_arc_coords = get_fillet_points(
start_point, start_point + cap_dir * terminal_radius, first_arc_end, terminal_radius start_point, start_point + cap_dir * terminal_radius, first_arc_end, terminal_radius
) )
@@ -264,7 +264,7 @@ class Usecase:
end_point = railing_coords_for_cap[-2].copy() end_point = railing_coords_for_cap[-2].copy()
end_point.z -= height end_point.z -= height
second_arc_coords = get_fillet_points( second_arc_coords = get_fillet_points(
first_arc_end, first_arc_end + z_down * terminal_radius, end_point, terminal_radius first_arc_end, first_arc_end + local_z_down * terminal_radius, end_point, terminal_radius
) )
arc_points.append(second_arc_coords[1]) arc_points.append(second_arc_coords[1])
cap_coords = [start_point] + first_arc_coords + second_arc_coords + [end_point] cap_coords = [start_point] + first_arc_coords + second_arc_coords + [end_point]