wuyingwen/comfyui
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

add support to output camera state (#7582)

Browse Source
This commit is contained in:
Terry Jia 2025-04-18 02:52:18 -04:00 committed by GitHub
parent 55822faa05
commit 34e06bf7ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
comfy_extras/nodes_load_3d.py
View File

@ -21,8 +21,8 @@ class Load3D():
"height": ("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", "IMAGE") RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "IMAGE", "LOAD3D_CAMERA")
RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "lineart") RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "lineart", "camera_info")
FUNCTION = "process" FUNCTION = "process"
EXPERIMENTAL = True EXPERIMENTAL = True
@ -41,7 +41,7 @@ class Load3D():
normal_image, ignore_mask2 = load_image_node.load_image(image=normal_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) lineart_image, ignore_mask3 = load_image_node.load_image(image=lineart_path)
return output_image, output_mask, model_file, normal_image, lineart_image return output_image, output_mask, model_file, normal_image, lineart_image, image['camera_info']
class Load3DAnimation(): class Load3DAnimation():
@classmethod @classmethod
@ -59,8 +59,8 @@ class Load3DAnimation():
"height": ("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") RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "LOAD3D_CAMERA")
RETURN_NAMES = ("image", "mask", "mesh_path", "normal") RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "camera_info")
FUNCTION = "process" FUNCTION = "process"
EXPERIMENTAL = True EXPERIMENTAL = True
@ -77,13 +77,16 @@ class Load3DAnimation():
ignore_image, output_mask = load_image_node.load_image(image=mask_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) normal_image, ignore_mask2 = load_image_node.load_image(image=normal_path)
return output_image, output_mask, model_file, normal_image return output_image, output_mask, model_file, normal_image, image['camera_info']
class Preview3D(): class Preview3D():
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { return {"required": {
"model_file": ("STRING", {"default": "", "multiline": False}), "model_file": ("STRING", {"default": "", "multiline": False}),
},
"optional": {
"camera_info": ("LOAD3D_CAMERA", {})
}} }}
OUTPUT_NODE = True OUTPUT_NODE = True
@ -95,13 +98,22 @@ class Preview3D():
EXPERIMENTAL = True EXPERIMENTAL = True
def process(self, model_file, **kwargs): def process(self, model_file, **kwargs):
return {"ui": {"model_file": [model_file]}, "result": ()} camera_info = kwargs.get("camera_info", None)
return {
"ui": {
"result": [model_file, camera_info]
}
}
class Preview3DAnimation(): class Preview3DAnimation():
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { return {"required": {
"model_file": ("STRING", {"default": "", "multiline": False}), "model_file": ("STRING", {"default": "", "multiline": False}),
},
"optional": {
"camera_info": ("LOAD3D_CAMERA", {})
}} }}
OUTPUT_NODE = True OUTPUT_NODE = True
@ -113,7 +125,13 @@ class Preview3DAnimation():
EXPERIMENTAL = True EXPERIMENTAL = True
def process(self, model_file, **kwargs): def process(self, model_file, **kwargs):
return {"ui": {"model_file": [model_file]}, "result": ()} camera_info = kwargs.get("camera_info", None)
return {
"ui": {
"result": [model_file, camera_info]
}
}
NODE_CLASS_MAPPINGS = { NODE_CLASS_MAPPINGS = {
"Load3D": Load3D, "Load3D": Load3D,