xinyun/ComfyUI-Hunyuan3DWrapper
1
0
Fork 0
mirror of https://git.datalinker.icu/kijai/ComfyUI-Hunyuan3DWrapper.git synced 2026-05-25 17:37:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kijai:main' into main

Browse Source
This commit is contained in:
Andrej 2025-01-29 02:14:10 +01:00 committed by GitHub
commit 8bf6060bd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hy3dgen/texgen/hunyuanpaint/pipeline.py
View File

@ -530,9 +530,12 @@ class HunyuanPaintPipeline(StableDiffusionPipeline):
callback(step_idx, t, latents) callback(step_idx, t, latents)
if not output_type == "latent": if not output_type == "latent":
image = self.vae.decode(latents / self.vae.config.scaling_factor, return_dict=False, generator=generator)[ image_list = []
0 for img in latents:
] image = self.vae.decode(img / self.vae.config.scaling_factor, return_dict=False, generator=generator)[0]
image_list.append(image)
image = torch.cat(image_list, dim=0)
image, has_nsfw_concept = self.run_safety_checker(image, device, prompt_embeds.dtype) image, has_nsfw_concept = self.run_safety_checker(image, device, prompt_embeds.dtype)
else: else:
image = latents image = latents

26
nodes.py
View File

@ -378,6 +378,7 @@ class Hy3DRenderMultiView:
}, },
"optional": { "optional": {
"camera_config": ("HY3DCAMERA",), "camera_config": ("HY3DCAMERA",),
"normal_space": (["world", "tangent"], {"default": "world"}),
} }
} }
@ -386,7 +387,7 @@ class Hy3DRenderMultiView:
FUNCTION = "process" FUNCTION = "process"
CATEGORY = "Hunyuan3DWrapper" CATEGORY = "Hunyuan3DWrapper"
def process(self, mesh, render_size, texture_size, camera_config=None): def process(self, mesh, render_size, texture_size, camera_config=None, normal_space="world"):
from .hy3dgen.texgen.differentiable_renderer.mesh_render import MeshRender from .hy3dgen.texgen.differentiable_renderer.mesh_render import MeshRender
@ -409,9 +410,22 @@ class Hy3DRenderMultiView:
self.render.load_mesh(mesh) self.render.load_mesh(mesh)
normal_maps = self.render_normal_multiview( if normal_space == "world":
selected_camera_elevs, selected_camera_azims, use_abs_coor=True) normal_maps = self.render_normal_multiview(
normal_tensors = torch.stack(normal_maps, dim=0) selected_camera_elevs, selected_camera_azims, use_abs_coor=True)
normal_tensors = torch.stack(normal_maps, dim=0)
elif normal_space == "tangent":
normal_maps = self.render_normal_multiview(
selected_camera_elevs, selected_camera_azims, bg_color=[0, 0, 0], use_abs_coor=False)
normal_tensors = torch.stack(normal_maps, dim=0)
normal_tensors = 2.0 * normal_tensors - 1.0 # Map [0,1] to [-1,1]
normal_tensors = normal_tensors / (torch.norm(normal_tensors, dim=-1, keepdim=True) + 1e-6)
# Remap axes for standard normal map convention
image = torch.zeros_like(normal_tensors)
image[..., 0] = normal_tensors[..., 0] # View right to R
image[..., 1] = normal_tensors[..., 1] # View up to G
image[..., 2] = -normal_tensors[..., 2] # View forward (negated) to B
normal_tensors = (image + 1) * 0.5
position_maps = self.render_position_multiview( position_maps = self.render_position_multiview(
selected_camera_elevs, selected_camera_azims) selected_camera_elevs, selected_camera_azims)
@ -419,11 +433,11 @@ class Hy3DRenderMultiView:
return (normal_tensors, position_tensors, self.render,) return (normal_tensors, position_tensors, self.render,)
def render_normal_multiview(self, camera_elevs, camera_azims, use_abs_coor=True): def render_normal_multiview(self, camera_elevs, camera_azims, use_abs_coor=True, bg_color=[1, 1, 1]):
normal_maps = [] normal_maps = []
for elev, azim in zip(camera_elevs, camera_azims): for elev, azim in zip(camera_elevs, camera_azims):
normal_map, _ = self.render.render_normal( normal_map, _ = self.render.render_normal(
elev, azim, use_abs_coor=use_abs_coor, return_type='th') elev, azim, bg_color=bg_color, use_abs_coor=use_abs_coor, return_type='th')
normal_maps.append(normal_map) normal_maps.append(normal_map)
return normal_maps return normal_maps