Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(writer): Copy xml file to bsdf folder if modifier is aBSDF #776

Merged
merged 1 commit into from
Oct 5, 2022
Merged

fix(writer): Copy xml file to bsdf folder if modifier is aBSDF #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions honeybee_radiance/properties/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from ..dynamic.group import DynamicShadeGroup, DynamicSubFaceGroup
from ..modifierset import ModifierSet
from ..mutil import dict_to_modifier # imports all modifiers classes
from ..modifier.material import BSDF
from ..modifier.material import aBSDF, BSDF
from ..lib.modifiers import black, generic_context
from ..lib.modifiersets import generic_modifier_set_visible

Expand Down Expand Up @@ -177,7 +177,7 @@ def bsdf_modifiers(self):
Model.blk_modifiers.
"""
all_mods = self.modifiers + self.blk_modifiers
return list(set(mod for mod in all_mods if isinstance(mod, BSDF)))
return list(set(mod for mod in all_mods if isinstance(mod, (aBSDF, BSDF))))

@property
def modifier_sets(self):
Expand Down
6 changes: 3 additions & 3 deletions honeybee_radiance/writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import honeybee_radiance_folder.config as folder_config

from .geometry import Polygon
from .modifier.material import BSDF
from .modifier.material import aBSDF, BSDF
from .lib.modifiers import black

import os
Expand Down Expand Up @@ -675,12 +675,12 @@ def _write_static_files(
mod_strs = []
mod_blk_strs = []
for mod in modifiers:
if isinstance(mod, BSDF):
if isinstance(mod, (aBSDF, BSDF)):
_process_bsdf_modifier(mod, mod_strs, minimal)
else:
mod_strs.append(mod.to_radiance(minimal))
for mod in modifiers_blk:
if isinstance(mod, BSDF):
if isinstance(mod, (aBSDF, BSDF)):
_process_bsdf_modifier(mod, mod_strs, minimal)
else:
mod_blk_strs.append(mod.to_radiance(minimal))
Expand Down