xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-13 14:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge e07e7b90ce83b3f9180a2aabe67068d8bd05bf60 into daa1565b931ac1b65319622533fe63375cd57a63

Browse Source
This commit is contained in:
Papa 2024-10-30 13:18:13 -04:00 committed by GitHub
commit bf3df0a568
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nodes.py
View File

@ -1746,6 +1746,50 @@ class ImageBatch:
image2 = comfy.utils.common_upscale(image2.movedim(-1,1), image1.shape[2], image1.shape[1], "bilinear", "center").movedim(1,-1)
s = torch.cat((image1, image2), dim=0)
return (s,)
class ImageBatchPlus:
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"image1": ("IMAGE",),
"image2": ("IMAGE",),
"method": (["nearest-exact", "bilinear", "area", "bicubic", "lanczos"], { "default": "lanczos" }),
}, "optional": {
"image3": ("IMAGE",),
"image4": ("IMAGE",),
"image5": ("IMAGE",),
"image6": ("IMAGE",),
},
}
RETURN_TYPES = ("IMAGE",)
FUNCTION = "batch"
CATEGORY = "image"
def batch(self, image1, method, image2, image3=None, image4=None, image5=None, image6=None):
if image1.shape[1:] != image2.shape[1:]:
image2 = comfy.utils.common_upscale(image2.movedim(-1,1), image1.shape[2], image1.shape[1], method, "center").movedim(1,-1)
s = torch.cat((image1, image2), dim=0)
if image3 is not None:
if image1.shape[1:] != image3.shape[1:]:
image3 = comfy.utils.common_upscale(image3.movedim(-1,1), image1.shape[2], image1.shape[1], method, "center").movedim(1,-1)
s = torch.cat((s, image3), dim=0)
if image4 is not None:
if image1.shape[1:] != image4.shape[1:]:
image4 = comfy.utils.common_upscale(image4.movedim(-1,1), image1.shape[2], image1.shape[1], method, "center").movedim(1,-1)
s = torch.cat((s, image4), dim=0)
if image5 is not None:
if image1.shape[1:] != image5.shape[1:]:
image5 = comfy.utils.common_upscale(image5.movedim(-1,1), image1.shape[2], image1.shape[1], method, "center").movedim(1,-1)
s = torch.cat((s, image5), dim=0)
if image6 is not None:
if image1.shape[1:] != image6.shape[1:]:
image6 = comfy.utils.common_upscale(image6.movedim(-1,1), image1.shape[2], image1.shape[1], method, "center").movedim(1,-1)
s = torch.cat((s, image6), dim=0)
return (s,)
class EmptyImage:
def __init__(self, device="cpu"):
@ -1855,6 +1899,7 @@ NODE_CLASS_MAPPINGS = {
"ImageScaleBy": ImageScaleBy,
"ImageInvert": ImageInvert,
"ImageBatch": ImageBatch,
"ImageBatchPlus": ImageBatchPlus,
"ImagePadForOutpaint": ImagePadForOutpaint,
"EmptyImage": EmptyImage,
"ConditioningAverage": ConditioningAverage ,
@ -1957,6 +2002,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"ImageInvert": "Invert Image",
"ImagePadForOutpaint": "Pad Image for Outpainting",
"ImageBatch": "Batch Images",
"ImageBatchPlus": "Batch Images+",
# _for_testing
"VAEDecodeTiled": "VAE Decode (Tiled)",
"VAEEncodeTiled": "VAE Encode (Tiled)",