reze-engine 0.12.0 → 0.12.2

package/src/shaders/materials/hair.ts

@@ -1,187 +1,82 @@
-// M_Hair — WGSL trace of 仿深空之眼渲染预设v1.0_by_小绿毛猫_material_graph_dump.json "M_Hair" (socket ids + defaults).
-// MixShader.001: Add→Shader (first), Principled→Shader_001 (second) → out = mix(first, second, Fac).
-
-import { NODES_WGSL } from "./nodes"
-
-export const HAIR_SHADER_WGSL = /* wgsl */ `
-
-${NODES_WGSL}
-
-// Pipeline-override: the engine compiles two variants — the normal opaque hair pipeline
-// (IS_OVER_EYES=false) and a second pipeline that re-draws hair fragments stencil-matched
-// against the eye stamp with 50% alpha so eyes read through the hair silhouette. Resolved
-// at pipeline-compile time; the dead branch is dropped by the shader compiler.
-override IS_OVER_EYES: bool = false;
-
-struct CameraUniforms {
-  view: mat4x4f,
-  projection: mat4x4f,
-  viewPos: vec3f,
-  _padding: f32,
-};
-
-struct Light {
-  direction: vec4f,
-  color: vec4f,
-};
-
-struct LightUniforms {
-  ambientColor: vec4f,
-  lights: array<Light, 4>,
-};
-
-struct MaterialUniforms {
-  diffuseColor: vec3f,
-  alpha: f32,
-};
-
-struct VertexOutput {
-  @builtin(position) position: vec4f,
-  @location(0) normal: vec3f,
-  @location(1) uv: vec2f,
-  @location(2) worldPos: vec3f,
-};
-
-struct LightVP { viewProj: mat4x4f, };
-
-@group(0) @binding(0) var<uniform> camera: CameraUniforms;
-@group(0) @binding(1) var<uniform> light: LightUniforms;
-@group(0) @binding(2) var diffuseSampler: sampler;
-@group(0) @binding(3) var shadowMap: texture_depth_2d;
-@group(0) @binding(4) var shadowSampler: sampler_comparison;
-@group(0) @binding(5) var<uniform> lightVP: LightVP;
-@group(1) @binding(0) var<storage, read> skinMats: array<mat4x4f>;
-@group(2) @binding(0) var diffuseTexture: texture_2d<f32>;
-@group(2) @binding(1) var<uniform> material: MaterialUniforms;
-
-fn sampleShadow(worldPos: vec3f, n: vec3f) -> f32 {
-  // Back-facing to key light: direct contribution is zero anyway, skip 9 texture samples.
-  if (dot(n, -light.lights[0].direction.xyz) <= 0.0) { return 0.0; }
-  let biasedPos = worldPos + n * 0.08;
-  let lclip = lightVP.viewProj * vec4f(biasedPos, 1.0);
-  let ndc = lclip.xyz / max(lclip.w, 1e-6);
-  let suv = vec2f(ndc.x * 0.5 + 0.5, 0.5 - ndc.y * 0.5);
-  let cmpZ = ndc.z - 0.001;
-  let ts = 1.0 / 2048.0;
-  // 3x3 PCF unrolled — Safari's Metal backend doesn't unroll nested shadow loops reliably.
-  let s00 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts, -ts), cmpZ);
-  let s10 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(0.0, -ts), cmpZ);
-  let s20 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts, -ts), cmpZ);
-  let s01 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts, 0.0), cmpZ);
-  let s11 = textureSampleCompareLevel(shadowMap, shadowSampler, suv, cmpZ);
-  let s21 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts, 0.0), cmpZ);
-  let s02 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts,  ts), cmpZ);
-  let s12 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(0.0,  ts), cmpZ);
-  let s22 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts,  ts), cmpZ);
-  return (s00 + s10 + s20 + s01 + s11 + s21 + s02 + s12 + s22) * (1.0 / 9.0);
-}
-
-const PI_H: f32 = 3.141592653589793;
-const HAIR_SPECULAR: f32 = 1.0;
-const HAIR_ROUGHNESS: f32 = 0.3;
-const HAIR_TEX_GATE_THRESH: f32 = 0.15000000596046448;
-const HAIR_RIM2_POW: f32 = 0.6300000548362732;
-const HAIR_MIX_BG: vec3f = vec3f(0.1673291176557541);
-
-@vertex fn vs(
-  @location(0) position: vec3f,
-  @location(1) normal: vec3f,
-  @location(2) uv: vec2f,
-  @location(3) joints0: vec4<u32>,
-  @location(4) weights0: vec4<f32>
-) -> VertexOutput {
-  var output: VertexOutput;
-  let pos4 = vec4f(position, 1.0);
-  let weightSum = weights0.x + weights0.y + weights0.z + weights0.w;
-  let invWeightSum = select(1.0, 1.0 / weightSum, weightSum > 0.0001);
-  let nw = select(vec4f(1.0, 0.0, 0.0, 0.0), weights0 * invWeightSum, weightSum > 0.0001);
-  var skinnedPos = vec4f(0.0);
-  var skinnedNrm = vec3f(0.0);
-  for (var i = 0u; i < 4u; i++) {
-    let m = skinMats[joints0[i]];
-    let w = nw[i];
-    skinnedPos += (m * pos4) * w;
-    skinnedNrm += (mat3x3f(m[0].xyz, m[1].xyz, m[2].xyz) * normal) * w;
-  }
-  output.position = camera.projection * camera.view * vec4f(skinnedPos.xyz, 1.0);
-  // Skip VS normalize — interpolation denormalizes anyway, and FS always does normalize(input.normal).
-  output.normal = skinnedNrm;
-  output.uv = uv;
-  output.worldPos = skinnedPos.xyz;
-  return output;
-}
-
-struct FSOut {
-  @location(0) color: vec4f,
-  @location(1) mask: f32,
-};
-
-@fragment fn fs(input: VertexOutput) -> FSOut {
-  let alpha = material.alpha;
-  if (alpha < 0.001) { discard; }
-
-  let n = normalize(input.normal);
-  let v = normalize(camera.viewPos - input.worldPos);
-  let l = -light.lights[0].direction.xyz;
-  let sun = light.lights[0].color.xyz * light.lights[0].color.w;
-
-  let tex_color = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
-  let shadow = sampleShadow(input.worldPos, n);
-
-  let hue_sat_shadow = hue_sat_id(1.2, 0.5, 1.0, tex_color);
-  let hue_sat_002 = hue_sat(0.48, 1.2, 0.7, 1.0, hue_sat_shadow);
-  let hue_sat_001 = hue_sat_id(1.5, 1.0, 1.0, tex_color);
-
-  let ndotl_raw = shader_to_rgb_diffuse(n, l, sun, light.ambientColor.xyz, shadow);
-  let ramp_008 = ramp_constant(ndotl_raw, 0.0, vec4f(0,0,0,1), 0.2966, vec4f(1,1,1,1)).r;
-
-  let mix_004 = mix_blend(ramp_008, hue_sat_002, hue_sat_001);
-  let bc = bright_contrast(mix_004, 0.1, 0.2);
-
-  let bevel_z = clamp(n.y, 0.0, 1.0);
-  let mix_003 = mix_blend(bevel_z, bc, hue_sat_002);
-
-  let rim2_raw = fresnel(1.45, n, v) * layer_weight_fresnel(0.61, n, v);
-  let rim2_fac = math_power(rim2_raw, HAIR_RIM2_POW);
-  let mix_shader_002 = mix(mix_003, HAIR_MIX_BG, rim2_fac);
-
-  // Blender's GREATER_THAN converts Color→Float via BT.601 luminance, not raw R — same
-  // socket-semantic fix as M_Face.
-  let tex_gate = math_greater_than(color_to_value(tex_color), HAIR_TEX_GATE_THRESH);
-  let gate_emit = vec3f(tex_gate) * 0.1;
-
-  let add_shader = mix_shader_002 + gate_emit;
-
-  // Principled BSDF (EEVEE port): metallic=0, specular=1.0, roughness=0.3, specular_tint=0.
-  // Graph has a noise→normal_map bump (Strength=0.1) on Principled.Normal, but MixShader.001
-  // weights Principled at only 0.2 — the bumped spec × that weight is imperceptible, so we
-  // drop the subtree and keep plain n (saves a tex_noise + bump_lh per hair fragment).
-  let NL = max(dot(n, l), 0.0);
-  let NV = max(dot(n, v), 1e-4);
-
-  let f0 = vec3f(0.08 * HAIR_SPECULAR);
-  let f90 = mix(f0, vec3f(1.0), sqrt(HAIR_SPECULAR));
-  let brdf_lut = brdf_lut_sample(NV, HAIR_ROUGHNESS);
-  let reflection_color = F_brdf_multi_scatter(f0, f90, brdf_lut.xy);
-
-  let spec_direct = bsdf_ggx(n, l, v, NL, NV, HAIR_ROUGHNESS) * sun * shadow * ltc_brdf_scale_from_lut(brdf_lut);
-  let spec_indirect = light.ambientColor.xyz;
-  let spec_radiance = (spec_direct + spec_indirect) * reflection_color;
-
-  // Indirect diffuse = base_color × L_w per Blender closure_eval_surface_lib.glsl line 302;
-  // probe_evaluate_world_diff returns radiance (SH-projected, not cosine-convolved).
-  let diffuse_radiance = bc * (sun * NL * shadow / PI_H + light.ambientColor.xyz);
-  let principled = diffuse_radiance + spec_radiance;
-
-  let final_color = mix(add_shader, principled, 0.2);
-
-  var outAlpha = alpha;
-  if (IS_OVER_EYES) { outAlpha = alpha * 0.6; }
-
-  var out: FSOut;
-  out.color = vec4f(final_color, outAlpha);
-  out.mask = 1.0;
-  return out;
-}
-
-`
+// M_Hair — 仿深空之眼渲染预设v1.0_by_小绿毛猫 "M_Hair". Toon + fresnel rim + bevel +
+// bright-tex gate, mixed 80/20 NPR/PBR. MixShader.001 Fac=0.2 keeps Principled subtle.
+
+import { NODES_WGSL } from "./nodes"
+import { COMMON_MATERIAL_PRELUDE_WGSL } from "./common"
+
+export const HAIR_SHADER_WGSL = /* wgsl */ `
+
+${NODES_WGSL}
+${COMMON_MATERIAL_PRELUDE_WGSL}
+
+// Pipeline-override: the engine compiles two variants — the normal opaque hair pipeline
+// (IS_OVER_EYES=false) and a second pipeline that re-draws hair fragments stencil-matched
+// against the eye stamp with 50% alpha so eyes read through the hair silhouette. Resolved
+// at pipeline-compile time; the dead branch is dropped by the shader compiler.
+override IS_OVER_EYES: bool = false;
+
+const HAIR_SPECULAR: f32 = 1.0;
+const HAIR_ROUGHNESS: f32 = 0.3;
+const HAIR_TEX_GATE_THRESH: f32 = 0.15000000596046448;
+const HAIR_RIM2_POW: f32 = 0.6300000548362732;
+const HAIR_MIX_BG: vec3f = vec3f(0.1673291176557541);
+const HAIR_MIX_NPR: f32 = 0.2;
+
+@fragment fn fs(input: VertexOutput) -> FSOut {
+  let alpha = material.alpha;
+  if (alpha < 0.001) { discard; }
+
+  let n = normalize(input.normal);
+  let v = normalize(camera.viewPos - input.worldPos);
+  let l = -light.lights[0].direction.xyz;
+  let sun = light.lights[0].color.xyz * light.lights[0].color.w;
+  let amb = light.ambientColor.xyz;
+  let shadow = sampleShadow(input.worldPos, n);
+
+  let tex_color = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
+
+  // ═══ NPR STACK ═══
+  let hue_sat_shadow = hue_sat_id(1.2, 0.5, 1.0, tex_color);
+  let hue_sat_002 = hue_sat(0.48, 1.2, 0.7, 1.0, hue_sat_shadow);
+  let hue_sat_001 = hue_sat_id(1.5, 1.0, 1.0, tex_color);
+
+  let ndotl_raw = shader_to_rgb_diffuse(n, l, sun, amb, shadow);
+  let ramp_008 = ramp_constant(ndotl_raw, 0.0, vec4f(0,0,0,1), 0.2966, vec4f(1,1,1,1)).r;
+
+  let mix_004 = mix_blend(ramp_008, hue_sat_002, hue_sat_001);
+  let bc = bright_contrast(mix_004, 0.1, 0.2);
+
+  let bevel_z = clamp(n.y, 0.0, 1.0);
+  let mix_003 = mix_blend(bevel_z, bc, hue_sat_002);
+
+  let rim2_raw = fresnel(1.45, n, v) * layer_weight_fresnel(0.61, n, v);
+  let rim2_fac = math_power(rim2_raw, HAIR_RIM2_POW);
+  let mix_shader_002 = mix(mix_003, HAIR_MIX_BG, rim2_fac);
+
+  // GREATER_THAN on a color input uses BT.601 luminance — same socket-semantic fix as face.ts.
+  let tex_gate = math_greater_than(color_to_value(tex_color), HAIR_TEX_GATE_THRESH);
+  let gate_emit = vec3f(tex_gate) * 0.1;
+
+  let npr_stack = mix_shader_002 + gate_emit;
+
+  // ═══ PRINCIPLED BSDF ═══
+  // Graph has a noise→normal_map bump (Strength=0.1) on Principled.Normal, but MixShader.001
+  // weights Principled at only 0.2 — the bumped spec × that weight is imperceptible, so we
+  // drop the subtree and keep plain n (saves a tex_noise + bump_lh per hair fragment).
+  let principled = eval_principled(
+    PrincipledIn(bc, 0.0, HAIR_SPECULAR, HAIR_ROUGHNESS, 1e30, 0.0, 0.0),
+    n, l, v, sun, amb, shadow
+  );
+
+  let final_color = mix(npr_stack, principled, HAIR_MIX_NPR);
+
+  var outAlpha = alpha;
+  if (IS_OVER_EYES) { outAlpha = alpha * 0.5; }
+
+  var out: FSOut;
+  out.color = vec4f(final_color, outAlpha);
+  out.mask = 1.0;
+  return out;
+}
+
+`

package/src/shaders/materials/metal.ts

@@ -1,127 +1,30 @@
-// M_Metal — Metallic Principled (Metallic=1.0, Specular=1.0, Specular Tint=0.114, Roughness=0.3)
-// + NPR toon/AO emission stack (Strength=8.1), MixShader Fac=0.6967.
-// Base color uses a Voronoi pattern sampled in reflection-coord space (Blender 纹理坐标.Reflection)
-// to add subtle metallic sparkle variation. No Normal link in the graph.
+// M_Metal — Metallic Principled (Metallic=1.0, Specular=1.0, Roughness=0.3) with a
+// reflection-coord Voronoi pattern driving base color for metallic sparkle, plus an
+// NPR toon/overlay emission stack mixed at MixShader Fac=0.6967.
 //
-// Graph's base color chain is: 纹理坐标.Reflection → 矢量运算.007(CROSS, Vec2=(0,1,0)) →
-// 沃罗诺伊纹理(F1, Color out) → 颜色渐变(linear) → 混合.005. The dumper did not capture the
-// VectorMath operation — CROSS is the assumed op based on the hardcoded (0,1,0) Vector_001
+// Graph's base color chain: 纹理坐标.Reflection → 矢量运算.007(CROSS, Vec2=(0,1,0)) →
+// 沃罗诺伊纹理(F1, Color out) → 颜色渐变(linear) → 混合.005. The dumper did not capture
+// the VectorMath op — CROSS is assumed based on the hardcoded (0,1,0) Vector_001
 // constant (MULTIPLY would zero X/Z producing 1D bands; CROSS produces horizontal ring
 // patterns consistent with metallic anisotropy).
 
 import { NODES_WGSL } from "./nodes"
+import { COMMON_MATERIAL_PRELUDE_WGSL } from "./common"
 
 export const METAL_SHADER_WGSL = /* wgsl */ `
 
 ${NODES_WGSL}
+${COMMON_MATERIAL_PRELUDE_WGSL}
 
-struct CameraUniforms {
-  view: mat4x4f,
-  projection: mat4x4f,
-  viewPos: vec3f,
-  _padding: f32,
-};
-
-struct Light {
-  direction: vec4f,
-  color: vec4f,
-};
-
-struct LightUniforms {
-  ambientColor: vec4f,
-  lights: array<Light, 4>,
-};
-
-struct MaterialUniforms {
-  diffuseColor: vec3f,
-  alpha: f32,
-};
-
-struct VertexOutput {
-  @builtin(position) position: vec4f,
-  @location(0) normal: vec3f,
-  @location(1) uv: vec2f,
-  @location(2) worldPos: vec3f,
-};
-
-struct LightVP { viewProj: mat4x4f, };
-
-@group(0) @binding(0) var<uniform> camera: CameraUniforms;
-@group(0) @binding(1) var<uniform> light: LightUniforms;
-@group(0) @binding(2) var diffuseSampler: sampler;
-@group(0) @binding(3) var shadowMap: texture_depth_2d;
-@group(0) @binding(4) var shadowSampler: sampler_comparison;
-@group(0) @binding(5) var<uniform> lightVP: LightVP;
-@group(1) @binding(0) var<storage, read> skinMats: array<mat4x4f>;
-@group(2) @binding(0) var diffuseTexture: texture_2d<f32>;
-@group(2) @binding(1) var<uniform> material: MaterialUniforms;
-
-fn sampleShadow(worldPos: vec3f, n: vec3f) -> f32 {
-  // Back-facing to key light: direct contribution is zero anyway, skip 9 texture samples.
-  if (dot(n, -light.lights[0].direction.xyz) <= 0.0) { return 0.0; }
-  let biasedPos = worldPos + n * 0.08;
-  let lclip = lightVP.viewProj * vec4f(biasedPos, 1.0);
-  let ndc = lclip.xyz / max(lclip.w, 1e-6);
-  let suv = vec2f(ndc.x * 0.5 + 0.5, 0.5 - ndc.y * 0.5);
-  let cmpZ = ndc.z - 0.001;
-  let ts = 1.0 / 2048.0;
-  // 3x3 PCF unrolled — Safari's Metal backend doesn't unroll nested shadow loops reliably.
-  let s00 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts, -ts), cmpZ);
-  let s10 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(0.0, -ts), cmpZ);
-  let s20 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts, -ts), cmpZ);
-  let s01 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts, 0.0), cmpZ);
-  let s11 = textureSampleCompareLevel(shadowMap, shadowSampler, suv, cmpZ);
-  let s21 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts, 0.0), cmpZ);
-  let s02 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(-ts,  ts), cmpZ);
-  let s12 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f(0.0,  ts), cmpZ);
-  let s22 = textureSampleCompareLevel(shadowMap, shadowSampler, suv + vec2f( ts,  ts), cmpZ);
-  return (s00 + s10 + s20 + s01 + s11 + s21 + s02 + s12 + s22) * (1.0 / 9.0);
-}
-
-const PI_M: f32 = 3.141592653589793;
 const METAL_SPECULAR: f32 = 1.0;
 const METAL_METALLIC: f32 = 1.0;
 const METAL_ROUGHNESS: f32 = 0.3;
-const METAL_SPECULAR_TINT: f32 = 0.114;
 const METAL_TOON_EDGE: f32 = 0.2966;
 const METAL_MIX04_MUL: f32 = 0.5;
 const METAL_EMIT_STR: f32 = 8.100000381469727;
 const METAL_MIX_SHADER_FAC: f32 = 0.6967;
 const METAL_VORONOI_SCALE: f32 = 4.3;
 
-@vertex fn vs(
-  @location(0) position: vec3f,
-  @location(1) normal: vec3f,
-  @location(2) uv: vec2f,
-  @location(3) joints0: vec4<u32>,
-  @location(4) weights0: vec4<f32>
-) -> VertexOutput {
-  var output: VertexOutput;
-  let pos4 = vec4f(position, 1.0);
-  let weightSum = weights0.x + weights0.y + weights0.z + weights0.w;
-  let invWeightSum = select(1.0, 1.0 / weightSum, weightSum > 0.0001);
-  let nw = select(vec4f(1.0, 0.0, 0.0, 0.0), weights0 * invWeightSum, weightSum > 0.0001);
-  var skinnedPos = vec4f(0.0);
-  var skinnedNrm = vec3f(0.0);
-  for (var i = 0u; i < 4u; i++) {
-    let m = skinMats[joints0[i]];
-    let w = nw[i];
-    skinnedPos += (m * pos4) * w;
-    skinnedNrm += (mat3x3f(m[0].xyz, m[1].xyz, m[2].xyz) * normal) * w;
-  }
-  output.position = camera.projection * camera.view * vec4f(skinnedPos.xyz, 1.0);
-  // Skip VS normalize — interpolation denormalizes anyway, and FS always does normalize(input.normal).
-  output.normal = skinnedNrm;
-  output.uv = uv;
-  output.worldPos = skinnedPos.xyz;
-  return output;
-}
-
-struct FSOut {
-  @location(0) color: vec4f,
-  @location(1) mask: f32,
-};
-
 @fragment fn fs(input: VertexOutput) -> FSOut {
   let n = normalize(input.normal);
   let v = normalize(camera.viewPos - input.worldPos);
@@ -135,6 +38,7 @@ struct FSOut {
   let out_alpha = material.alpha * tex_s.a;
   if (out_alpha < 0.001) { discard; }
 
+  // ═══ NPR STACK ═══
   let tex_tint = hue_sat_id(1.0, 0.800000011920929, 1.0, tex_rgb);
   let lum_shade = shader_to_rgb_diffuse(n, l, sun, amb, shadow);
   let ramp008 = ramp_constant_edge_aa(lum_shade, METAL_TOON_EDGE, vec4f(0,0,0,1), vec4f(1,1,1,1));
@@ -147,6 +51,7 @@ struct FSOut {
   let npr_rgb = mix_overlay(1.0, mix04, hue004);
   let npr_emission = npr_rgb * METAL_EMIT_STR;
 
+  // ═══ PRINCIPLED BSDF (metallic=1, voronoi-driven base) ═══
   // Reflection-coord Voronoi produces the metallic sparkle variation.
   // VALTORGB takes Color → Fac via Blender's BT.601 implicit color_to_value.
   let refl_dir = reflect(-v, n);
@@ -157,23 +62,12 @@ struct FSOut {
   let hue006 = hue_sat_id(1.5, 1.2999999523162842, 1.0, tex_tint);
   let albedo = mix_blend(voro_ramp, vec3f(voro_ramp), hue006);
 
-  // Principled BSDF (EEVEE port): metallic=1 collapses f0 = mix(dielectric, albedo, 1) = albedo;
-  // specular_tint is dielectric-only and ignored here.
-  let f0 = albedo;
-  let f90 = mix(f0, vec3f(1.0), sqrt(METAL_SPECULAR));
-  let NL = max(dot(n, l), 0.0);
-  let NV = max(dot(n, v), 1e-4);
-  let brdf_lut = brdf_lut_sample(NV, METAL_ROUGHNESS);
-  let reflection_color = F_brdf_multi_scatter(f0, f90, brdf_lut.xy);
-
-  let spec_direct = bsdf_ggx(n, l, v, NL, NV, METAL_ROUGHNESS) * sun * shadow * ltc_brdf_scale_from_lut(brdf_lut);
-  let spec_indirect = amb;
-  let spec_radiance = (spec_direct + spec_indirect) * reflection_color;
-
-  // Pure metal — no diffuse lobe (diffuse_weight = (1 - metallic) = 0).
-  let principled = spec_radiance;
+  // metallic=1 collapses f0 = mix(dielectric, albedo, 1) = albedo; diffuse_weight = 0.
+  let principled = eval_principled(
+    PrincipledIn(albedo, METAL_METALLIC, METAL_SPECULAR, METAL_ROUGHNESS, 1e30, 0.0, 0.0),
+    n, l, v, sun, amb, shadow
+  );
 
-  // 混合着色器.001 Fac=0.6967: Shader=npr_emission, Shader_001=principled
   let final_color = mix(npr_emission, principled, METAL_MIX_SHADER_FAC);
 
   var out: FSOut;

package/src/shaders/materials/nodes.ts

@@ -480,4 +480,81 @@ fn tint_from_color(color: vec3f) -> vec3f {
   return select(vec3f(1.0), color / lum, lum > 0.0);
 }
 
+// ─── Principled sheen (gpu_shader_material_principled.glsl:8-14) ────
+// Empirical NV-only curve that approximates grazing retroreflection on cloth/velvet.
+// Scales the sheen layer's diffuse contribution; no sheen call site has sheen=0
+// shortcut because the multiplier is tiny at normal view angles anyway.
+fn principled_sheen(NV: f32) -> f32 {
+  let f = 1.0 - NV;
+  return f * f * f * 0.077 + f * 0.01 + 0.00026;
+}
+
+// ─── Principled BSDF eval ───────────────────────────────────────────
+// Shared EEVEE Principled path used by every material in the engine — metallic,
+// dielectric, and sheen variants all fold into these ~15 lines via the struct
+// fields. NPR materials still compute a separate toon/rim/warm stack on top and
+// mix(npr_stack, eval_principled(...), fac); see body.ts / face.ts / etc.
+//
+// Field conventions:
+//   base           — diffuse albedo. Mixed into f0 only when metallic > 0.
+//   metallic       — 0 = dielectric (f0 from specular), 1 = pure metal (f0 = base).
+//   specular       — Principled Specular input (0.5 default → f0 = 0.04). sqrt for f90.
+//   roughness      — GGX roughness; drives BRDF LUT coord + bsdf_ggx.
+//   spec_clamp     — EEVEE Light Clamp equivalent. Caps firefly spec from noise-bumped
+//                    NDF aliasing (Blender hides this via TAA which we don't have).
+//                    Pass 1e30 (effectively disabled) for materials that don't bump.
+//   sheen          — 0 disables. Scales the sheen diffuse add; cloth/stockings use ~0.7.
+//   sheen_tint     — 0 = white sheen, 1 = fully tinted by base. Multiplied by sheen,
+//                    so value is don't-care when sheen=0.
+struct PrincipledIn {
+  base: vec3f,
+  metallic: f32,
+  specular: f32,
+  roughness: f32,
+  spec_clamp: f32,
+  sheen: f32,
+  sheen_tint: f32,
+};
+
+fn eval_principled(
+  p: PrincipledIn,
+  N: vec3f, L: vec3f, V: vec3f,
+  sun_rgb: vec3f, amb_rgb: vec3f, shadow: f32
+) -> vec3f {
+  let NL = max(dot(N, L), 0.0);
+  let NV = max(dot(N, V), 1e-4);
+
+  // f0/f90 per gpu_shader_material_principled.glsl. specular_tint=0 is assumed
+  // (all presets in this engine use the default white dielectric tint).
+  let dielectric_f0 = vec3f(0.08 * p.specular);
+  let f0 = mix(dielectric_f0, p.base, p.metallic);
+  let f90 = mix(f0, vec3f(1.0), sqrt(p.specular));
+
+  // Single LUT tap feeds both F_brdf_multi_scatter (split-sum DFG) and
+  // ltc_brdf_scale_from_lut (LTC mag in .ba). See nodes.ts brdf_lut_sample.
+  let lut = brdf_lut_sample(NV, p.roughness);
+  let reflection_color = F_brdf_multi_scatter(f0, f90, lut.xy);
+
+  // Direct glossy — bsdf_ggx already includes NL; no F applied here (tinted after
+  // accum with reflection_color). ltc_brdf_scale rescales direct to match the
+  // split-sum indirect path, matching EEVEE closure_eval_glossy_lib behavior.
+  let spec_direct_raw = bsdf_ggx(N, L, V, NL, NV, p.roughness)
+                       * sun_rgb * shadow * ltc_brdf_scale_from_lut(lut);
+  let spec_direct = min(spec_direct_raw, vec3f(p.spec_clamp));
+  let spec_indirect = amb_rgb;
+  let spec_radiance = (spec_direct + spec_indirect) * reflection_color;
+
+  // Sheen add — when p.sheen=0 the whole term collapses, leaving diffuse_color=base.
+  let base_tint = tint_from_color(p.base);
+  let sheen_color = mix(vec3f(1.0), base_tint, p.sheen_tint);
+  let diffuse_color = p.base + p.sheen * sheen_color * principled_sheen(NV);
+
+  // diffuse_weight = (1-metallic). Indirect diffuse uses amb (L_w) with no π factor
+  // (probe_evaluate_world_diff returns SH-projected radiance, not cosine-convolved).
+  let diffuse_weight = 1.0 - p.metallic;
+  let diffuse_radiance = diffuse_color * (sun_rgb * NL * shadow / EEVEE_PI + amb_rgb) * diffuse_weight;
+
+  return diffuse_radiance + spec_radiance;
+}
+
 `;