wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-14 19:17:32 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Separate x/y values for rotate

Browse Source
This commit is contained in:
missionfloyd 2023-04-13 10:51:40 -06:00 committed by GitHub
parent 46a57e286d
commit a6347a959c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
comfy_extras/nodes_post_processing.py
View File

@ -6,6 +6,7 @@ import re
import comfy.utils import comfy.utils
MAX_RESOLUTION=8192
class Blend: class Blend:
def __init__(self): def __init__(self):
@ -271,8 +272,11 @@ class Rotate:
"Bicubic", "Bicubic",
],), ],),
"expand": (["disabled", "enabled"],), "expand": (["disabled", "enabled"],),
"center": ("STRING", {"default": None}), "center_x": ("INT", {"default": 0, "min": -MAX_RESOLUTION, "max": MAX_RESOLUTION}),
"translate": ("STRING", {"default": None}), "center_y": ("INT", {"default": 0, "min": -MAX_RESOLUTION, "max": MAX_RESOLUTION}),
"center_of_image": (["disabled", "enabled"],),
"translate_x": ("INT", {"default": 0, "min": -MAX_RESOLUTION, "max": MAX_RESOLUTION}),
"translate_y": ("INT", {"default": 0, "min": -MAX_RESOLUTION, "max": MAX_RESOLUTION}),
"fill_color": ("STRING", {"default": "#000000"}), "fill_color": ("STRING", {"default": "#000000"}),
}, },
} }
@ -282,8 +286,8 @@ class Rotate:
CATEGORY = "image/postprocessing" CATEGORY = "image/postprocessing"
def rotate(self, image: torch.Tensor, angle: int, resample: str, expand: str, center: str, translate: str, fill_color: str): def rotate(self, image: torch.Tensor, angle: int, resample: str, expand: str, center_x: int, center_y: int, center_of_image: str, translate_x: int, translate_y: int, fill_color: str):
batch_size, _, _, _ = image.shape batch_size, height, width, _ = image.shape
resamplers = { resamplers = {
"Nearest Neighbor": Image.Resampling.NEAREST, "Nearest Neighbor": Image.Resampling.NEAREST,
@ -308,20 +312,16 @@ class Rotate:
else: else:
raise ValueError(f"Invalid color format: {color_str}") raise ValueError(f"Invalid color format: {color_str}")
def parse_coord(coord_str): center = (center_x, center_y) if center_of_image == "disabled" else (width / 2, height / 2)
if re.match(r'^\s*-?\d+\s*,\s*-?\d+\s*$', coord_str): print(center_of_image)
return tuple(map(int, re.findall(r'-?\d+', coord_str))) print(center)
else: translate = (translate_x, translate_y)
raise ValueError(f"Invalid coordinates: {coord_str}")
center = parse_coord(center) if center else tuple(map(lambda x: x / 2, pil_image.size))
translate = parse_coord(translate) if translate else (0, 0)
color = fill_color.replace(" ", "") color = fill_color.replace(" ", "")
color = parse_palette(color) color = parse_palette(color)
rotated_image = pil_image.rotate(angle=angle, resample=resamplers[resample], expand=expand, center=center, translate=translate, fillcolor=color) rotated_image = pil_image.rotate(angle=angle, resample=resamplers[resample], expand=expand, center=center, translate=translate, fillcolor=color)
width, height = rotated_image.size result_width, result_height = rotated_image.size
result = torch.zeros(batch_size, height, width, 3) result = torch.zeros(batch_size, result_height, result_width, 3)
rotated_array = torch.tensor(np.array(rotated_image.convert("RGB"))).float() / 255 rotated_array = torch.tensor(np.array(rotated_image.convert("RGB"))).float() / 255
result[0] = rotated_array result[0] = rotated_array