mirrors/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-09-15 05:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed node, attempted update cond list

Browse Source
This commit is contained in:
FizzleDorf
2023-04-19 13:02:21 -04:00
parent 41a5cd83b3
commit 132464db38
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nodes.py
View File

@@ -58,7 +58,7 @@ class ConditioningCombine:
def combine(self, conditioning_1, conditioning_2): def combine(self, conditioning_1, conditioning_2):
return (conditioning_1 + conditioning_2, ) return (conditioning_1 + conditioning_2, )
class ConditioningAddWeighted: class ConditioningAverage :
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": {"conditioning_from": ("CONDITIONING", ), "conditioning_to": ("CONDITIONING", ), return {"required": {"conditioning_from": ("CONDITIONING", ), "conditioning_to": ("CONDITIONING", ),
@@ -70,6 +70,13 @@ class ConditioningAddWeighted:
CATEGORY = "conditioning" CATEGORY = "conditioning"
#def applyConditions(self, conditioning_from, conditioning_to, conditioning_from_strength, conditioning_to_strength):
# c = []
# for t in conditioning_from:
# averaged = self.averageConditioning(t[0], conditioning_to, conditioning_from_strength, conditioning_to_strength)
# n = [averaged, t[1].clone()]
# c.append(n)
# return (c, )
def addWeighted(self, conditioning_from, conditioning_to, conditioning_from_strength, conditioning_to_strength): def addWeighted(self, conditioning_from, conditioning_to, conditioning_from_strength, conditioning_to_strength):
conditioning_from_tensor = conditioning_from[0][0] conditioning_from_tensor = conditioning_from[0][0]
@@ -1104,7 +1111,7 @@ NODE_CLASS_MAPPINGS = {
"ImageScale": ImageScale, "ImageScale": ImageScale,
"ImageInvert": ImageInvert, "ImageInvert": ImageInvert,
"ImagePadForOutpaint": ImagePadForOutpaint, "ImagePadForOutpaint": ImagePadForOutpaint,
"ConditioningAddWeighted": ConditioningAddWeighted, "ConditioningAverage ": ConditioningAverage ,
"ConditioningCombine": ConditioningCombine, "ConditioningCombine": ConditioningCombine,
"ConditioningSetArea": ConditioningSetArea, "ConditioningSetArea": ConditioningSetArea,
"KSamplerAdvanced": KSamplerAdvanced, "KSamplerAdvanced": KSamplerAdvanced,
@@ -1152,7 +1159,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"CLIPTextEncode": "CLIP Text Encode (Prompt)", "CLIPTextEncode": "CLIP Text Encode (Prompt)",
"CLIPSetLastLayer": "CLIP Set Last Layer", "CLIPSetLastLayer": "CLIP Set Last Layer",
"ConditioningCombine": "Conditioning (Combine)", "ConditioningCombine": "Conditioning (Combine)",
"ConditioningAddWeighted": "Conditioning (Weighted Combine)", "ConditioningAverage ": "Conditioning (Average)",
"ConditioningSetArea": "Conditioning (Set Area)", "ConditioningSetArea": "Conditioning (Set Area)",
"ControlNetApply": "Apply ControlNet", "ControlNetApply": "Apply ControlNet",
# Latent # Latent