diff --git a/example_workflows/Advanced.json b/example_workflows/Advanced.json index 1313f41..92f3121 100644 --- a/example_workflows/Advanced.json +++ b/example_workflows/Advanced.json @@ -1,300 +1,22 @@ { - "id": "440427ce-0c6a-4462-af51-639ed2f16dec", + "id": "cd6e2e00-83cc-4795-abf1-09b46428c270", "revision": 0, - "last_node_id": 41, - "last_link_id": 80, + "last_node_id": 50, + "last_link_id": 101, "nodes": [ - { - "id": 39, - "type": "Trellis2LoadModel", - "pos": [ - 172.34044277137122, - 635.2670381050675 - ], - "size": [ - 301.7261859434295, - 130 - ], - "flags": {}, - "order": 0, - "mode": 0, - "inputs": [], - "outputs": [ - { - "name": "pipeline", - "type": "TRELLIS2PIPELINE", - "links": [ - 75 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "c5d66aa46bf1bbf903fd4fe9ff086ac774bb7e03", - "Node name for S&R": "Trellis2LoadModel", - "widget_ue_connectable": {} - }, - "widgets_values": [ - "TRELLIS.2-4B", - "flash_attn", - "cuda", - true - ] - }, - { - "id": 6, - "type": "Trellis2LoadImageWithTransparency", - "pos": [ - 134.7157262503816, - 834.9720915725163 - ], - "size": [ - 378.59551697974155, - 463.3598024362732 - ], - "flags": {}, - "order": 1, - "mode": 0, - "inputs": [], - "outputs": [ - { - "name": "image", - "type": "IMAGE", - "links": null - }, - { - "name": "mask", - "type": "MASK", - "links": null - }, - { - "name": "image_with_alpha", - "type": "IMAGE", - "links": [ - 76 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "e7f9b30df7a09bcedf1c955e176754c73f983254", - "Node name for S&R": "Trellis2LoadImageWithTransparency", - "widget_ue_connectable": {} - }, - "widgets_values": [ - "Image_04291_.png", - "image" - ] - }, - { - "id": 40, - "type": "Trellis2MeshWithVoxelAdvancedGenerator", - "pos": [ - 555.1619459582687, - 700.5135710436982 - ], - "size": [ - 413.1841796875, - 438 - ], - "flags": {}, - "order": 2, - "mode": 0, - "inputs": [ - { - "name": "pipeline", - "type": "TRELLIS2PIPELINE", - "link": 75 - }, - { - "name": "image", - "type": "IMAGE", - "link": 76 - } - ], - "outputs": [ - { - "name": "mesh", - "type": "MESHWITHVOXEL", - "links": [ - 79 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "022090e3d6df179ab463d33da445e57ba3891211", - "Node name for S&R": "Trellis2MeshWithVoxelAdvancedGenerator", - "widget_ue_connectable": {} - }, - "widgets_values": [ - 723525328, - "randomize", - "1024_cascade", - 12, - 7.5, - 0.7, - 5, - 12, - 7.5, - 0.5, - 3, - 12, - 7.5, - 0.5, - 3, - 100000 - ] - }, - { - "id": 41, - "type": "Trellis2SimplifyMesh", - "pos": [ - 873.1780893119785, - 547.9097136148278 - ], - "size": [ - 270, - 82 - ], - "flags": {}, - "order": 3, - "mode": 0, - "inputs": [ - { - "name": "mesh", - "type": "MESHWITHVOXEL", - "link": 79 - } - ], - "outputs": [ - { - "name": "mesh", - "type": "MESHWITHVOXEL", - "links": [ - 80 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "7b7c73f87eb65a3ff1fd5c28bdd7d097e57eb9dc", - "widget_ue_connectable": {}, - "Node name for S&R": "Trellis2SimplifyMesh" - }, - "widgets_values": [ - 5000000, - "Meshlib" - ] - }, - { - "id": 38, - "type": "Trellis2PostProcessAndUnWrapAndRasterizer", - "pos": [ - 997.3126942209559, - 703.70828486086 - ], - "size": [ - 419.15234375, - 370 - ], - "flags": {}, - "order": 4, - "mode": 0, - "inputs": [ - { - "name": "mesh", - "type": "MESHWITHVOXEL", - "link": 80 - } - ], - "outputs": [ - { - "name": "trimesh", - "type": "TRIMESH", - "links": [ - 73 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "c5d66aa46bf1bbf903fd4fe9ff086ac774bb7e03", - "Node name for S&R": "Trellis2PostProcessAndUnWrapAndRasterizer", - "widget_ue_connectable": {} - }, - "widgets_values": [ - 90, - 0, - 1, - 1, - 2048, - true, - 1, - 0, - 1000000, - "Meshlib", - true, - 0.03, - "OPAQUE", - "Auto" - ] - }, - { - "id": 19, - "type": "Trellis2ExportMesh", - "pos": [ - 1360.0462953298393, - 514.4818209219691 - ], - "size": [ - 270, - 106 - ], - "flags": {}, - "order": 5, - "mode": 0, - "inputs": [ - { - "name": "trimesh", - "type": "TRIMESH", - "link": 73 - } - ], - "outputs": [ - { - "name": "glb_path", - "type": "STRING", - "links": [ - 22 - ] - } - ], - "properties": { - "aux_id": "visualbruno/ComfyUI-Trellis2", - "ver": "e7f9b30df7a09bcedf1c955e176754c73f983254", - "Node name for S&R": "Trellis2ExportMesh", - "widget_ue_connectable": {} - }, - "widgets_values": [ - "Home_2K", - "glb", - true - ] - }, { "id": 10, "type": "Preview3D", "pos": [ - 1457.5762924746616, - 705.9659231712205 + 1548.6308281337172, + 683.7095748164888 ], "size": [ - 626.8865556299502, - 658.2643216794061 + 1013.3691843953643, + 998.5997708907405 ], "flags": {}, - "order": 6, + "order": 7, "mode": 0, "inputs": [ { @@ -324,7 +46,7 @@ "ver": "0.4.0", "Node name for S&R": "Preview3D", "widget_ue_connectable": {}, - "Last Time Model File": "Home_2K_00001_.glb", + "Last Time Model File": "ArmoredWarrior_00002_.glb", "Scene Config": { "showGrid": true, "backgroundColor": "#282828", @@ -336,14 +58,14 @@ "fov": 35, "state": { "position": { - "x": 12.514315832403488, - "y": 3.895614510886169, - "z": 9.139010516199487 + "x": 1.4101977762939673, + "y": 2.397771625867536, + "z": 8.997201229712031 }, "target": { - "x": 0, - "y": 2.1870527424637647, - "z": 0 + "x": 1.4732208254010746e-177, + "y": 2.5, + "z": 6.912872131937994e-178 }, "zoom": 1, "cameraType": "perspective" @@ -354,9 +76,333 @@ } }, "widgets_values": [ - "Home_2K_00001_.glb", + "ArmoredWarrior_00002_.glb", "" ] + }, + { + "id": 46, + "type": "Trellis2PostProcessAndUnWrapAndRasterizer", + "pos": [ + 1076.763962476609, + 681.6982664054461 + ], + "size": [ + 419.15234375, + 370 + ], + "flags": {}, + "order": 5, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "link": 99 + } + ], + "outputs": [ + { + "name": "trimesh", + "type": "TRIMESH", + "links": [ + 91 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "89c4df5580f6af33d69f227744b4ba867218aed2", + "Node name for S&R": "Trellis2PostProcessAndUnWrapAndRasterizer", + "widget_ue_connectable": {} + }, + "widgets_values": [ + 90, + 0, + 1, + 1, + 2048, + true, + 1, + 0, + 1000000, + "Cumesh", + true, + 0.03, + "OPAQUE", + "Auto" + ] + }, + { + "id": 50, + "type": "Trellis2PostProcessMesh", + "pos": [ + 684.0097431465649, + 393.3686045889856 + ], + "size": [ + 410.92578125, + 202 + ], + "flags": {}, + "order": 3, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "link": 100 + } + ], + "outputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "links": [ + 101 + ] + } + ], + "properties": { + "widget_ue_connectable": {}, + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "4a5808b014854dab02bdaa7d6c76f84d98b67abc", + "Node name for S&R": "Trellis2PostProcessMesh" + }, + "widgets_values": [ + true, + 0.03, + false, + false, + false, + false, + 0.00001 + ] + }, + { + "id": 6, + "type": "Trellis2LoadImageWithTransparency", + "pos": [ + 134.7157262503816, + 834.9720915725163 + ], + "size": [ + 392.34356316210614, + 466.5324210306162 + ], + "flags": {}, + "order": 0, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "image", + "type": "IMAGE", + "links": null + }, + { + "name": "mask", + "type": "MASK", + "links": null + }, + { + "name": "image_with_alpha", + "type": "IMAGE", + "links": [ + 88 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "e7f9b30df7a09bcedf1c955e176754c73f983254", + "Node name for S&R": "Trellis2LoadImageWithTransparency", + "widget_ue_connectable": {} + }, + "widgets_values": [ + "Image_2048_00008_.png", + "image" + ] + }, + { + "id": 39, + "type": "Trellis2LoadModel", + "pos": [ + 172.34044277137122, + 635.2670381050675 + ], + "size": [ + 301.7261859434295, + 130 + ], + "flags": {}, + "order": 1, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "pipeline", + "type": "TRELLIS2PIPELINE", + "links": [ + 87 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "c5d66aa46bf1bbf903fd4fe9ff086ac774bb7e03", + "Node name for S&R": "Trellis2LoadModel", + "widget_ue_connectable": {} + }, + "widgets_values": [ + "TRELLIS.2-4B", + "flash_attn", + "cuda", + true + ] + }, + { + "id": 19, + "type": "Trellis2ExportMesh", + "pos": [ + 1525.7435286397672, + 519.8175933989419 + ], + "size": [ + 270, + 106 + ], + "flags": {}, + "order": 6, + "mode": 0, + "inputs": [ + { + "name": "trimesh", + "type": "TRIMESH", + "link": 91 + } + ], + "outputs": [ + { + "name": "glb_path", + "type": "STRING", + "links": [ + 22 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "e7f9b30df7a09bcedf1c955e176754c73f983254", + "Node name for S&R": "Trellis2ExportMesh", + "widget_ue_connectable": {} + }, + "widgets_values": [ + "ArmoredWarrior", + "glb", + true + ] + }, + { + "id": 49, + "type": "Trellis2SimplifyMesh", + "pos": [ + 1136.0679049854102, + 394.2234458274239 + ], + "size": [ + 270, + 82 + ], + "flags": {}, + "order": 4, + "mode": 0, + "inputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "link": 101 + } + ], + "outputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "links": [ + 99 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "7b7c73f87eb65a3ff1fd5c28bdd7d097e57eb9dc", + "Node name for S&R": "Trellis2SimplifyMesh", + "widget_ue_connectable": {} + }, + "widgets_values": [ + 5000000, + "Cumesh" + ] + }, + { + "id": 45, + "type": "Trellis2MeshWithVoxelAdvancedGenerator", + "pos": [ + 571.2986524019634, + 681.544283746436 + ], + "size": [ + 413.1841796875, + 438 + ], + "flags": {}, + "order": 2, + "mode": 0, + "inputs": [ + { + "name": "pipeline", + "type": "TRELLIS2PIPELINE", + "link": 87 + }, + { + "name": "image", + "type": "IMAGE", + "link": 88 + } + ], + "outputs": [ + { + "name": "mesh", + "type": "MESHWITHVOXEL", + "links": [ + 100 + ] + } + ], + "properties": { + "aux_id": "visualbruno/ComfyUI-Trellis2", + "ver": "a28d6cf93b0cf24aa9e7d3dccfd14f406227fbd0", + "Node name for S&R": "Trellis2MeshWithVoxelAdvancedGenerator", + "widget_ue_connectable": {} + }, + "widgets_values": [ + 1469248273, + "randomize", + "1024", + 20, + 7.5, + 0, + 1, + 20, + 7.5, + 0, + 1, + 20, + 7, + 0, + 1, + 100000 + ] } ], "links": [ @@ -369,42 +415,50 @@ "STRING" ], [ - 73, - 38, + 87, + 39, + 0, + 45, + 0, + "TRELLIS2PIPELINE" + ], + [ + 88, + 6, + 2, + 45, + 1, + "IMAGE" + ], + [ + 91, + 46, 0, 19, 0, "TRIMESH" ], [ - 75, - 39, + 99, + 49, 0, - 40, - 0, - "TRELLIS2PIPELINE" - ], - [ - 76, - 6, - 2, - 40, - 1, - "IMAGE" - ], - [ - 79, - 40, - 0, - 41, + 46, 0, "MESHWITHVOXEL" ], [ - 80, - 41, + 100, + 45, 0, - 38, + 50, + 0, + "MESHWITHVOXEL" + ], + [ + 101, + 50, + 0, + 49, 0, "MESHWITHVOXEL" ] @@ -415,10 +469,10 @@ "workflowRendererVersion": "LG", "ue_links": [], "ds": { - "scale": 0.6934334949441419, + "scale": 0.5730855330116895, "offset": [ - 46.88139106623601, - -242.18464906905308 + 89.23903425211222, + -237.85242993346893 ] }, "links_added_by_ue": [], diff --git a/nodes.py b/nodes.py index 5d6cfce..461cccb 100644 --- a/nodes.py +++ b/nodes.py @@ -624,18 +624,18 @@ class Trellis2MeshWithVoxelAdvancedGenerator: "image": ("IMAGE",), "seed": ("INT", {"default": 0, "min": 0, "max": 0x7fffffff}), "pipeline_type": (["512","1024","1024_cascade","1536_cascade"],{"default":"1024_cascade"}), - "sparse_structure_steps": ("INT",{"default":12, "min":1, "max":100},), + "sparse_structure_steps": ("INT",{"default":20, "min":1, "max":100},), "sparse_structure_guidance_strength": ("FLOAT",{"default":7.5}), - "sparse_structure_guidance_rescale": ("FLOAT",{"default":0.7}), - "sparse_structure_rescale_t": ("FLOAT",{"default":5.0}), - "shape_steps": ("INT",{"default":12, "min":1, "max":100},), + "sparse_structure_guidance_rescale": ("FLOAT",{"default":0.0}), + "sparse_structure_rescale_t": ("FLOAT",{"default":1.0}), + "shape_steps": ("INT",{"default":20, "min":1, "max":100},), "shape_guidance_strength": ("FLOAT",{"default":7.5}), - "shape_guidance_rescale": ("FLOAT",{"default":0.5}), - "shape_rescale_t": ("FLOAT",{"default":3.0}), - "texture_steps": ("INT",{"default":12, "min":1, "max":100},), - "texture_guidance_strength": ("FLOAT",{"default":7.5}), - "texture_guidance_rescale": ("FLOAT",{"default":0.5}), - "texture_rescale_t": ("FLOAT",{"default":3.0}), + "shape_guidance_rescale": ("FLOAT",{"default":0.0}), + "shape_rescale_t": ("FLOAT",{"default":1.0}), + "texture_steps": ("INT",{"default":20, "min":1, "max":100},), + "texture_guidance_strength": ("FLOAT",{"default":7.0}), + "texture_guidance_rescale": ("FLOAT",{"default":0.0}), + "texture_rescale_t": ("FLOAT",{"default":1.0}), "max_num_tokens": ("INT",{"default":49152,"min":0,"max":999999}), }, }