From 30dc29339ecf7dfde2adcae312e8ff003d00437b Mon Sep 17 00:00:00 2001
From: malkuthro <166633396+malkuthro@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:07:18 +0200
Subject: [PATCH] Add comopsite OPTIONS

---
 k_easy_resize.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/k_easy_resize.py b/k_easy_resize.py
index b09cce2..d597ea9 100644
--- a/k_easy_resize.py
+++ b/k_easy_resize.py
@@ -24,13 +24,12 @@ class EasyResize:
                 "mask": ("MASK",),
                 "pad_color": ("STRING", {"default": "0, 0, 0"}),
                 "panel_color": ("STRING", {"default": "0, 0, 0"}),
-                "composed_image": ("BOOLEAN", {"default": False}),
-                "inverted_mask": ("BOOLEAN", {"default": False}),
+                "invert_composed_MASK": ("BOOLEAN", {"default": False}),
             }
         }
 
-    RETURN_TYPES = ("IMAGE", "MASK", "INT", "INT", "IMAGE", "INT", "INT", "STRING")
-    RETURN_NAMES = ("IMAGE", "MASK", "width", "height", "COLOR_PANEL", "original_width", "original_height", "original_aspect_ratio")
+    RETURN_TYPES = ("IMAGE", "IMAGE", "MASK", "MASK", "INT", "INT", "IMAGE", "INT", "INT", "STRING")
+    RETURN_NAMES = ("IMAGE", "composed_IMAGE", "MASK", "inverted_MASK", "width", "height", "COLOR_PANEL", "original_width", "original_height", "original_aspect_ratio")
     FUNCTION = "adjust_to_aspect"
     CATEGORY = "Koolook/Image"
     DESCRIPTION = """
@@ -40,11 +39,12 @@ are divisible by the specified value. Supports stretch or pad/crop modes for pro
 Outputs the resized image, optional mask, and final width/height for VFX pipeline integration.
 Also outputs a solid color panel (canvas) of the target size using the specified panel_color_mode and optional custom panel_color.
 When selecting 'Custom' for pad_color_mode or panel_color_mode, enter the color in the corresponding field as comma-separated floats, e.g., '0.5, 0.5, 0.5' for gray.
-If 'composed_image' is enabled, the IMAGE output will be the resized image composited onto the color panel using the (optionally inverted) mask.
-If 'inverted_mask' is enabled, the MASK output will be inverted, and the composed image (if enabled) will use the inverted mask.
+The 'composed_IMAGE' is the resized image composited onto the color panel using the mask (if provided; falls back to resized image if no mask).
+If 'invert_composed_MASK' is enabled, the composed_IMAGE will use an inverted mask for compositing (swapping the roles of image and panel).
+The 'inverted_MASK' is the inverted version of the mask (if provided).
 """
 
-    def adjust_to_aspect(self, image, base_on, base_size, aspect_ratio, upscale_method, keep_proportion, pad_color_mode, crop_position, divisible_by, device, panel_color_mode, mask=None, pad_color="0, 0, 0", panel_color="0, 0, 0", composed_image=False, inverted_mask=False):
+    def adjust_to_aspect(self, image, base_on, base_size, aspect_ratio, upscale_method, keep_proportion, pad_color_mode, crop_position, divisible_by, device, panel_color_mode, mask=None, pad_color="0, 0, 0", panel_color="0, 0, 0", invert_composed_MASK=False):
         def round_to_nearest_multiple(number, multiple):
             return multiple * round(number / multiple)
 
@@ -186,15 +186,10 @@ If 'inverted_mask' is enabled, the MASK output will be inverted, and the compose
         color_panel = color_panel.expand(B, -1, -1, -1)  # Expand to match batch size B
         color_panel = color_panel.movedim(1, -1)  # to [B, H, W, 3]
 
-        # Handle mask inversion if enabled
-        if out_mask is not None and inverted_mask:
-            out_mask = 1.0 - out_mask
-
-        # Handle composed image if enabled
-        if composed_image:
-            if out_mask is None:
-                raise ValueError("Composed image requires a mask input.")
-            # Composite: image * mask + color_panel * (1 - mask)
+        # Compute composed_IMAGE if mask is provided
+        composed_image_out = out_image.clone()  # Default to out_image
+        if out_mask is not None:
+            # Composite: out_image * mask + color_panel * (1 - mask)
             # Ensure color_panel has same channels as out_image (add alpha if needed)
             if has_alpha:
                 color_panel_alpha = torch.cat([color_panel, torch.ones((B, target_height, target_width, 1), dtype=image.dtype, device=device)], dim=-1)
@@ -202,9 +197,17 @@ If 'inverted_mask' is enabled, the MASK output will be inverted, and the compose
                 color_panel_alpha = color_panel
             # Expand mask to match channels
             expanded_mask = out_mask.unsqueeze(-1).expand(-1, -1, -1, out_image.shape[-1])
-            out_image = out_image * expanded_mask + color_panel_alpha * (1.0 - expanded_mask)
+            if invert_composed_MASK:
+                composed_image_out = out_image * (1.0 - expanded_mask) + color_panel_alpha * expanded_mask
+            else:
+                composed_image_out = out_image * expanded_mask + color_panel_alpha * (1.0 - expanded_mask)
 
-        return (out_image, out_mask, target_width, target_height, color_panel, original_W, original_H, original_aspect_ratio)
+        # Compute inverted_MASK if mask is provided
+        inverted_mask_out = None
+        if out_mask is not None:
+            inverted_mask_out = 1.0 - out_mask
+
+        return (out_image, composed_image_out, out_mask, inverted_mask_out, target_width, target_height, color_panel, original_W, original_H, original_aspect_ratio)
 
 # Individual node mappings
 NODE_CLASS_MAPPINGS = {