qnloft
/
ComfyUI
mirror of https://github.com/comfyanonymous/ComfyUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change a few things in #1578.

This commit is contained in:
comfyanonymous 2023-10-04 14:40:17 -04:00
parent 214ca7197e
commit 9212bea87c
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comfy_extras/nodes_compositing.py
View File

@ -102,7 +102,7 @@ class PorterDuffImageComposite:
RETURN_TYPES = ("IMAGE", "MASK") RETURN_TYPES = ("IMAGE", "MASK")
FUNCTION = "composite" FUNCTION = "composite"
CATEGORY = "compositing" CATEGORY = "mask/compositing"
def composite(self, source: torch.Tensor, source_alpha: torch.Tensor, destination: torch.Tensor, destination_alpha: torch.Tensor, mode): def composite(self, source: torch.Tensor, source_alpha: torch.Tensor, destination: torch.Tensor, destination_alpha: torch.Tensor, mode):
batch_size = min(len(source), len(source_alpha), len(destination), len(destination_alpha)) batch_size = min(len(source), len(source_alpha), len(destination), len(destination_alpha))
@ -149,7 +149,7 @@ class SplitImageWithAlpha:
} }
} }
CATEGORY = "compositing" CATEGORY = "mask/compositing"
RETURN_TYPES = ("IMAGE", "MASK") RETURN_TYPES = ("IMAGE", "MASK")
FUNCTION = "split_image_with_alpha" FUNCTION = "split_image_with_alpha"
@ -170,7 +170,7 @@ class JoinImageWithAlpha:
} }
} }
CATEGORY = "compositing" CATEGORY = "mask/compositing"
RETURN_TYPES = ("IMAGE",) RETURN_TYPES = ("IMAGE",)
FUNCTION = "join_image_with_alpha" FUNCTION = "join_image_with_alpha"

27
nodes.py
View File

@ -1372,31 +1372,6 @@ class LoadImage:
return True return True
class LoadImageWithAlpha(LoadImage):
@classmethod
def INPUT_TYPES(s):
input_dir = folder_paths.get_input_directory()
files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
return {"required":
{"image": (sorted(files), {"image_upload": True})},
}
CATEGORY = "compositing"
RETURN_TYPES = ("IMAGE", "MASK")
FUNCTION = "load_image"
def load_image(self, image):
image_path = folder_paths.get_annotated_filepath(image)
i = Image.open(image_path)
i = ImageOps.exif_transpose(i)
image = i.convert("RGBA")
alpha = np.array(image.getchannel("A")).astype(np.float32) / 255.0
alpha = torch.from_numpy(alpha)[None,]
image = np.array(image).astype(np.float32) / 255.0
image = torch.from_numpy(image)[None,]
return (image, alpha)
class LoadImageMask: class LoadImageMask:
_color_channels = ["alpha", "red", "green", "blue"] _color_channels = ["alpha", "red", "green", "blue"]
@classmethod @classmethod
@ -1631,7 +1606,6 @@ NODE_CLASS_MAPPINGS = {
"SaveImage": SaveImage, "SaveImage": SaveImage,
"PreviewImage": PreviewImage, "PreviewImage": PreviewImage,
"LoadImage": LoadImage, "LoadImage": LoadImage,
"LoadImageWithAlpha": LoadImageWithAlpha,
"LoadImageMask": LoadImageMask, "LoadImageMask": LoadImageMask,
"ImageScale": ImageScale, "ImageScale": ImageScale,
"ImageScaleBy": ImageScaleBy, "ImageScaleBy": ImageScaleBy,
@ -1728,7 +1702,6 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"SaveImage": "Save Image", "SaveImage": "Save Image",
"PreviewImage": "Preview Image", "PreviewImage": "Preview Image",
"LoadImage": "Load Image", "LoadImage": "Load Image",
"LoadImageWithAlpha": "Load Image with Alpha",
"LoadImageMask": "Load Image (as Mask)", "LoadImageMask": "Load Image (as Mask)",
"ImageScale": "Upscale Image", "ImageScale": "Upscale Image",
"ImageScaleBy": "Upscale Image By", "ImageScaleBy": "Upscale Image By",