@@ -20,9 +20,7 @@ def INPUT_TYPES(s):
2020 "width" : ("INT" , {"default" : 1024 , "min" : 1 , "max" : 4096 , "step" : 1 }),
2121 "height" : ("INT" , {"default" : 1024 , "min" : 1 , "max" : 4096 , "step" : 1 }),
2222 "material" : (["original" , "normal" , "wireframe" , "depth" ],),
23- "light_intensity" : ("INT" , {"default" : 10 , "min" : 1 , "max" : 20 , "step" : 1 }),
2423 "up_direction" : (["original" , "-x" , "+x" , "-y" , "+y" , "-z" , "+z" ],),
25- "fov" : ("INT" , {"default" : 75 , "min" : 10 , "max" : 150 , "step" : 1 }),
2624 }}
2725
2826 RETURN_TYPES = ("IMAGE" , "MASK" , "STRING" )
@@ -34,22 +32,14 @@ def INPUT_TYPES(s):
3432 CATEGORY = "3d"
3533
3634 def process (self , model_file , image , ** kwargs ):
37- if isinstance (image , dict ):
38- image_path = folder_paths .get_annotated_filepath (image ['image' ])
39- mask_path = folder_paths .get_annotated_filepath (image ['mask' ])
40-
41- load_image_node = nodes .LoadImage ()
42- output_image , ignore_mask = load_image_node .load_image (image = image_path )
43- ignore_image , output_mask = load_image_node .load_image (image = mask_path )
44-
45- return output_image , output_mask , model_file ,
46- else :
47- # to avoid the format is not dict which will happen the FE code is not compatibility to core,
48- # we need to this to double-check, it can be removed after merged FE into the core
49- image_path = folder_paths .get_annotated_filepath (image )
50- load_image_node = nodes .LoadImage ()
51- output_image , output_mask = load_image_node .load_image (image = image_path )
52- return output_image , output_mask , model_file ,
35+ image_path = folder_paths .get_annotated_filepath (image ['image' ])
36+ mask_path = folder_paths .get_annotated_filepath (image ['mask' ])
37+
38+ load_image_node = nodes .LoadImage ()
39+ output_image , ignore_mask = load_image_node .load_image (image = image_path )
40+ ignore_image , output_mask = load_image_node .load_image (image = mask_path )
41+
42+ return output_image , output_mask , model_file ,
5343
5444class Load3DAnimation ():
5545 @classmethod
@@ -66,9 +56,7 @@ def INPUT_TYPES(s):
6656 "width" : ("INT" , {"default" : 1024 , "min" : 1 , "max" : 4096 , "step" : 1 }),
6757 "height" : ("INT" , {"default" : 1024 , "min" : 1 , "max" : 4096 , "step" : 1 }),
6858 "material" : (["original" , "normal" , "wireframe" , "depth" ],),
69- "light_intensity" : ("INT" , {"default" : 10 , "min" : 1 , "max" : 20 , "step" : 1 }),
7059 "up_direction" : (["original" , "-x" , "+x" , "-y" , "+y" , "-z" , "+z" ],),
71- "fov" : ("INT" , {"default" : 75 , "min" : 10 , "max" : 150 , "step" : 1 }),
7260 }}
7361
7462 RETURN_TYPES = ("IMAGE" , "MASK" , "STRING" )
@@ -80,30 +68,22 @@ def INPUT_TYPES(s):
8068 CATEGORY = "3d"
8169
8270 def process (self , model_file , image , ** kwargs ):
83- if isinstance (image , dict ):
84- image_path = folder_paths .get_annotated_filepath (image ['image' ])
85- mask_path = folder_paths .get_annotated_filepath (image ['mask' ])
71+ image_path = folder_paths .get_annotated_filepath (image ['image' ])
72+ mask_path = folder_paths .get_annotated_filepath (image ['mask' ])
8673
87- load_image_node = nodes .LoadImage ()
88- output_image , ignore_mask = load_image_node .load_image (image = image_path )
89- ignore_image , output_mask = load_image_node .load_image (image = mask_path )
74+ load_image_node = nodes .LoadImage ()
75+ output_image , ignore_mask = load_image_node .load_image (image = image_path )
76+ ignore_image , output_mask = load_image_node .load_image (image = mask_path )
9077
91- return output_image , output_mask , model_file ,
92- else :
93- image_path = folder_paths .get_annotated_filepath (image )
94- load_image_node = nodes .LoadImage ()
95- output_image , output_mask = load_image_node .load_image (image = image_path )
96- return output_image , output_mask , model_file ,
78+ return output_image , output_mask , model_file ,
9779
9880class Preview3D ():
9981 @classmethod
10082 def INPUT_TYPES (s ):
10183 return {"required" : {
10284 "model_file" : ("STRING" , {"default" : "" , "multiline" : False }),
10385 "material" : (["original" , "normal" , "wireframe" , "depth" ],),
104- "light_intensity" : ("INT" , {"default" : 10 , "min" : 1 , "max" : 20 , "step" : 1 }),
10586 "up_direction" : (["original" , "-x" , "+x" , "-y" , "+y" , "-z" , "+z" ],),
106- "fov" : ("INT" , {"default" : 75 , "min" : 10 , "max" : 150 , "step" : 1 }),
10787 }}
10888
10989 OUTPUT_NODE = True
@@ -123,9 +103,7 @@ def INPUT_TYPES(s):
123103 return {"required" : {
124104 "model_file" : ("STRING" , {"default" : "" , "multiline" : False }),
125105 "material" : (["original" , "normal" , "wireframe" , "depth" ],),
126- "light_intensity" : ("INT" , {"default" : 10 , "min" : 1 , "max" : 20 , "step" : 1 }),
127106 "up_direction" : (["original" , "-x" , "+x" , "-y" , "+y" , "-z" , "+z" ],),
128- "fov" : ("INT" , {"default" : 75 , "min" : 10 , "max" : 150 , "step" : 1 }),
129107 }}
130108
131109 OUTPUT_NODE = True
0 commit comments