nan
591e62085a
- Introduced a new `Boundary Padding` preference in the Cutout Tool with a default of 2 px and a configurable range of 1-4 px. - Updated the Cutout client to establish inward mapping from the final Mask, sampling in a fixed direction and processing independent material RGBA and Depth. - Enhanced the handling of RGBA and Depth during cutout operations, ensuring proper mapping and preservation of source data. - Added tests to validate the new boundary padding functionality and its integration with existing cutout processes. feat(geometry): remove overall mesh smoothing from geometry nodes - Removed the `Smooth` input from several geometry node groups to eliminate unnecessary overall mesh smoothing. - Retained `Smooth Weight` for depth nodes while removing it from Cutout and Relief Plane nodes. - Ensured that boundary, normal, and fill smoothing behaviors remain intact and consistent. - Updated tests and documentation to reflect the changes in node interfaces and behaviors. feat(normals): scale tangent normals with depth - Reused the existing `o_normal_reduction` attribute to adjust Tangent Normal strength based on the geometry's `Depth Scale`. - Ensured that Tangent Normal strength is consistent with the geometry depth, preserving full strength for materials that do not provide the attribute. - Updated tests to verify the correct behavior of normal strength adjustments in both Tangent and Object Space.
101 lines
4.7 KiB
Python
101 lines
4.7 KiB
Python
"""Apply boundary-preserving smoothing within a narrow cut-edge band."""
|
|
|
|
from .nodes import evaluate_field, group_input
|
|
from .depth_surface import _math
|
|
from .smoothing import edge_boundary_field, expand_smooth
|
|
|
|
|
|
def boundary_influence(group, protected=False, *, boundary=None):
|
|
"""Fade a boundary field through two rings while excluding protected points."""
|
|
nodes, links = group.nodes, group.links
|
|
if boundary is None:
|
|
boundary = edge_boundary_field(nodes, links)
|
|
boundary = evaluate_field(group, boundary, "FLOAT", "POINT")
|
|
unprotected = _math(group, "SUBTRACT", 1, protected)
|
|
cut = _math(group, "MULTIPLY", boundary, unprotected)
|
|
blur = nodes.new("GeometryNodeBlurAttribute")
|
|
blur.data_type = "FLOAT"
|
|
blur.inputs["Iterations"].default_value = 2
|
|
blur.inputs["Weight"].default_value = 1
|
|
links.new(cut, blur.inputs["Value"])
|
|
return _math(group, "MULTIPLY", _math(group, "MAXIMUM", cut, blur.outputs["Value"]), unprotected)
|
|
|
|
|
|
def smooth_boundary_depth(group, depth, protected=False):
|
|
"""Blur point depth on the current mesh and apply it only in the edge band."""
|
|
nodes, links = group.nodes, group.links
|
|
depth = evaluate_field(group, depth, "FLOAT", "POINT")
|
|
iterations = group_input(nodes, {"Boundary Smooth"}).outputs["Boundary Smooth"]
|
|
influence = boundary_influence(group, protected)
|
|
blur = nodes.new("GeometryNodeBlurAttribute")
|
|
blur.data_type = "FLOAT"
|
|
blur.inputs["Weight"].default_value = 0.5
|
|
links.new(depth, blur.inputs["Value"])
|
|
links.new(iterations, blur.inputs["Iterations"])
|
|
mix = nodes.new("ShaderNodeMix")
|
|
mix.data_type = "FLOAT"
|
|
links.new(influence, mix.inputs[0])
|
|
links.new(depth, mix.inputs[2])
|
|
links.new(blur.outputs["Value"], mix.inputs[3])
|
|
choose = nodes.new("GeometryNodeSwitch")
|
|
choose.input_type = "FLOAT"
|
|
links.new(influence, choose.inputs["Switch"])
|
|
links.new(depth, choose.inputs["False"])
|
|
links.new(mix.outputs[0], choose.inputs["True"])
|
|
enabled = nodes.new("GeometryNodeSwitch")
|
|
enabled.input_type = "FLOAT"
|
|
links.new(iterations, enabled.inputs["Switch"])
|
|
links.new(depth, enabled.inputs["False"])
|
|
links.new(choose.outputs[0], enabled.inputs["True"])
|
|
return enabled.outputs[0]
|
|
|
|
|
|
def smooth_boundary_camera(group, camera, protected=False):
|
|
"""Reconstruct blurred camera depth along each unchanged projection ray."""
|
|
nodes, links = group.nodes, group.links
|
|
axes = nodes.new("ShaderNodeSeparateXYZ")
|
|
links.new(camera, axes.inputs[0])
|
|
depth = axes.outputs["Z"]
|
|
smoothed = smooth_boundary_depth(group, depth, protected)
|
|
return reconstruct_camera_depth(group, camera, depth, smoothed)
|
|
|
|
|
|
def reconstruct_camera_depth(group, camera, depth, smoothed):
|
|
"""Move each valid camera point along its original projection ray."""
|
|
nodes, links = group.nodes, group.links
|
|
changed = _math(group, "GREATER_THAN", _math(group, "ABSOLUTE", _math(group, "SUBTRACT", smoothed, depth)), 0)
|
|
enabled = _math(group, "MULTIPLY", changed, _math(group, "GREATER_THAN", depth, 1e-8))
|
|
projected = nodes.new("ShaderNodeVectorMath")
|
|
projected.operation = "SCALE"
|
|
links.new(camera, projected.inputs[0])
|
|
links.new(_math(group, "DIVIDE", smoothed, depth), projected.inputs[3])
|
|
choose = nodes.new("GeometryNodeSwitch")
|
|
choose.input_type = "VECTOR"
|
|
links.new(enabled, choose.inputs["Switch"])
|
|
links.new(camera, choose.inputs["False"])
|
|
links.new(projected.outputs[0], choose.inputs["True"])
|
|
return choose.outputs[0]
|
|
|
|
|
|
def cut_boundary_influence(group, split_boundary, protected=False, *, outline_scale=0.1):
|
|
"""Give split edges full influence and outline edges a configured share."""
|
|
nodes, links = group.nodes, group.links
|
|
boundary = evaluate_field(group, edge_boundary_field(nodes, links), "FLOAT", "POINT")
|
|
split = _math(group, "MULTIPLY", boundary, split_boundary)
|
|
outline = _math(group, "MAXIMUM", _math(group, "SUBTRACT", boundary, split), 0)
|
|
split_influence = boundary_influence(group, protected, boundary=split)
|
|
outline_influence = _math(
|
|
group, "MULTIPLY", boundary_influence(group, protected, boundary=outline), outline_scale,
|
|
)
|
|
return _math(group, "MAXIMUM", split_influence, outline_influence)
|
|
|
|
|
|
def smooth_cut_boundary(group, geometry, split_boundary=False, *, protected=False, outline_scale=0.1):
|
|
"""Blend O Smooth through split and outline masks with configurable weights."""
|
|
influence = cut_boundary_influence(group, split_boundary, protected, outline_scale=outline_scale)
|
|
# The support band depends on topology, which stays unchanged in the loop.
|
|
return expand_smooth(
|
|
group, geometry, iterations_name="Boundary Smooth", weight_name="Smooth Weight",
|
|
influence=influence, pin_sharp=False,
|
|
)
|