conditioning combine options

This commit is contained in:
kijai 2024-10-14 11:26:00 +03:00
parent 2fbed0575d
commit fb2f09651b

View File

@ -191,6 +191,7 @@ class ConditioningMultiCombine:
return { return {
"required": { "required": {
"inputcount": ("INT", {"default": 2, "min": 2, "max": 20, "step": 1}), "inputcount": ("INT", {"default": 2, "min": 2, "max": 20, "step": 1}),
"operation": (["combine", "concat"], {"default": "combine"}),
"conditioning_1": ("CONDITIONING", ), "conditioning_1": ("CONDITIONING", ),
"conditioning_2": ("CONDITIONING", ), "conditioning_2": ("CONDITIONING", ),
}, },
@ -204,13 +205,18 @@ class ConditioningMultiCombine:
Combines multiple conditioning nodes into one Combines multiple conditioning nodes into one
""" """
def combine(self, inputcount, **kwargs): def combine(self, inputcount, operation, **kwargs):
from nodes import ConditioningCombine from nodes import ConditioningCombine
from nodes import ConditioningConcat
cond_combine_node = ConditioningCombine() cond_combine_node = ConditioningCombine()
cond_concat_node = ConditioningConcat()
cond = kwargs["conditioning_1"] cond = kwargs["conditioning_1"]
for c in range(1, inputcount): for c in range(1, inputcount):
new_cond = kwargs[f"conditioning_{c + 1}"] new_cond = kwargs[f"conditioning_{c + 1}"]
cond = cond_combine_node.combine(new_cond, cond)[0] if operation == "combine":
cond = cond_combine_node.combine(new_cond, cond)[0]
elif operation == "concat":
cond = cond_concat_node.concat(cond, new_cond)[0]
return (cond, inputcount,) return (cond, inputcount,)