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.

add support to output camera state (#7582)

Terry Jia34e06bf7ecb6
diff --git a/comfy_extras/nodes_load_3d.py b/comfy_extras/nodes_load_3d.py
index db30030fb..53d892bc4 100644
--- a/comfy_extras/nodes_load_3d.py
+++ b/comfy_extras/nodes_load_3d.py
@@ -21,8 +21,8 @@ class Load3D():
"height": ("INT", {"default": 1024, "min": 1, "max": 4096, "step": 1}),
}}
- RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "IMAGE")
- RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "lineart")
+ RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "IMAGE", "LOAD3D_CAMERA")
+ RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "lineart", "camera_info")
FUNCTION = "process"
EXPERIMENTAL = True
@@ -41,7 +41,7 @@ class Load3D():
normal_image, ignore_mask2 = load_image_node.load_image(image=normal_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():
@classmethod
@@ -59,8 +59,8 @@ class Load3DAnimation():
"height": ("INT", {"default": 1024, "min": 1, "max": 4096, "step": 1}),
}}
- RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE")
- RETURN_NAMES = ("image", "mask", "mesh_path", "normal")
+ RETURN_TYPES = ("IMAGE", "MASK", "STRING", "IMAGE", "LOAD3D_CAMERA")
+ RETURN_NAMES = ("image", "mask", "mesh_path", "normal", "camera_info")
FUNCTION = "process"
EXPERIMENTAL = True
@@ -77,13 +77,16 @@ class Load3DAnimation():
ignore_image, output_mask = load_image_node.load_image(image=mask_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():
@classmethod
def INPUT_TYPES(s):
return {"required": {
"model_file": ("STRING", {"default": "", "multiline": False}),
+ },
+ "optional": {
+ "camera_info": ("LOAD3D_CAMERA", {})
}}
OUTPUT_NODE = True
@@ -95,13 +98,22 @@ class Preview3D():
EXPERIMENTAL = True
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():
@classmethod
def INPUT_TYPES(s):
return {"required": {
"model_file": ("STRING", {"default": "", "multiline": False}),
+ },
+ "optional": {
+ "camera_info": ("LOAD3D_CAMERA", {})
}}
OUTPUT_NODE = True
@@ -113,7 +125,13 @@ class Preview3DAnimation():
EXPERIMENTAL = True
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 = {
"Load3D": Load3D,