icrdr/AnyImage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add new Geometry Nodes groups for image relief and shadeless shader

Browse Source 
- Implemented the "O Image Relief Plane" Geometry Nodes group to create a fixed-base image relief using depth images and various parameters.
- Created the "O Shadeless" shader node group to display color without scene lighting while preserving shadows and reflections.
- Introduced a preview feature for node groups, allowing for interactive visualization of node arrangements in an HTML format.
- Added a template HTML file for rendering node previews with customizable views and controls.
This commit is contained in:
马南
2026-09-09 21:24:57 +08:00
parent f5aff50b13
commit 89087fc2e2
118 changed files with 5635 additions and 3130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/anyimage/assets/O_AnyImage.blend LFS
View File

Binary file not shown.

14
src/anyimage/common/material.py
View File

@@ -91,9 +91,9 @@ def material_node_group(depth_plane=False):
def create_image_material(
source_object,
source_image,
color_image,
depth_scale,
depth_scale=0.0,
displacement_image=None,
displacement_midlevel=0.0,
displacement_scale=1.0,
@@ -107,11 +107,10 @@ def create_image_material(
use_cyclic=None,
normal_image=None,
normal_space="TANGENT",
ior=None,
scene=None,
):
material_image = configure_material_color_image(color_image, scene)
material = bpy.data.materials.new(image_base_name(source_object.data))
material = bpy.data.materials.new(image_base_name(source_image))
material.use_nodes = True
if hasattr(material, "surface_render_method"):
material.surface_render_method = "DITHERED"
@@ -155,6 +154,10 @@ def create_image_material(
material_inputs.node_tree = material_node_group(is_depth_plane)
material_inputs.location = (-300.0, 350.0)
material_inputs.inputs["Bump Scale"].default_value = depth_scale
if not is_depth_plane:
material_inputs.inputs["Alpha Fix"].default_value = float(
configured_material_view_adaptation()
)
if "Object Space" in material_inputs.inputs:
if normal_space not in {"TANGENT", "OBJECT"}:
raise ValueError(f"Unsupported normal space: {normal_space}")
@@ -201,8 +204,7 @@ def create_image_material(
else:
shader = nodes.new("ShaderNodeBsdfPrincipled")
shader.location = (250.0, 400.0)
if ior is not None:
shader.inputs["IOR"].default_value = float(ior)
shader.inputs["IOR"].default_value = 1.2
links.new(
material_inputs.outputs["Color"],

5
src/anyimage/menu.py
View File

@@ -23,6 +23,11 @@ class AnyImageImageMenu(bpy.types.Menu):
text="Convert to Depth Plane",
icon="MOD_DISPLACE",
)
layout.operator(
"anyimage.convert_to_relief_plane",
text="Convert to Relief Plane",
icon="MOD_DISPLACE",
)
layout.separator()
layout.operator(
"anyimage.remove_image_background",

2
src/anyimage/operators/__init__.py
View File

@@ -8,6 +8,7 @@ from .mask_tool import EditImageAlpha
from .rectify_tool import RectifyImagePerspective
from .convert_to_plane import (
ConvertToDepthPlane,
ConvertToReliefPlane,
ConvertToPlane,
GenerateDepthPlane,
)
@@ -38,4 +39,5 @@ CLASSES = (
UpscaleImage,
ConvertToPlane,
ConvertToDepthPlane,
ConvertToReliefPlane,
)

52
src/anyimage/operators/clipboard_image/actions.py
View File

@@ -4,7 +4,7 @@ import tempfile
import bpy
from ...common.material import configure_material_color_image
from ...common.material import create_image_material
CLIPBOARD_HASH_PROPERTY = "anyimage_clipboard_sha256"
CLIPBOARD_TEXTURE_PROPERTY = "anyimage_clipboard_texture"
@@ -150,7 +150,9 @@ def add_image_plane(
from ..convert_to_plane.image_plane import create_image_plane_object
half_width, half_height = _plane_half_dimensions(width, height)
material = _create_image_material(image, shadeless, scene=context.scene)
material = create_image_material(
image, image, shadeless=shadeless, scene=context.scene
)
plane = create_image_plane_object(
context,
image.name,
@@ -198,52 +200,6 @@ def _plane_half_dimensions(width, height):
return width / height, 1.0
def _create_image_material(image, shadeless=False, *, scene=None):
material_image = configure_material_color_image(image, scene)
material = bpy.data.materials.new(name=f"{image.name} Material")
material.use_nodes = True
if hasattr(material, "surface_render_method"):
material.surface_render_method = "DITHERED"
nodes = material.node_tree.nodes
nodes.clear()
image_node = nodes.new("ShaderNodeTexImage")
image_node.image = material_image
image_node.location = (-620.0, 80.0)
output_node = nodes.new("ShaderNodeOutputMaterial")
output_node.location = (220.0, 80.0)
links = material.node_tree.links
if shadeless:
_create_shadeless_nodes(nodes, links, image_node, output_node)
return material
shader_node = nodes.new("ShaderNodeBsdfPrincipled")
shader_node.location = (-160.0, 80.0)
links.new(image_node.outputs["Color"], shader_node.inputs["Base Color"])
links.new(image_node.outputs["Alpha"], shader_node.inputs["Alpha"])
links.new(shader_node.outputs["BSDF"], output_node.inputs["Surface"])
return material
def _create_shadeless_nodes(nodes, links, image_node, output_node):
transparent_node = nodes.new("ShaderNodeBsdfTransparent")
transparent_node.location = (-360.0, -100.0)
emission_node = nodes.new("ShaderNodeEmission")
emission_node.location = (-360.0, 120.0)
mix_node = nodes.new("ShaderNodeMixShader")
mix_node.location = (-80.0, 80.0)
links.new(image_node.outputs["Color"], emission_node.inputs["Color"])
links.new(image_node.outputs["Alpha"], mix_node.inputs[0])
links.new(transparent_node.outputs["BSDF"], mix_node.inputs[1])
links.new(emission_node.outputs["Emission"], mix_node.inputs[2])
links.new(mix_node.outputs["Shader"], output_node.inputs["Surface"])
def _select_only(context, plane):
for selected_object in getattr(context, "selected_objects", ()):
selected_object.select_set(False)

2
src/anyimage/operators/convert_to_plane/__init__.py
View File

@@ -2,12 +2,14 @@
from .operators import (
ConvertToDepthPlane,
ConvertToReliefPlane,
ConvertToPlane,
GenerateDepthPlane,
)
__all__ = (
"ConvertToDepthPlane",
"ConvertToReliefPlane",
"ConvertToPlane",
"GenerateDepthPlane",
)

20
src/anyimage/operators/convert_to_plane/object.py
View File

@@ -67,8 +67,12 @@ def create_depth_plane_object(
material,
depth_image,
depth_metadata,
plane_type,
):
node_group = load_node_group("O Image Depth Plane")
node_group = load_node_group({
"DEPTH": "O Image Depth Plane",
"RELIEF": "O Image Relief Plane",
}[plane_type])
source_name = source_object.name
bounds = image_empty_bounds(source_object)
mesh = create_image_plane_mesh(source_name, bounds)
@@ -80,7 +84,7 @@ def create_depth_plane_object(
plane = bpy.data.objects.new(source_name, mesh)
context.collection.objects.link(plane)
plane.matrix_world = build_image_plane_matrix(source_object.matrix_world, bounds)
plane["anyimage_mesh_shape"] = "DEPTH_PLANE"
plane["anyimage_mesh_shape"] = f"{plane_type}_PLANE"
modifier = plane.modifiers.new(name=node_group.name, type="NODES")
modifier.node_group = node_group
@@ -108,6 +112,7 @@ def create_depth_plane_object(
def create_depth_plane_from_result(context, result, operator):
normal_space = {"DEPTH": "OBJECT", "RELIEF": "TANGENT"}[operator.plane_type]
source_object = require_image_empty(operator.source_object_name)
color_image = load_color_result_image(source_object, result.directory)
color_image.name = color_data_name(source_object)
@@ -122,16 +127,14 @@ def create_depth_plane_from_result(context, result, operator):
depth_metadata,
)
normal_image = load_normal_result_image(
result.file("tangent_normal"),
result.file(f"{normal_space.lower()}_normal"),
source_object,
)
material = create_image_material(
source_object,
source_object.data,
color_image,
0.0,
normal_image=normal_image,
normal_space="TANGENT",
ior=1.2,
normal_space=normal_space,
scene=context.scene,
)
create_depth_plane_object(
@@ -141,6 +144,7 @@ def create_depth_plane_from_result(context, result, operator):
material,
depth_image,
depth_metadata,
operator.plane_type,
)
except Exception:
if material is not None and material.users == 0:
@@ -149,6 +153,6 @@ def create_depth_plane_from_result(context, result, operator):
if image is not None and image.users == 0:
bpy.data.images.remove(image, do_unlink=True)
raise
label = "Convert to Depth Plane"
label = f"Convert to {operator.plane_type.title()} Plane"
if "FINISHED" not in bpy.ops.ed.undo_push(message=label):
raise RuntimeError(f"Unable to create the {label} Undo step")

37
src/anyimage/operators/convert_to_plane/operators.py
View File

@@ -50,6 +50,11 @@ class GenerateDepthPlane(JobOperatorBase, bpy.types.Operator):
input_path: bpy.props.StringProperty(options=_HIDDEN)
source_object_name: bpy.props.StringProperty(options=_HIDDEN)
plane_type: bpy.props.EnumProperty(
items=(("DEPTH", "Depth Plane", ""), ("RELIEF", "Relief Plane", "")),
default="DEPTH",
options=_HIDDEN,
)
mesh_detail: bpy.props.IntProperty(default=6, min=0, max=10, options=_HIDDEN)
model: bpy.props.StringProperty(default=DEFAULT_MOGE2_MODEL_KEY, options=_HIDDEN)
resolution_level: bpy.props.IntProperty(default=5, min=0, max=9, options=_HIDDEN)
@@ -71,6 +76,7 @@ class GenerateDepthPlane(JobOperatorBase, bpy.types.Operator):
"video_frames": 1,
"start_frame": source_start_frame(self.source_object_name),
"max_input_size": int(self.max_input_size),
"plane_type": self.plane_type,
}
parameters.update(
moge2_parameters(
@@ -85,13 +91,13 @@ class GenerateDepthPlane(JobOperatorBase, bpy.types.Operator):
def response(self, context, result):
create_depth_plane_from_result(context, result, self)
return "Depth Plane is ready"
return f"{self.plane_type.title()} Plane is ready"
def cleanup(self):
cleanup_image_input(self.input_path, self.delete_input)
def start_depth_plane_job(operator, context):
def start_depth_plane_job(operator, context, plane_type):
source_object = context.object
if video_total_frames(source_object.data) != 1:
operator.report({"ERROR"}, "Depth conversion currently supports still images")
@@ -112,6 +118,7 @@ def start_depth_plane_job(operator, context):
input_path=str(source_path),
source_object_name=source_object.name,
mesh_detail=operator.mesh_detail,
plane_type=plane_type,
model=model,
resolution_level=resolution_level,
max_input_size=configured_max_ai_input_size(context),
@@ -141,9 +148,8 @@ class ConvertToPlane(bpy.types.Operator):
source_object
)
material = create_image_material(
source_object,
source_object.data,
color_image,
1.0,
frame_start=frame_start,
color_frame_offset=frame_offset,
color_frame_duration=frame_duration,
@@ -157,7 +163,7 @@ class ConvertToPlane(bpy.types.Operator):
class ConvertToDepthPlane(bpy.types.Operator):
bl_idname = "anyimage.convert_to_depth_plane"
bl_label = "Convert to Depth Plane"
bl_description = "Convert the complete Image Empty into a Relief or Camera depth plane"
bl_description = "Convert the complete Image Empty into a camera-projected depth plane"
bl_options = {"REGISTER", "UNDO"}
mesh_detail: bpy.props.IntProperty(name="Subdivide", default=6, min=0, max=10)
@@ -168,8 +174,23 @@ class ConvertToDepthPlane(bpy.types.Operator):
return is_image_empty(context.object) and not runtime.server_busy()
def invoke(self, context, _event):
return self.execute(context)
def execute(self, context):
return start_depth_plane_job(self, context, "DEPTH")
class ConvertToReliefPlane(bpy.types.Operator):
bl_idname = "anyimage.convert_to_relief_plane"
bl_label = "Convert to Relief Plane"
bl_description = "Convert the complete Image Empty into a fixed-base relief plane"
bl_options = {"REGISTER", "UNDO"}
mesh_detail: bpy.props.IntProperty(name="Subdivide", default=6, min=0, max=10)
@classmethod
def poll(cls, context):
from ...runtime import runtime
return is_image_empty(context.object) and not runtime.server_busy()
def execute(self, context):
return start_depth_plane_job(self, context)
return start_depth_plane_job(self, context, "RELIEF")

4
src/anyimage/operators/cutout_tool/object.py
View File

@@ -192,16 +192,14 @@ def create_shape_object(
mesh_object = None
try:
material = create_image_material(
source_object,
source_object.data,
color_image,
0.0,
normal_image=normal_image,
normal_space=(
NormalMode.TANGENT.value
if normal_mode == NormalMode.NONE
else normal_mode.value
),
ior=1.2,
scene=context.scene,
)
depth_reference = None

11
src/anyimage/server/geometry/depth_texture.py
View File

@@ -71,19 +71,22 @@ def _write_float_exr(rgba, output_path):
return output_path
def write_depth_texture(frame, output_path):
"""Write a frame's camera-space XYZ and validity as float RGBA."""
def write_depth_texture(frame, output_path, *, alpha):
"""Write camera-space XYZ and alpha-weighted model validity as float RGBA."""
import numpy as np
if frame.points is None:
raise ValueError("Depth requires a point field")
points = np.asarray(frame.points, dtype=np.float32)
validity = np.asarray(frame.validity, dtype=np.float32)
alpha = np.asarray(alpha, dtype=np.float32)
if alpha.shape != validity.shape:
raise ValueError("Depth Alpha must match the validity dimensions")
if not np.isfinite(points).all():
raise ValueError("Point field contains non-finite values")
rgba = np.empty((*validity.shape, 4), dtype=np.float32)
rgba[..., :3] = points
rgba[..., 3] = validity
rgba[..., 3] = alpha * validity
return _write_float_exr(rgba, output_path)
@@ -101,7 +104,7 @@ def write_depth_metadata(frame, reference_valid, output_path):
raise ValueError("Depth metadata reference mask dimensions do not match")
if intrinsics.shape != (3, 3):
raise ValueError("Depth metadata requires 3x3 camera intrinsics")
valid = (validity > 0.0) & np.isfinite(depth) & (depth > 0.0)
valid = (validity > 0.5) & np.isfinite(depth) & (depth > 0.0)
reference_valid &= valid
if not valid.any():
raise ValueError("Geometry frame contains no valid depth pixels")

15
src/anyimage/server/geometry/edge_depth.py
View File

@@ -1,4 +1,4 @@
"""Extend reliable Cutout depth along each visible component's silhouette."""
"""Extend reliable depth along each visible component's silhouette."""
from dataclasses import replace
@@ -18,19 +18,20 @@ def extend_edge_depth(frame, alpha, alpha_threshold=0.9):
return frame
visible = (alpha > 0.0) & (alpha >= alpha_threshold)
opaque = visible & (alpha >= 0.95)
candidates = (
visible
& (alpha >= 0.95)
& (frame.validity > 0.0)
opaque
& (frame.validity > 0.5)
& np.isfinite(depth)
& (depth > 0.0)
)
if not candidates.any():
return frame
interior_distance = ndimage.distance_transform_edt(
np.pad(candidates, 3, mode="edge")
np.pad(opaque, 3, mode="edge")
)[3:-3, 3:-3]
core = candidates & (interior_distance > 2.0)
interior = opaque & (interior_distance > 2.0)
core = candidates & interior
del interior_distance
labels, _ = ndimage.label(visible, structure=np.ones((3, 3), dtype=bool))
corrected = depth.copy()
@@ -59,7 +60,7 @@ def extend_edge_depth(frame, alpha, alpha_threshold=0.9):
& (distance <= 4.0)
& (distance < background_distance[region])
)
target = (component & ~donors) | background
target = (component & ~interior[region] & ~donors) | background
corrected[region][target] = smoothed[target]
background_distance[region][background] = distance[background]

17
src/anyimage/server/geometry/prediction_artifacts.py
View File

@@ -14,10 +14,8 @@ def _limited_model_input(source_path, output_path, max_input_size):
from PIL import Image
with Image.open(source_path) as opened:
limited = limit_image(opened.convert("RGBA"), max_input_size)
background = Image.new("RGBA", limited.size, (0, 0, 0, 255))
normalized = Image.alpha_composite(background, limited).convert("RGB")
normalized.save(output_path, format="PNG", compress_level=1)
limited = limit_image(opened.convert("RGB"), max_input_size)
limited.save(output_path, format="PNG", compress_level=1)
return output_path
@@ -58,7 +56,6 @@ def generate_moge2_artifacts(
*,
generate_depth=False,
normal_mode="NONE",
correct_edge_depth=False,
alpha_threshold=0.9,
):
"""Run MoGe-2 once and write only the requested file artifacts."""
@@ -85,17 +82,13 @@ def generate_moge2_artifacts(
if generate_depth:
context.progress(0.45, "Generating depth texture")
alpha = _image_alpha(input_path, frame.depth.shape)
depth_frame = (
extend_edge_depth(frame, alpha, alpha_threshold)
if correct_edge_depth else frame
)
depth_frame = extend_edge_depth(frame, alpha, alpha_threshold)
result["depth"] = write_depth_texture(
depth_frame, context.directory / "depth.exr",
depth_frame, context.directory / "depth.exr", alpha=alpha,
)
result["depth_metadata"] = write_depth_metadata(
depth_frame,
(alpha > 0.0) & (alpha >= alpha_threshold)
if correct_edge_depth else alpha >= 0.1,
(alpha > 0.0) & (alpha >= alpha_threshold),
context.directory / "depth.json",
)

1
src/anyimage/server/jobs/cutout.py
View File

@@ -19,7 +19,6 @@ def run(context, parameters):
input_path,
generate_depth=generate_depth,
normal_mode=normal_mode,
correct_edge_depth=generate_depth,
alpha_threshold=float(parameters.get("alpha_threshold", 0.9)),
)
result.update({key: path.name for key, path in artifacts.items()})

5
src/anyimage/server/jobs/depth_plane.py
View File

@@ -5,6 +5,9 @@ from ..media import copy_color_images, input_frames
def run(context, parameters):
plane_type = parameters["plane_type"]
if plane_type not in {"DEPTH", "RELIEF"}:
raise ValueError(f"Unsupported plane type: {plane_type}")
context.progress(0.05, "Preparing depth conversion")
context.directory.mkdir(parents=True, exist_ok=True)
with input_frames(context, parameters) as images:
@@ -16,7 +19,7 @@ def run(context, parameters):
parameters,
images[0],
generate_depth=True,
normal_mode="TANGENT",
normal_mode="OBJECT" if plane_type == "DEPTH" else "TANGENT",
)
context.check_cancelled()
context.progress(1.0, "Depth conversion data is ready")

5
src/anyimage/server/models/onnx_moge2.py
View File

@@ -114,11 +114,11 @@ def postprocess(raw_output):
points = np.asarray(raw_output["points"][0], dtype=np.float32)
normal = np.asarray(raw_output["normal"][0], dtype=np.float32)
mask = np.asarray(raw_output["mask"][0] > 0.5)
mask = np.asarray(raw_output["mask"][0], dtype=np.float32)
metric_scale = np.float32(np.asarray(raw_output["metric_scale"]).reshape(-1)[0])
height, width = mask.shape
aspect_ratio = width / height
focal, shift = recover_focal_shift(points, mask)
focal, shift = recover_focal_shift(points, mask > 0.5)
diagonal_factor = (1.0 + aspect_ratio**2) ** 0.5
fx = focal / 2.0 * diagonal_factor / aspect_ratio
fy = focal / 2.0 * diagonal_factor
@@ -127,7 +127,6 @@ def postprocess(raw_output):
dtype=np.float32,
)
depth = points[..., 2] + shift
mask &= depth > 0.0
depth = depth * metric_scale
points = depth_to_points(depth, intrinsics)
return {