Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-10-03 21:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

black format

Browse Source
This commit is contained in:
Andrej730
2023-05-31 12:06:03 +05:00
parent 6354a11645
commit c6090ef9b3
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/model/prop.py
+9 -1
View File
@@ -564,7 +564,15 @@ class BIMRailingProperties(PropertyGroup):
class BIMRoofProperties(PropertyGroup): class BIMRoofProperties(PropertyGroup):
non_si_units_props = ("is_editing", "path_data", "roof_type", "roof_added_previously", "generation_method", "angle", "rafter_edge_angle") non_si_units_props = (
"is_editing",
"path_data",
"roof_type",
"roof_added_previously",
"generation_method",
"angle",
"rafter_edge_angle",
)
roof_types = (("HIP/GABLE ROOF", "HIP/GABLE ROOF", ""),) roof_types = (("HIP/GABLE ROOF", "HIP/GABLE ROOF", ""),)
roof_generation_methods = ( roof_generation_methods = (
("HEIGHT", "HEIGHT", ""), ("HEIGHT", "HEIGHT", ""),
src/blenderbim/blenderbim/bim/module/model/roof.py
+18 -6
View File
@@ -108,7 +108,9 @@ def is_valid_roof_footprint(bm):
return ({"FINISHED"}, "") return ({"FINISHED"}, "")
def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, roof_thickness = 0.1, angle=pi / 18, rafter_edge_angle = pi / 2, mutate_current_bmesh=True): def generate_hiped_roof_bmesh(
bm, mode="ANGLE", height=1.0, roof_thickness=0.1, angle=pi / 18, rafter_edge_angle=pi / 2, mutate_current_bmesh=True
):
"""return bmesh with gable roof geometry """return bmesh with gable roof geometry
`mutate_current_bmesh` is a flag to indicate whether the input bmesh `mutate_current_bmesh` is a flag to indicate whether the input bmesh
@@ -371,7 +373,6 @@ def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, roof_thickness = 0.1
# for different rafter edge angles # for different rafter edge angles
v.co = mathutils.geometry.intersect_line_line(bot, top, base, offsetted)[0] v.co = mathutils.geometry.intersect_line_line(bot, top, base, offsetted)[0]
verts = [v for v in extruded_verts if v not in footprint_verts] verts = [v for v in extruded_verts if v not in footprint_verts]
bmesh.ops.translate(bm, vec=default_offset_dir, verts=verts) bmesh.ops.translate(bm, vec=default_offset_dir, verts=verts)
bmesh.ops.recalc_face_normals(bm, faces=bm.faces[:]) bmesh.ops.recalc_face_normals(bm, faces=bm.faces[:])
@@ -454,8 +455,14 @@ def update_roof_modifier_bmesh(context):
return return
generate_hiped_roof_bmesh( generate_hiped_roof_bmesh(
bm, props.generation_method, props.height, props.roof_thickness, bm,
props.angle, props.rafter_edge_angle, mutate_current_bmesh=True) props.generation_method,
props.height,
props.roof_thickness,
props.angle,
props.rafter_edge_angle,
mutate_current_bmesh=True,
)
tool.Blender.apply_bmesh(obj.data, bm) tool.Blender.apply_bmesh(obj.data, bm)
@@ -675,8 +682,13 @@ class EnableEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
main_bm.edges.layers.int.new("BBIM_preview") main_bm.edges.layers.int.new("BBIM_preview")
second_bm = generate_hiped_roof_bmesh( second_bm = generate_hiped_roof_bmesh(
bm,props.generation_method, props.height, props.roof_thickness, bm,
props.angle, props.rafter_edge_angle, mutate_current_bmesh=False props.generation_method,
props.height,
props.roof_thickness,
props.angle,
props.rafter_edge_angle,
mutate_current_bmesh=False,
) )
bmesh.ops.translate(second_bm, verts=second_bm.verts, vec=Vector((0, 0, 1))) bmesh.ops.translate(second_bm, verts=second_bm.verts, vec=Vector((0, 0, 1)))