nodes/kijai-ComfyUI-IC-Light
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
kijai
2024-05-10 19:18:16 +03:00
parent bc544816f9
commit e113fb7dfb
4 changed files with 53 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/ic_light_animated_example_01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 740 KiB

examples/ic_light_animated_example_02.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

nodes.py
+13 -89
View File
@@ -162,79 +162,6 @@ To use the "opt_background" input, you also need to use the
n = [t[0], d]
c.append(n)
out.append(c)
return (out[0], out[1], negative, out_latent)
### Light Source
import numpy as np
from enum import Enum
from nodes import MAX_RESOLUTION
class LightPosition(Enum):
LEFT = "Left Light"
RIGHT = "Right Light"
TOP = "Top Light"
BOTTOM = "Bottom Light"
TOP_LEFT = "Top Left Light"
TOP_RIGHT = "Top Right Light"
BOTTOM_LEFT = "Bottom Left Light"
BOTTOM_RIGHT = "Bottom Right Light"
def generate_gradient_image(width:int, height:int, color_rgb: tuple, multiplier: float, lightPosition:LightPosition):
"""
Generate a gradient image with a light source effect.
Parameters:
width (int): Width of the image.
height (int): Height of the image.
color_rgb: Color RGB of the image.
multiplier: weight of light.
lightPosition (str): Position of the light source.
It can be 'Left Light', 'Right Light', 'Top Light', 'Bottom Light',
'Top Left Light', 'Top Right Light', 'Bottom Left Light', 'Bottom Right Light'.
Returns:
np.array: 2D gradient image array.
"""
if lightPosition == LightPosition.LEFT:
gradient = np.tile(np.linspace(1, 0, width), (height, 1))
elif lightPosition == LightPosition.RIGHT:
gradient = np.tile(np.linspace(0, 1, width), (height, 1))
elif lightPosition == LightPosition.TOP:
gradient = np.tile(np.linspace(1, 0, height), (width, 1)).T
elif lightPosition == LightPosition.BOTTOM:
gradient = np.tile(np.linspace(0, 1, height), (width, 1)).T
elif lightPosition == LightPosition.TOP_LEFT:
x = np.linspace(1, 0, width)
y = np.linspace(1, 0, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
elif lightPosition == LightPosition.TOP_RIGHT:
x = np.linspace(0, 1, width)
y = np.linspace(1, 0, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
elif lightPosition == LightPosition.BOTTOM_LEFT:
x = np.linspace(1, 0, width)
y = np.linspace(0, 1, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
elif lightPosition == LightPosition.BOTTOM_RIGHT:
x = np.linspace(0, 1, width)
y = np.linspace(0, 1, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
else:
raise ValueError("Unsupported position. Choose from 'Left Light', 'Right Light', 'Top Light', 'Bottom Light','Top Left Light', 'Top Right Light', 'Bottom Left Light', 'Bottom Right Light'.")
gradient = gradient * multiplier
gradient_x = gradient * color_rgb[0]
gradient_y = gradient * color_rgb[1]
gradient_z = gradient * color_rgb[2]
gradient = [gradient_x, gradient_y, gradient_z]
gradient = np.stack(gradient, axis=-1).astype(np.uint8)
return gradient
return (out[0], out[1], {"samples": out_latent})
class LightSource:
@@ -242,13 +169,12 @@ class LightSource:
def INPUT_TYPES(s):
return {
"required": {
"light_position": (["Left Light", "Right Light", "Top Light", "Bottom Light",'Top Left Light', 'Top Right Light', 'Bottom Left Light', 'Bottom Right Light'],),
"multiplier": ("FLOAT", {"default": 0.5, "min": 0.0, "max": 1.0, "step": 0.001}),
"color": ("STRING", {"default": "#ffffff"}),
"light_position": ([member.value for member in LightPosition],),
"multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 100.0, "step": 0.001}),
"start_color": ("STRING", {"default": "#FFFFFF"}),
"end_color": ("STRING", {"default": "#000000"}),
"width": ("INT", { "default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 8, }),
"height": ("INT", { "default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 8, }),
"multiplier": ("FLOAT", { "default": 1.0, "min": 0.0, "max": 100.0, "step": 0.01, }),
"color": ("STRING", {"default": "#FFFFFF"})
"height": ("INT", { "default": 512, "min": 0, "max": MAX_RESOLUTION, "step": 8, })
}
}
@@ -262,19 +188,19 @@ as a simple light source. The color can be
specified in RGB or hex format.
"""
def execute(self, light_position, multiplier, color, width, height):
def execute(self, light_position, multiplier, start_color, end_color, width, height):
def toRgb(color):
if color.startswith('#') and len(color) == 7: # e.g. "#RRGGBB"
color_hex = color.lstrip('#')
color_rgb =tuple(int(color_hex[i:i+2], 16) for i in (0, 2, 4))
else:
color_rgb =tuple(int(color[i:i+2], 16) for i in (1, 3, 5))
else: # e.g. "255,255,255"
color_rgb = tuple(int(i) for i in color.split(','))
return color_rgb
lightPosition = LightPosition(light_position)
image = generate_gradient_image(width, height, color_rgb, multiplier, lightPosition)
start_color_rgb = toRgb(start_color)
end_color_rgb = toRgb(end_color)
image = generate_gradient_image(width, height, start_color_rgb, end_color_rgb, multiplier, lightPosition)
# Convert a numpy array to a tensor and scale its values from 0-255 to 0-1
image = image.astype(np.float32) / 255.0
image = image * multiplier
image = torch.from_numpy(image)[None,]
return (image,)
@@ -344,10 +270,8 @@ left, right, bottom, top
normal = normal + np.stack([z, z, 1 - z], axis=2)
normal = torch.from_numpy(normal).unsqueeze(0)
print(normal.min(), normal.max())
normal = (normal + 1.0) / 2.0
normal = torch.clamp(normal, 0, 1)
print(normal.min(), normal.max())
return (normal,)
utils/image.py
+35 -29
View File
@@ -12,51 +12,57 @@ class LightPosition(Enum):
BOTTOM_LEFT = "Bottom Left Light"
BOTTOM_RIGHT = "Bottom Right Light"
def generate_gradient_image(width:int, height:int, lightPosition:LightPosition):
def generate_gradient_image(width:int, height:int, start_color: tuple, end_color: tuple, multiplier: float, lightPosition:LightPosition):
"""
Generate a gradient image with a light source effect.
Parameters:
width (int): Width of the image.
height (int): Height of the image.
lightPosition (str): Position of the light source.
It can be 'Left Light', 'Right Light', 'Top Light', 'Bottom Light',
'Top Left Light', 'Top Right Light', 'Bottom Left Light', 'Bottom Right Light'.
start_color: Starting color RGB of the gradient.
end_color: Ending color RGB of the gradient.
multiplier: Weight of light.
lightPosition (LightPosition): Position of the light source.
Returns:
np.array: 2D gradient image array.
"""
# Create a gradient from 0 to 1 and apply multiplier
if lightPosition == LightPosition.LEFT:
gradient = np.tile(np.linspace(255, 0, width), (height, 1))
gradient = np.tile(np.linspace(0, 1, width)**multiplier, (height, 1))
elif lightPosition == LightPosition.RIGHT:
gradient = np.tile(np.linspace(0, 255, width), (height, 1))
gradient = np.tile(np.linspace(1, 0, width)**multiplier, (height, 1))
elif lightPosition == LightPosition.TOP:
gradient = np.tile(np.linspace(255, 0, height), (width, 1)).T
gradient = np.tile(np.linspace(0, 1, height)**multiplier, (width, 1)).T
elif lightPosition == LightPosition.BOTTOM:
gradient = np.tile(np.linspace(0, 255, height), (width, 1)).T
elif lightPosition == LightPosition.TOP_LEFT:
x = np.linspace(255, 0, width)
y = np.linspace(255, 0, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
elif lightPosition == LightPosition.TOP_RIGHT:
x = np.linspace(0, 255, width)
y = np.linspace(255, 0, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
elif lightPosition == LightPosition.BOTTOM_LEFT:
x = np.linspace(255, 0, width)
y = np.linspace(0, 255, height)
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
gradient = np.tile(np.linspace(1, 0, height)**multiplier, (width, 1)).T
elif lightPosition == LightPosition.BOTTOM_RIGHT:
x = np.linspace(0, 255, width)
y = np.linspace(0, 255, height)
x = np.linspace(1, 0, width)**multiplier
y = np.linspace(1, 0, height)**multiplier
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = (x_mesh + y_mesh) / 2
gradient = np.sqrt(x_mesh**2 + y_mesh**2) / np.sqrt(2.0)
elif lightPosition == LightPosition.BOTTOM_LEFT:
x = np.linspace(0, 1, width)**multiplier
y = np.linspace(1, 0, height)**multiplier
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = np.sqrt(x_mesh**2 + y_mesh**2) / np.sqrt(2.0)
elif lightPosition == LightPosition.TOP_RIGHT:
x = np.linspace(1, 0, width)**multiplier
y = np.linspace(0, 1, height)**multiplier
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = np.sqrt(x_mesh**2 + y_mesh**2) / np.sqrt(2.0)
elif lightPosition == LightPosition.TOP_LEFT:
x = np.linspace(0, 1, width)**multiplier
y = np.linspace(0, 1, height)**multiplier
x_mesh, y_mesh = np.meshgrid(x, y)
gradient = np.sqrt(x_mesh**2 + y_mesh**2) / np.sqrt(2.0)
else:
raise ValueError("Unsupported position. Choose from 'Left Light', 'Right Light', 'Top Light', 'Bottom Light','Top Left Light', 'Top Right Light', 'Bottom Left Light', 'Bottom Right Light'.")
raise ValueError(f"Unsupported position. Choose from {', '.join([member.value for member in LightPosition])}.")
gradient = np.stack((gradient,) * 3, axis=-1).astype(np.uint8)
# Interpolate between start_color and end_color based on the gradient
gradient_img = np.zeros((height, width, 3), dtype=np.float32)
for i in range(3):
gradient_img[..., i] = start_color[i] + (end_color[i] - start_color[i]) * gradient
return gradient
gradient_img = np.clip(gradient_img, 0, 255).astype(np.uint8)
return gradient_img