refactor: Update cutout and depth handling by removing unused functions and adjusting parameters

tools/nodes/groups/image_depth_cutout.py

@@ -5,11 +5,10 @@ from anyimage.operators.cutout_tool.shape import CUTOUT_Z_TO_X, NORMAL_SCALE_ATT
 from ..common.nodes import interface_socket, group_input, math_node, float_input, menu_switch, read_float_attribute, store_float_attribute, prepare_node_group, sample_field, evaluate_field
 from ..common.smoothing import expand_smooth
 from ..common.boundary_smoothing import smooth_cut_boundary
-from ..common.outline_smoothing import smooth_outline_camera
 from ..common.cutout import _island_cleanup, _position_field, _remove_zero_thickness, _shade_output
 from ..common.depth_surface import _math, project_depth_surface, build_surface_camera, split_depth_surface, sample_face_camera, thicken_depth_surface
 from ..common.smoothing import edge_boundary_field
-from ..common.cutout_boundary import remove_boundary_triangles, taper_split_profile
+from ..common.cutout_boundary import original_boundary_field, remove_boundary_triangles, taper_split_profile
 
 
 NODE_GROUP_NAME = "O Image Depth Cutout"
@@ -92,7 +91,7 @@ def build_shell_fields(group, geometry, fields, is_shell, normal_weight=1):
     normal = nodes.new("GeometryNodeInputNormal")
     blur = nodes.new("GeometryNodeBlurAttribute")
     blur.data_type = "FLOAT_VECTOR"
-    blur.inputs["Iterations"].default_value = 100
+    links.new(group_input(nodes, {"Normal Smooth"}).outputs["Normal Smooth"], blur.inputs["Iterations"])
     links.new(normal.outputs[0], blur.inputs["Value"])
     normalized = blend_normal(group, normal.outputs[0], blur.outputs[0], normal_weight)
     rear_normal = sample_field(group, surface.outputs[0], normalized, "FLOAT_VECTOR")
@@ -135,7 +134,9 @@ def build_front_fields(group, volume, front_normal, normal_weight=1):
     smooth = group.nodes.new("GeometryNodeBlurAttribute")
     smooth.data_type = "FLOAT_VECTOR"
     links.new(normal, smooth.inputs["Value"])
-    smooth.inputs["Iterations"].default_value = 512
+    iterations = group_input(group.nodes, {"Normal Smooth"}).outputs["Normal Smooth"]
+    # Preserve the existing extra smoothing of the inflation direction at 100.
+    links.new(_math(group, "MULTIPLY", iterations, 5.12), smooth.inputs["Iterations"])
     normalized = blend_normal(group, normal, smooth.outputs[0], normal_weight)
     return {"structure": structure, "inflation_normal": normalized}
 
@@ -195,7 +196,7 @@ def build_front_normal(group, normal_weight):
     blur = group.nodes.new("GeometryNodeBlurAttribute")
     blur.data_type = "FLOAT_VECTOR"
     links.new(normal.outputs[0], blur.inputs["Value"])
-    blur.inputs["Iterations"].default_value = 100
+    links.new(group_input(group.nodes, {"Normal Smooth"}).outputs["Normal Smooth"], blur.inputs["Iterations"])
     normalized = blend_normal(group, normal.outputs[0], blur.outputs[0], normal_weight)
     return evaluate_field(group, normalized, "FLOAT_VECTOR", "POINT")
 
@@ -273,7 +274,6 @@ def _build_depth_surface(group, geometry, controls):
     )
     geometry = remove_boundary_triangles(group, geometry)
     camera = build_surface_camera(group, _position_field(group, image), corner_camera, cut_vertex, split)
-    camera = smooth_outline_camera(group, original, geometry, camera, scale)
     projection = project_depth_surface(
         group, geometry, camera, scale, controls.outputs["Reference Depth"], controls.outputs["Depth Scale"], split,
     )
@@ -293,7 +293,7 @@ def _build_depth_surface(group, geometry, controls):
     links.new(projection, merge.inputs["Geometry"])
     links.new(_math(group, "MULTIPLY", typical.outputs["Mean"], 1e-6), merge.inputs["Distance"])
     projection = merge.outputs["Geometry"]
-    projection = taper_split_profile(group, original, projection)
+    projection = taper_split_profile(group, projection, original_boundary_field(group, original))
     # The mode field is shared by the geometry and thickness choices.
     mode = group.nodes.new("GeometryNodeMenuSwitch")
     mode.data_type = "BOOLEAN"
@@ -341,7 +341,6 @@ def build_image_depth_cutout_group():
     group = bpy.data.node_groups.new(name, 'GeometryNodeTree')
     group.is_modifier, group.use_fake_user = (True, True)
     group.color_tag = 'GEOMETRY'
-    group['anyimage_asset_revision'] = 26
     interface_socket(group, 'Geometry', 'INPUT', 'NodeSocketGeometry')
     interface_socket(group, 'Mode', 'INPUT', 'NodeSocketMenu')
     float_input(group, 'Thickness', 1.0).description = 'Control how much the surface bulges in Balloon mode. Zero removes the bulge.'
@@ -358,12 +357,12 @@ def build_image_depth_cutout_group():
     float_input(group, 'Reference Depth', 1.0, subtype='DISTANCE', parent=options)
     interface_socket(group, 'Depth Axis', 'INPUT', 'NodeSocketMenu', options).menu_expanded = True
     boundary_smooth = interface_socket(group, 'Boundary Smooth', 'INPUT', 'NodeSocketInt', options)
-    boundary_smooth.default_value, boundary_smooth.min_value, boundary_smooth.max_value = 2, 1, 20
-    boundary_smooth.description = 'Control boundary smoothing within each Outline Depth Fix pass. Higher values apply more smoothing per pass.'
-    outline_smooth = interface_socket(group, 'Outline Depth Fix', 'INPUT', 'NodeSocketInt', options)
-    outline_smooth.default_value, outline_smooth.min_value, outline_smooth.max_value = 16, 0, 200
-    outline_smooth.description = 'Reduce abrupt depth changes near the original Cutout outline. Higher values apply more correction passes. Zero disables correction.'
-    float_input(group, 'Front Inflation', 0.0, maximum=1, subtype='FACTOR', parent=options).description = 'Control how much the front surface bulges in Balloon mode. Zero keeps the original front surface.'
+    boundary_smooth.default_value, boundary_smooth.min_value, boundary_smooth.max_value = 0, 0, 16
+    boundary_smooth.description = 'Smooth geometry near the original outline and Depth Split edges. Zero disables boundary smoothing.'
+    normal_smooth = interface_socket(group, 'Normal Smooth', 'INPUT', 'NodeSocketInt', options)
+    normal_smooth.default_value, normal_smooth.min_value, normal_smooth.max_value = 64, 16, 512
+    normal_smooth.description = 'Control smoothing of front and rear displacement normals. Higher values produce smoother directions.'
+    float_input(group, 'Front Inflation', 0.2, maximum=1, subtype='FACTOR', parent=options).description = 'Control how much the front surface bulges in Balloon mode. Zero keeps the original front surface.'
     data = group.interface.new_panel(name='Data', default_closed=True)
     float_input(group, 'Uniform Scale', 1.0, parent=data).hide_in_modifier = True
     interface_socket(group, 'Depth Image', 'INPUT', 'NodeSocketImage', data).hide_in_modifier = True