diff --git a/README.MD b/README.MD index e20e325..94b52eb 100644 --- a/README.MD +++ b/README.MD @@ -1,34 +1,43 @@ # ComfyUI Layer Style A set of nodes for ComfyUI that generate image like Adobe Photoshop's Layer Style. -The completed nodes are as follows, and further work is in progress. ![image](image/title.png) +Nodes are divided into four groups according to their functions: LayerStyle, LayerMask, LayerUtility and LayerFilter. +* [LayerStyle](#LayerStyle) nodes provides layer styles that mimic Adobe Photoshop. +* [LayerMask](#LayerMask) nodes provides mask assistance tools. +* [LayerUtility](#LayerUtility) nodes provides auxiliary nodes related to layer composit tools and workflows. +* [LayerFilter](#LayerFilter) nodes provides image effect filters. + [中文说明点这里](./README_CN.MD) ## Update -* Add GradientOverlay and ColorOverlay nodes. Add invalid mask input judgment and ignore it when invalid mask is input. -* Commit InnerGlow, InnerShadow and MotionBlur nodes. +* Add [ImageBlendAdvance](#ImageBlendAdvance) node. This node allows for the synthesis of background images and layers of different sizes, providing a more free synthesis experience. +Add [PrintInfo](#PrintInfo) node as a workflow debugging aid. +* Add [GradientOverlay](#GradientOverlay) and [ColorOverlay](#ColorOverlay) nodes. +Add invalid mask input judgment and ignore it when invalid mask is input. +* Commit [InnerGlow](#InnerGlow), [InnerShadow](#InnerShadow) and [MotionBlur](#MotionBlur) nodes. * Renaming all completed nodes, the nodes are divided into 4 groups：LayerStyle, LayerMask, LayerUtility, LayerFilter. workflows containing old version nodes need to be manually replaced with new version nodes. -* OuterGlow node has undergone significant modifications by adding options for **_brightness_**, **_light_color_**, and **_glow_color_**. -* Commit MaskInvert node. -* Commit ColorPick node. -* Commit Stroke node. -* Commit MaskPreview node. -* Commit ImageOpacity node. +* [OuterGlow](#OuterGlow) node has undergone significant modifications by adding options for **_brightness_**, **_light_color_**, and **_glow_color_**. +* Commit [MaskInvert](#MaskInvert) node. +* Commit [ColorPick](#ColorPick) node. +* Commit [Stroke](#Stroke) node. +* Commit [MaskPreview](#MaskPreview) node. +* Commit [ImageOpacity](#ImageOpacity) node. * The layer_mask is not a mandatory input now. it is allowed to use layers and masks with different shapes, but the size must be consistent. -* Commit ImageBlend node. -* Commit OuterGlow node. -* Commit DropShadow node. +* Commit [ImageBlend](#ImageBlend) node. +* Commit [OuterGlow](#OuterGlow) node. +* Commit [DropShadow](#DropShadow) node. -# LayerStyle + +# LayerStyle ![image](image/layerstyle_nodes.png) -### DropShadow + +### DropShadow Generate shadow ![image](image/drop_shadow_example.png) - Node options: ![image](image/drop_shadow_node.png) * background_image1: The background image. @@ -42,8 +51,10 @@ Node options: * grow: Shadow expansion amplitude. * blur: Shadow blur level. * shadow_color4: Shadow color. +[note](#Annotation) -### OuterGlow + +### OuterGlow Generate outer glow ![image](image/outer_glow_example.png) @@ -60,8 +71,10 @@ Node options: * blur：blur of glow. * light_color4: Center part color of glow. * glow_color4: Edge part color of glow. +[note](#Annotation) -### InnerShadow + +### InnerShadow Generate inner shadow ![image](image/inner_shadow_example.png) @@ -78,8 +91,10 @@ Node options: * grow: Shadow expansion amplitude. * blur: Shadow blur level. * shadow_color4: Shadow color. +[note](#Annotation) -### InnerGlow + +### InnerGlow Generate inner glow ![image](image/inner_glow_example.png) @@ -96,9 +111,10 @@ Node options: * blur：blur of glow. * light_color4: Center part color of glow. * glow_color4: Edge part color of glow. +[note](#Annotation) -### Stroke +### Stroke Generate a stroke of layer。 ![image](image/stroke_example.png) @@ -113,8 +129,10 @@ Node options: * stroke_grow: Stroke expansion/contraction amplitude, positive values indicate expansion and negative values indicate contraction. * stroke_width: Stroke width. * stroke_color4: Stroke color, described in hexadecimal RGB format. +[note](#Annotation) -### GradientOverlay + +### GradientOverlay Generate gradient overlay ![image](image/gradient_overlay_example.png) @@ -130,8 +148,10 @@ Node options: * end_color: Color at the end of the gradient. * end_alpha: Transparency at the end of the gradient. * angle: Gradient rotation angle. +[note](#Annotation) -### ColorOverlay + +### ColorOverlay Generate color overlay ![image](image/color_overlay_example.png) @@ -144,34 +164,57 @@ Node options: * blend_mode3: Blending mode of color. * opacity: Opacity of stroke. * color: Color of overlay. +[note](#Annotation) -#### Annotation for LayerStyle nodes: -1 The layer_image, layer_mask and the background_image(if have input), These three items must be of the same size.。 -2 The mask not a mandatory input item. the alpha channel of the image is used by default. If the image input does not include an alpha channel, the entire image's alpha channel will be automatically created. if have masks input simultaneously, the alpha channel will be overwrite by the mask. -3 The blend mode include **_normal, multply, screen, add, subtract, difference, darker_** and **_lighter_**. - -4 The RGB color described by hexadecimal RGB format, like '#FA3D86'. - -# LayerMask +# LayerMask ![image](image/layermask_nodes.png) -### MaskPreview: + +### MaskPreview Preview the input mask ![image](image/mask_invert.png) -### MaskInvert: + +### MaskInvert Invert the mask ![image](image/mask_invert_node.png) -# LayerUtility +# LayerUtility ![image](image/layerutility_nodes.png) -### ImageBlend: -Composit layer image and background image, multiple blend modes are available for option, and transparency can be set. + +### ImageBlendAdvance +Used for compositing layers, allowing for compositing layer images of different sizes on the background image, and setting positions and transformations. multiple mixing modes are available for selection, and transparency can be set. + +The node provide layer transformation_methods and anti_aliasing options. helps improve the quality of synthesized images. + +The node provides mask output that can be used for subsequent workflows. +![image](image/image_blend_advance_example.png) + +Node options: +![image](image/image_blend_advance_node.png) +* background_image: The background image. +* layer_image5: Layer image for composite. +* layer_mask2,5: Mask for layer_image. +* invert_mask: Whether to reverse the mask. +* blend_mode3: Blending mode. +* opacity: Opacity of blend. +* x_percent: Horizontal position of the layer on the background image, expressed as a percentage, with 0 on the far left and 100 on the far right. It can be less than 0 or more than 100, indicating that some of the layer's content is outside the screen. +* y_percent: Vertical position of the layer on the background image, expressed as a percentage, with 0 on the top and 100 on the bottom. For example, setting it to 50 indicates vertical center, 20 indicates upper center, and 80 indicates lower center. +* mirror: Mirror flipping. Provide two flipping modes, horizontal flipping and vertical flipping. +* scale: Layer magnification, 1.0 represents the original size. +* aspect_ratio: Layer aspect ratio. 1.0 is the original ratio, a value greater than this indicates elongation, and a value less than this indicates flattening. +* rotate: Layer rotation degree. +* Sampling methods for layer enlargement and rotation, including lanczos, bicubic, hamming, bilinear, box and nearest. Different sampling methods can affect the image quality and processing time of the synthesized image. +* anti_aliasing: Anti aliasing, ranging from 0 to 16, the larger the value, the less obvious the aliasing. An excessively high value will significantly reduce the processing speed of the node. +[note](#Annotation) + +### ImageBlend +A simple node for composit layer image and background image, multiple blend modes are available for option, and transparency can be set. ![image](image/image_blend_example.png) Node options: @@ -182,18 +225,20 @@ Node options: * invert_mask: Whether to reverse the mask. * blend_mode3: Blending mode. * opacity: Opacity of blend. +[note](#Annotation) -### ImageOpacity: +### ImageOpacity Adjust image opacity ![image](image/image_opacity_example.png) Node option: -* image1: Image input, supporting RGB and RGBA. if is RGB, the alpha channel of the entire image will be automatically added. -* mask1,2 : Mask input. +* image5: Image input, supporting RGB and RGBA. if is RGB, the alpha channel of the entire image will be automatically added. +* mask2,5 : Mask input. * invert_mask: Whether to reverse the mask. * opacity: Opacity of image. +[note](#Annotation) -### ColorPicker: +### ColorPicker Modify web extensions from [mtb nodes](https://github.com/melMass/comfy_mtb). Select colors on the color palette and output RGB values. ![image](image/color_picker.png) @@ -203,10 +248,18 @@ Node options: Output Type： * string -# LayerFilter +### PrintInfo +![image](image/print_info_node.png) +Used to provide assistance for workflow debugging. When running, the properties of any object connected to this node will be printed to the console. + +This node allows any type of input. + + +# LayerFilter ![image](image/layerfilter_nodes.png) -### MotionBlur: + +### MotionBlur Make the image motion blur ![image](image/motion_blur_example.png) @@ -214,13 +267,24 @@ Node options: * angle: The angle of blur. * blur: The size of blur. + +#### Annotation for nodes +1 The layer_image, layer_mask and the background_image(if have input), These three items must be of the same size. + +2 The mask not a mandatory input item. the alpha channel of the image is used by default. If the image input does not include an alpha channel, the entire image's alpha channel will be automatically created. if have masks input simultaneously, the alpha channel will be overwrite by the mask. + +3 The blend mode include **_normal, multply, screen, add, subtract, difference, darker_** and **_lighter_**. + +4 The RGB color described by hexadecimal RGB format, like '#FA3D86'. + +5 The layer_image and layer_mask must be of the same size. + ## Example workflow image Some JSON workflow files in the workflow directory, that is example for ComfyUI. ## The following tasks are in the planned list LayerUtility: -* imageblend advance * color image * gradient image * image channel split diff --git a/README_CN.MD b/README_CN.MD index 01962b0..9a3c4e4 100644 --- a/README_CN.MD +++ b/README_CN.MD @@ -1,27 +1,36 @@ # ComfyUI Layer Style ComfyUIͨһڵʵַAdobe Photoshopͼʽ -ɵĽڵ£С ![image](image/title.png) +ڵ㰴չܷΪ4飺LayerStyle, LayerMask, LayerUtilityLayerFilter +* [LayerStyle](#LayerStyle)ڵṩAdobe Photoshopͼʽ +* [LayerMask](#LayerMask)ڵṩMaskߡ +* [LayerUtility](#LayerUtility)ڵṩͼϳɹߺ͹صĸڵ㡣 +* [LayerFilter](#LayerFilter)ڵṩͼЧ˾ -## ˵: -* GradientOverlay,ColorOverlayڵ㡣ЧmaskжϣЧmaskʱԡ -* InnerGlow, InnerShadow, MotionBlurڵ㡣 -* ɵĽڵڵΪ4飺LayerStyle, LayerMask, LayerUtility, LayerFilterΪɰڵĹֶ滻°ڵ㡣 -* OuterGlowڵ޸ģȡƹɫԹɫѡ -* MaskInvertڵ㡣 -* Strokeڵ㡣 -* MaskPreviewڵ㡣 -* ImageOpacityڵ㡣 +## ˵ +* [ImageBlendAdvance](#ImageBlendAdvance)ڵ㡣ڵϳɳߴ粻ͬıͼͼ㣬ṩ˸ɵĺϳ顣 + [PrintInfo](#PrintInfo)ڵΪԸߡ +* [GradientOverlay](#GradientOverlay),[ColorOverlay](#ColorOverlay)ڵ㡣ЧmaskжϣЧmaskʱԡ +* [InnerGlow](#InnerGlow), [InnerShadow](#InnerShadow), [MotionBlur](#MotionBlur)ڵ㡣 +* ɵĽڵڵΪ4飺LayerStyle, LayerMask, LayerUtility, LayerFilter + ΪɰڵĹֶ滻°ڵ㡣 +* [OuterGlow](#OuterGlow)ڵ޸ģȡƹɫԹɫѡ +* [MaskInvert](#MaskInvert)ڵ㡣 +* [Stroke](#Stroke)ڵ㡣 +* [MaskPreview](#MaskPreview)ڵ㡣 +* [ImageOpacity](#ImageOpacity)ڵ㡣 * layer_mask޸ΪDZѡ, Ĭʹlayer_imagealphaͨͨmaskı֮dzߴһ¡ -* ImageBlendڵ㡣 -* OuterGlowڵ㡣 -* ׸ڵDropShadowύ +* [ImageBlend](#ImageBlend)ڵ㡣 +* [OuterGlow](#OuterGlow)ڵ㡣 +* ׸ڵ[DropShadow](#DropShadow)ύ -# LayerStyle + +# LayerStyle ![image](image/layerstyle_nodes.png) -### DropShadow + +### DropShadow Ӱ ![image](image/drop_shadow_example.png) @@ -38,8 +47,10 @@ ComfyUI * grow: Ӱŷȡ * blur:Ӱģ̶ȡ * shadow_color4: Ӱɫ +[ڵע](#ڵע) -### OuterGlow + +### OuterGlow ⷢ⡣ ![image](image/outer_glow_example.png) @@ -56,8 +67,10 @@ ComfyUI * blur:ģ̶ȡ * light_color4: ɫ * glow_colo4: ԹΧɫ +[ڵע](#ڵע) -### InnerShadow + +### InnerShadow Ӱ ![image](image/inner_shadow_example.png) @@ -74,8 +87,10 @@ ComfyUI * grow: Ӱŷȡ * blur:Ӱģ̶ȡ * shadow_color4: Ӱɫ +[ڵע](#ڵע) -### InnerGlow + +### InnerGlow ڷ⡣ ![image](image/inner_glow_example.png) @@ -92,8 +107,10 @@ ComfyUI * blur:ģ̶ȡ * light_color4: ɫ * glow_colo4: ԹΧɫ +[ڵע](#ڵע) -### Stroke + +### Stroke ߡ ![image](image/stroke_example.png) @@ -108,8 +125,10 @@ ComfyUI * stroke_grow: /ȣֵţֵ * stroke_width: ߿ȡ * stroke_color4: ɫ +[ڵע](#ڵע) -### GradientOverlay + +### GradientOverlay 串 ![image](image/gradient_overlay_example.png) @@ -126,8 +145,10 @@ ComfyUI * end_color: ˵ɫ * end_alpha: ˵͸ȡ * angle: תǶȡ +[ڵע](#ڵע) -### ColorOverlay + +### ColorOverlay ɫ ![image](image/color_overlay_example.png) @@ -140,30 +161,56 @@ ComfyUI * blend_mode3: ߵĻģʽ * opacity: ͸ȡ * color: ǵɫ +[ڵע](#ڵע) -#### ڵѡע: -1 imagemaskbackground_image()ͬijߴ硣 -2 maskDZĬʹimagealphaͨimage벻alphaͨԶͼalphaͨmaskԭalphaͨmaskǡ -3: ģʽnormalmultplyscreenaddsubtractdifferencedarkerlighter -4: ɫʹ16RGBַʽ '#FA3D86' -# LayerMask +# LayerMask ![image](image/layermask_nodes.png) -### MaskPreview: + +### MaskPreview Ԥmask ![image](image/mask_invert.png) -### MaskInvert: + +### MaskInvert maskת ![image](image/mask_invert_node.png) -# LayerUtility + +# LayerUtility ![image](image/layerutility_nodes.png) -### ImageBlend -ںϳͼ㣬ṩֻģʽѡ񣬿͸ȡ + +### ImageBlendAdvance +ںϳͼ㣬ڱͼƬϺϳ֮ͬߴͼͼƬλúͱ任ṩֻģʽѡ񣬿͸ȡ + +ڵṩͼ任Ϳѡߺϳɻʡ + +ڵṩmaskں +![image](image/image_blend_advance_example.png) + +ڵѡ˵: +![image](image/image_blend_advance_node.png) +* background_image: ͼ +* layer_image5: ںϳɵIJͼ +* layer_mask2,5: ͼ֡ +* invert_mask: Ƿת֡ +* blend_mode3: ͼģʽ +* opacity: ͸ȡ +* x_percent: ͼڱͼϵˮƽλãðٷֱȱʾ0Ҳ100С0߳100DZʾͼвڻ֮⡣ +* y_percent: ͼڱͼϵĴֱλãðٷֱȱʾϲ0²100Ϊ50ʾֱУ20ƫϣ80ƫ¡ +* mirror: תṩ2ַתģʽ, ˮƽתʹֱת +* scale: ͼŴ1.0 ʾԭ +* aspect_ratio: ͼ㳤ȡ1.0 ԭʼڴֵʾСڴֵʾѹ⡣ +* rotate: ͼת +* transform_method: ͼŴתIJlanczosbicubichammingbilinearboxnearestͬIJӰϳɵĻʺͻ洦ʱ䡣 +* anti_aliasing: ݣΧ0-16ֵԽ󣬾ԽԡߵֵͽڵĴٶȡ +[ڵע](#ڵע) + +### ImageBlend +һںϳͼļ򵥽ڵ㣬ṩֻģʽѡ񣬿͸ȡ ![image](image/image_blend_example.png) ڵѡ˵: @@ -174,18 +221,20 @@ mask * invert_mask: Ƿת֡ * blend_mode3: ͼģʽ * opacity: ͸ȡ +[ڵע](#ڵע) -### ImageOpacity: +### ImageOpacity ͼ͸ȡ ![image](image/image_opacity_example.png) ڵѡ˵: -* image: ͼ룬֧RGBRGBA롣 -* mask: 롣 +* image5: ͼ룬֧RGBRGBA롣 +* mask2,5: 롣 * invert_mask: Ƿת֡ * opacity: ͸ȡ +[ڵע](#ڵע) -### ColorPicker: +### ColorPicker ɫѡȡɫ [mtb nodes](https://github.com/melMass/comfy_mtb)web extensions ![image](image/color_picker.png) @@ -196,10 +245,19 @@ mask : * string -# LayerFilter + +### PrintInfo +![image](image/print_info_node.png) +ڸṩʱκνڵĶԽӡ̨ + +ڵ͵롣 + + +# LayerFilter ![image](image/layerfilter_nodes.png) -### MotionBlur: + +### MotionBlur ˶ģ ![image](image/motion_blur_example.png) @@ -207,15 +265,20 @@ mask * angle: ģǶȡ * blur: ģС +#### ڵע +1 imagemaskbackground_image()ͬijߴ硣 +2 maskDZĬʹimagealphaͨimage벻alphaͨԶͼalphaͨmaskԭalphaͨmaskǡ +3: ģʽnormalmultplyscreenaddsubtractdifferencedarkerlighter +4: ɫʹ16RGBַʽ '#FA3D86' +5 imagemaskͬijߴ硣 -## ʹʾ: +## ʹʾ workflowĿ¼jsonʽĹʾļ ## ¹ڼƻб LayerUtility: -* imageblend advance * color image * gradient image * image channel split @@ -237,7 +300,7 @@ LayerFilter: * contour * findedge -## װ +## װ * CompyUIĿ¼(硰CompyUI\custom_nodes\)дcmdڣ```git clone https://github.com/chflame163/ComfyUI_LayerStyle.git```װؽѹzipļõļиƵ ComfyUI\custom_nodes\ * װԴComfyUI\custom_nodes\ComfyUI_WordCloud Ŀ¼λôcmdڣ diff --git a/image/image_blend_advance_example.png b/image/image_blend_advance_example.png new file mode 100644 index 0000000..f2954a2 Binary files /dev/null and b/image/image_blend_advance_example.png differ diff --git a/image/image_blend_advance_node.png b/image/image_blend_advance_node.png new file mode 100644 index 0000000..04879c2 Binary files /dev/null and b/image/image_blend_advance_node.png differ diff --git a/image/print_info_node.png b/image/print_info_node.png new file mode 100644 index 0000000..c12c0a8 Binary files /dev/null and b/image/print_info_node.png differ diff --git a/image/title.png b/image/title.png index 20a511d..7a1863d 100644 Binary files a/image/title.png and b/image/title.png differ diff --git a/py/image_blend_advance.py b/py/image_blend_advance.py new file mode 100644 index 0000000..b3eacf5 --- /dev/null +++ b/py/image_blend_advance.py @@ -0,0 +1,111 @@ +import copy +from .imagefunc import * + +class ImageBlendAdvance: + + def __init__(self): + pass + + @classmethod + def INPUT_TYPES(self): + chop_mode = ['normal','multply','screen','add','subtract','difference','darker','lighter'] + mirror_mode = ['None', 'horizontal', 'vertical'] + method_mode = ['lanczos', 'bicubic', 'hamming', 'bilinear', 'box', 'nearest'] + return { + "required": { + "background_image": ("IMAGE", ), # + "layer_image": ("IMAGE",), # + "invert_mask": ("BOOLEAN", {"default": True}), # 反转mask + "blend_mode": (chop_mode,), # 混合模式 + "opacity": ("INT", {"default": 100, "min": 0, "max": 100, "step": 1}), # 透明度 + "x_percent": ("FLOAT", {"default": 50, "min": -999, "max": 999, "step": 0.01}), + "y_percent": ("FLOAT", {"default": 50, "min": -999, "max": 999, "step": 0.01}), + "mirror": (mirror_mode,), # 镜像翻转 + "scale": ("FLOAT", {"default": 1, "min": 0.01, "max": 100, "step": 0.01}), + "aspect_ratio": ("FLOAT", {"default": 1, "min": 0.01, "max": 100, "step": 0.01}), + "rotate": ("FLOAT", {"default": 0, "min": -999999, "max": 999999, "step": 0.01}), + "transform_method": (method_mode,), + "anti_aliasing": ("INT", {"default": 0, "min": 0, "max": 16, "step": 0.01}), + }, + "optional": { + "layer_mask": ("MASK",), # + } + } + + RETURN_TYPES = ("IMAGE", "MASK") + RETURN_NAMES = ("image", "mask") + FUNCTION = 'image_blend_advance' + CATEGORY = '😺dzNodes/LayerUtility' + OUTPUT_NODE = True + + def image_blend_advance(self, background_image, layer_image, + invert_mask, blend_mode, opacity, + x_percent, y_percent, + mirror, scale, aspect_ratio, rotate, + transform_method, anti_aliasing, + layer_mask=None + ): + + # preprocess + _canvas = tensor2pil(background_image).convert('RGB') + _layer = tensor2pil(layer_image) + if _layer.mode == 'RGBA': + _mask = tensor2pil(layer_image).convert('RGBA').split()[-1] + else: + _mask = Image.new('L', _layer.size, 'white') + _layer = _layer.convert('RGB') + if layer_mask is not None: + if invert_mask: + layer_mask = 1 - layer_mask + _mask = mask2image(layer_mask).convert('L') + if _mask.size != _layer.size: + _mask = Image.new('L', _layer.size, 'white') + log('Warning: mask mismatch, droped!') + + orig_layer_width = _layer.width + orig_layer_height = _layer.height + _mask = _mask.convert("RGB") + + target_layer_width = int(orig_layer_width * scale) + target_layer_height = int(orig_layer_height * scale * aspect_ratio) + + # mirror + if mirror == 'horizontal': + _layer = _layer.transpose(Image.FLIP_LEFT_RIGHT) + _mask = _mask.transpose(Image.FLIP_LEFT_RIGHT) + elif mirror == 'vertical': + _layer = _layer.transpose(Image.FLIP_TOP_BOTTOM) + _mask = _mask.transpose(Image.FLIP_TOP_BOTTOM) + + # scale + _layer = _layer.resize((target_layer_width, target_layer_height)) + _mask = _mask.resize((target_layer_width, target_layer_height)) + # rotate + _layer, _mask, _ = image_rotate_extend_with_alpha(_layer, rotate, _mask, transform_method, anti_aliasing) + + # 处理位置 + x = int(_canvas.width * x_percent / 100 - _layer.width / 2) + y = int(_canvas.height * y_percent / 100 - _layer.height / 2) + + # composit layer + _comp = copy.copy(_canvas) + _compmask = Image.new("RGB", _comp.size, color='black') + _comp.paste(_layer, (x, y)) + _compmask.paste(_mask, (x, y)) + _compmask = _compmask.convert('L') + _comp = chop_image(_canvas, _comp, blend_mode, opacity) + + # composition background + _canvas.paste(_comp, mask=_compmask) + ret_image = _canvas + ret_mask = image2mask(_compmask) + log('ImageBlendAdvance Processed.') + return (pil2tensor(ret_image), ret_mask,) + +NODE_CLASS_MAPPINGS = { + "LayerUtility: ImageBlendAdvance": ImageBlendAdvance +} + +NODE_DISPLAY_NAME_MAPPINGS = { + "LayerUtility: ImageBlendAdvance": "LayerUtility: ImageBlendAdvance" +} \ No newline at end of file diff --git a/py/imagefunc.py b/py/imagefunc.py index 35b2963..cb6ccfc 100644 --- a/py/imagefunc.py +++ b/py/imagefunc.py @@ -119,7 +119,7 @@ def motion_blur(image:Image, angle:int, blur:int) -> Image: ret_image = cv22pil(blurred) return ret_image -def __rotate_expand(image:Image, angle:float, SSAA:int=0) -> Image: +def __rotate_expand(image:Image, angle:float, SSAA:int=0, method:str="lanczos") -> Image: images = pil2tensor(image) expand = "true" height, width = images[0, :, :, 0].shape @@ -127,6 +127,21 @@ def __rotate_expand(image:Image, angle:float, SSAA:int=0) -> Image: def rotate_tensor(tensor): resize_sampler = Image.LANCZOS rotate_sampler = Image.BICUBIC + if method == "bicubic": + resize_sampler = Image.BICUBIC + rotate_sampler = Image.BICUBIC + elif method == "hamming": + resize_sampler = Image.HAMMING + rotate_sampler = Image.BILINEAR + elif method == "bilinear": + resize_sampler = Image.BILINEAR + rotate_sampler = Image.BILINEAR + elif method == "box": + resize_sampler = Image.BOX + rotate_sampler = Image.NEAREST + elif method == "nearest": + resize_sampler = Image.NEAREST + rotate_sampler = Image.NEAREST if SSAA > 1: img = tensor.tensor_to_image() img_us_scaled = img.resize((width * SSAA, height * SSAA), resize_sampler) @@ -145,12 +160,13 @@ def __rotate_expand(image:Image, angle:float, SSAA:int=0) -> Image: rotated_tensor = torch.stack([rotate_tensor(images[i]) for i in range(len(images))]) return tensor2pil(rotated_tensor).convert('RGB') -def image_rotate_extend_with_alpha(image:Image, alpha:Image, angle:float, SSAA:int=0) -> tuple: - _image = __rotate_expand(image.convert('RGB'), angle, SSAA) - _alpha = __rotate_expand(alpha.convert('RGB'), angle, SSAA) - R, G, B = _image.split() - A = _alpha.convert('L') - ret_image = Image.merge('RGBA', (R, G, B, A)) +def image_rotate_extend_with_alpha(image:Image, angle:float, alpha:Image=None, method:str="lanczos", SSAA:int=0) -> tuple: + _image = __rotate_expand(image.convert('RGB'), angle, SSAA, method) + if angle is not None: + _alpha = __rotate_expand(alpha.convert('RGB'), angle, SSAA, method) + ret_image = RGB2RGBA(_image, _alpha) + else: + ret_image = _image return (_image, _alpha, ret_image) @@ -219,6 +235,10 @@ def mask_invert(mask:torch.Tensor) -> torch.Tensor: def subtract_mask(masks_a:torch.Tensor, masks_b:torch.Tensor) -> torch.Tensor: return torch.clamp(masks_a - masks_b, 0, 255) +def RGB2RGBA(image:Image, mask:Image) -> Image: + (R, G, B) = image.convert('RGB').split() + return Image.merge('RGBA', (R, G, B, mask.convert('L'))) + '''Color Functions''' def RGB_to_Hex(RGB) -> str: diff --git a/py/print_info.py b/py/print_info.py new file mode 100644 index 0000000..f76a724 --- /dev/null +++ b/py/print_info.py @@ -0,0 +1,49 @@ +import json +import torch +from .imagefunc import tensor2pil, log + +class AnyType(str): + """A special class that is always equal in not equal comparisons. Credit to pythongosssss""" + def __ne__(self, __value: object) -> bool: + return False + +any = AnyType("*") + +class PrintInfo: + + @classmethod + def INPUT_TYPES(cls): # pylint: disable = invalid-name, missing-function-docstring + return { + "required": { + "anything": (any, {}), + }, + } + + CATEGORY = '😺dzNodes/LayerUtility' + RETURN_TYPES = () + FUNCTION = "print_info" + OUTPUT_NODE = True + + def print_info(self, anything=None): + value = 'PrintInfo:\nInput type is: ' + str(type(anything)) + '\n' + if isinstance(anything, torch.Tensor): + image = tensor2pil(anything) + value = value + 'Image.size=' + str(image.size) + ', Image.mode=' + str(image.mode) + '\n' + if anything is not None: + try: + value = value + json.dumps(anything) + "\n" + except Exception: + try: + value = value + str(anything) + "\n" + except Exception: + value = 'source exists, but could not be serialized.' + log(value) + return {"ui": {"text": (value,)}} + +NODE_CLASS_MAPPINGS = { + "LayerUtility: PrintInfo": PrintInfo +} + +NODE_DISPLAY_NAME_MAPPINGS = { + "LayerUtility: PrintInfo": "LayerUtility: PrintInfo" +} \ No newline at end of file diff --git a/workflow/3840x2160car.jpg b/workflow/3840x2160car.jpg new file mode 100644 index 0000000..1680966 Binary files /dev/null and b/workflow/3840x2160car.jpg differ diff --git a/workflow/image_blend_advance_example.json b/workflow/image_blend_advance_example.json new file mode 100644 index 0000000..3ff2a5b --- /dev/null +++ b/workflow/image_blend_advance_example.json @@ -0,0 +1,252 @@ +{ + "last_node_id": 28, + "last_link_id": 30, + "nodes": [ + { + "id": 9, + "type": "LoadImage", + "pos": [ + 736, + -176 + ], + "size": { + "0": 350.14056396484375, + "1": 314 + }, + "flags": {}, + "order": 0, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 11 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": [], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "3840x2160car.jpg", + "image" + ] + }, + { + "id": 8, + "type": "LoadImage", + "pos": [ + 810, + 223 + ], + "size": { + "0": 261.82659912109375, + "1": 314 + }, + "flags": {}, + "order": 1, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 12 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": [ + 13 + ], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "512x512 (16).png", + "image" + ] + }, + { + "id": 19, + "type": "LayerUtility: ImageBlendAdvance", + "pos": [ + 1150, + 57 + ], + "size": { + "0": 315, + "1": 338 + }, + "flags": {}, + "order": 2, + "mode": 0, + "inputs": [ + { + "name": "background_image", + "type": "IMAGE", + "link": 11 + }, + { + "name": "layer_image", + "type": "IMAGE", + "link": 12 + }, + { + "name": "layer_mask", + "type": "MASK", + "link": 13 + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 28 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "mask", + "type": "MASK", + "links": [ + 30 + ], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LayerUtility: ImageBlendAdvance" + }, + "widgets_values": [ + true, + "normal", + 100, + 73.67, + 27.7, + "horizontal", + 2, + 1, + 25.28, + "lanczos", + 2 + ] + }, + { + "id": 23, + "type": "PreviewImage", + "pos": [ + 1559, + -239 + ], + "size": [ + 643.1714141845705, + 387.9265393676759 + ], + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 28 + } + ], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 28, + "type": "LayerMask: MaskPreview", + "pos": [ + 1553, + 198 + ], + "size": [ + 646.8334141845708, + 388.80453936767594 + ], + "flags": {}, + "order": 4, + "mode": 0, + "inputs": [ + { + "name": "mask", + "type": "MASK", + "link": 30 + } + ], + "properties": { + "Node name for S&R": "LayerMask: MaskPreview" + } + } + ], + "links": [ + [ + 11, + 9, + 0, + 19, + 0, + "IMAGE" + ], + [ + 12, + 8, + 0, + 19, + 1, + "IMAGE" + ], + [ + 13, + 8, + 1, + 19, + 2, + "MASK" + ], + [ + 28, + 19, + 0, + 23, + 0, + "IMAGE" + ], + [ + 30, + 19, + 1, + 28, + 0, + "MASK" + ] + ], + "groups": [], + "config": {}, + "extra": {}, + "version": 0.4 +} \ No newline at end of file diff --git a/workflow/title_example_workflow.json b/workflow/title_example_workflow.json new file mode 100644 index 0000000..d77c747 --- /dev/null +++ b/workflow/title_example_workflow.json @@ -0,0 +1,416 @@ +{ + "last_node_id": 25, + "last_link_id": 28, + "nodes": [ + { + "id": 23, + "type": "PreviewImage", + "pos": [ + 1890, + -239 + ], + "size": { + "0": 753.9779663085938, + "1": 485.2859802246094 + }, + "flags": {}, + "order": 5, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 22 + } + ], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 25, + "type": "PreviewImage", + "pos": [ + 1888, + 304 + ], + "size": { + "0": 757.4659423828125, + "1": 480.2757873535156 + }, + "flags": {}, + "order": 6, + "mode": 0, + "inputs": [ + { + "name": "images", + "type": "IMAGE", + "link": 26 + } + ], + "properties": { + "Node name for S&R": "PreviewImage" + } + }, + { + "id": 24, + "type": "LayerStyle: OuterGlow", + "pos": [ + 1514, + 307 + ], + "size": { + "0": 315, + "1": 266 + }, + "flags": {}, + "order": 4, + "mode": 0, + "inputs": [ + { + "name": "background_image", + "type": "IMAGE", + "link": 23 + }, + { + "name": "layer_image", + "type": "IMAGE", + "link": 25 + }, + { + "name": "layer_mask", + "type": "MASK", + "link": 28 + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 26 + ], + "shape": 3, + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "LayerStyle: OuterGlow" + }, + "widgets_values": [ + false, + "screen", + 100, + 5, + 100, + 35, + "#FFBF30", + "#FE0000" + ] + }, + { + "id": 22, + "type": "LayerStyle: DropShadow", + "pos": [ + 1514, + -73 + ], + "size": { + "0": 315, + "1": 266 + }, + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [ + { + "name": "background_image", + "type": "IMAGE", + "link": 19 + }, + { + "name": "layer_image", + "type": "IMAGE", + "link": 20 + }, + { + "name": "layer_mask", + "type": "MASK", + "link": 27 + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 22 + ], + "shape": 3, + "slot_index": 0 + } + ], + "properties": { + "Node name for S&R": "LayerStyle: DropShadow" + }, + "widgets_values": [ + false, + "normal", + 50, + 80, + 80, + 40, + 40, + "#000000" + ] + }, + { + "id": 8, + "type": "LoadImage", + "pos": [ + 820, + 191 + ], + "size": { + "0": 261.82659912109375, + "1": 314 + }, + "flags": {}, + "order": 0, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 12 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": [ + 13 + ], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "512x512 (16).png", + "image" + ] + }, + { + "id": 9, + "type": "LoadImage", + "pos": [ + 736, + -176 + ], + "size": { + "0": 350.14056396484375, + "1": 314 + }, + "flags": {}, + "order": 1, + "mode": 0, + "outputs": [ + { + "name": "IMAGE", + "type": "IMAGE", + "links": [ + 11 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "MASK", + "type": "MASK", + "links": [], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LoadImage" + }, + "widgets_values": [ + "3840x2160car.jpg", + "image" + ] + }, + { + "id": 19, + "type": "LayerUtility: ImageBlendAdvance", + "pos": [ + 1131, + 126 + ], + "size": { + "0": 315, + "1": 338 + }, + "flags": {}, + "order": 2, + "mode": 0, + "inputs": [ + { + "name": "background_image", + "type": "IMAGE", + "link": 11 + }, + { + "name": "layer_image", + "type": "IMAGE", + "link": 12 + }, + { + "name": "layer_mask", + "type": "MASK", + "link": 13 + } + ], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": [ + 19, + 20, + 23, + 25 + ], + "shape": 3, + "slot_index": 0 + }, + { + "name": "mask", + "type": "MASK", + "links": [ + 27, + 28 + ], + "shape": 3, + "slot_index": 1 + } + ], + "properties": { + "Node name for S&R": "LayerUtility: ImageBlendAdvance" + }, + "widgets_values": [ + true, + "normal", + 100, + 73.67, + 27.7, + "horizontal", + 2, + 1, + 30, + "lanczos", + 2 + ] + } + ], + "links": [ + [ + 11, + 9, + 0, + 19, + 0, + "IMAGE" + ], + [ + 12, + 8, + 0, + 19, + 1, + "IMAGE" + ], + [ + 13, + 8, + 1, + 19, + 2, + "MASK" + ], + [ + 19, + 19, + 0, + 22, + 0, + "IMAGE" + ], + [ + 20, + 19, + 0, + 22, + 1, + "IMAGE" + ], + [ + 22, + 22, + 0, + 23, + 0, + "IMAGE" + ], + [ + 23, + 19, + 0, + 24, + 0, + "IMAGE" + ], + [ + 25, + 19, + 0, + 24, + 1, + "IMAGE" + ], + [ + 26, + 24, + 0, + 25, + 0, + "IMAGE" + ], + [ + 27, + 19, + 1, + 22, + 2, + "MASK" + ], + [ + 28, + 19, + 1, + 24, + 2, + "MASK" + ] + ], + "groups": [], + "config": {}, + "extra": {}, + "version": 0.4 +} \ No newline at end of file