Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

Merge 3d animation node (#10025)

Terry Jia58c6ed541d5a
diff --git a/comfy_extras/nodes_load_3d.py b/comfy_extras/nodes_load_3d.py
index 899608149..54c66ef68 100644
--- a/comfy_extras/nodes_load_3d.py
+++ b/comfy_extras/nodes_load_3d.py
@@ -7,6 +7,10 @@ from comfy_api.input_impl import VideoFromFile
from pathlib import Path
+from PIL import Image
+import numpy as np
+
+import uuid
def normalize_path(path):
return path.replace('\\', '/')
@@ -34,58 +38,6 @@ class Load3D():
"height": ("INT", {"default": 1024, "min": 1, "max": 4096, "step": 1}),
}}
- RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "IMAGE", "LOAD3D_CAMERA", IO.VIDEO)
- RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "lineart", "camera_info", "recording_video")
-
- FUNCTION = "process"
- EXPERIMENTAL = True
-
- CATEGORY = "3d"
-
- def process(self, model_file, image, **kwargs):
- image_path = folder_paths.get_annotated_filepath(image['image'])
- mask_path = folder_paths.get_annotated_filepath(image['mask'])
- normal_path = folder_paths.get_annotated_filepath(image['normal'])
- lineart_path = folder_paths.get_annotated_filepath(image['lineart'])
-
- load_image_node = nodes.LoadImage()
- output_image, ignore_mask = load_image_node.load_image(image=image_path)
- ignore_image, output_mask = load_image_node.load_image(image=mask_path)
- normal_image, ignore_mask2 = load_image_node.load_image(image=normal_path)
- lineart_image, ignore_mask3 = load_image_node.load_image(image=lineart_path)
-
- video = None
-
- if image['recording'] != "":
- recording_video_path = folder_paths.get_annotated_filepath(image['recording'])
-
- video = VideoFromFile(recording_video_path)
-
- return output_image, output_mask, model_file, normal_image, lineart_image, image['camera_info'], video
-
-class Load3DAnimation():
- @classmethod
- def INPUT_TYPES(s):
- input_dir = os.path.join(folder_paths.get_input_directory(), "3d")
-
- os.makedirs(input_dir, exist_ok=True)
-
- input_path = Path(input_dir)
- base_path = Path(folder_paths.get_input_directory())
-
- files = [
- normalize_path(str(file_path.relative_to(base_path)))
- for file_path in input_path.rglob("*")
- if file_path.suffix.lower() in {'.gltf', '.glb', '.fbx'}
- ]
-
- return {"required": {
- "model_file": (sorted(files), {"file_upload": True}),
- "image": ("LOAD_3D_ANIMATION", {}),
- "width": ("INT", {"default": 1024, "min": 1, "max": 4096, "step": 1}),
- "height": ("INT", {"default": 1024, "min": 1, "max": 4096, "step": 1}),
- }}
-
RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "LOAD3D_CAMERA", IO.VIDEO)
RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "camera_info", "recording_video")
@@ -120,7 +72,8 @@ class Preview3D():
"model_file": ("STRING", {"default": "", "multiline": False}),
},
"optional": {
- "camera_info": ("LOAD3D_CAMERA", {})
+ "camera_info": ("LOAD3D_CAMERA", {}),
+ "bg_image": ("IMAGE", {})
}}
OUTPUT_NODE = True
@@ -133,50 +86,33 @@ class Preview3D():
def process(self, model_file, **kwargs):
camera_info = kwargs.get("camera_info", None)
+ bg_image = kwargs.get("bg_image", None)
- return {
- "ui": {
- "result": [model_file, camera_info]
- }
- }
-
-class Preview3DAnimation():
- @classmethod
- def INPUT_TYPES(s):
- return {"required": {
- "model_file": ("STRING", {"default": "", "multiline": False}),
- },
- "optional": {
- "camera_info": ("LOAD3D_CAMERA", {})
- }}
-
- OUTPUT_NODE = True
- RETURN_TYPES = ()
+ bg_image_path = None
+ if bg_image is not None:
- CATEGORY = "3d"
+ img_array = (bg_image[0].cpu().numpy() * 255).astype(np.uint8)
+ img = Image.fromarray(img_array)
- FUNCTION = "process"
- EXPERIMENTAL = True
+ temp_dir = folder_paths.get_temp_directory()
+ filename = f"bg_{uuid.uuid4().hex}.png"
+ bg_image_path = os.path.join(temp_dir, filename)
+ img.save(bg_image_path, compress_level=1)
- def process(self, model_file, **kwargs):
- camera_info = kwargs.get("camera_info", None)
+ bg_image_path = f"temp/{filename}"
return {
"ui": {
- "result": [model_file, camera_info]
+ "result": [model_file, camera_info, bg_image_path]
}
}
NODE_CLASS_MAPPINGS = {
"Load3D": Load3D,
- "Load3DAnimation": Load3DAnimation,
"Preview3D": Preview3D,
- "Preview3DAnimation": Preview3DAnimation
}
NODE_DISPLAY_NAME_MAPPINGS = {
- "Load3D": "Load 3D",
- "Load3DAnimation": "Load 3D - Animation",
- "Preview3D": "Preview 3D",
- "Preview3DAnimation": "Preview 3D - Animation"
+ "Load3D": "Load 3D & Animation",
+ "Preview3D": "Preview 3D & Animation",
}