reze-engine 0.11.1 → 0.11.3

package/src/index.ts

@@ -7,6 +7,8 @@ export {
   type BloomOptions,
   type ViewTransformOptions,
   type LoadModelFromFilesOptions,
+  type MaterialPreset,
+  type MaterialPresetMap,
 } from "./engine"
 export { parsePmxFolderInput, pmxFileAtRelativePath, type PmxFolderInputResult } from "./folder-upload"
 export { Model } from "./model"
@@ -21,5 +23,4 @@ export type {
   ControlPoint,
 } from "./animation"
 export { FPS } from "./animation"
-export { Physics, type PhysicsOptions } from "./physics"
-export type { MaterialPreset, MaterialPresetMap } from "./shaders/classify"
+export { Physics, type PhysicsOptions } from "./physics"

package/src/shaders/dfg_lut.ts

@@ -85,7 +85,7 @@ fn F_color_blend_zero(eta: f32, fresnel: f32) -> f32 {
   let x_uv = floor(frag.x) / (LUT_SIZE - 1.0);
 
   let NV = clamp(1.0 - y_uv * y_uv, 1e-4, 0.9999);
-  let a = x_uv * x_uv;
+  let a = max(x_uv, 1e-4);
   let a2 = clamp(a * a, 1e-4, 0.9999);
 
   let V = vec3f(sqrt(1.0 - NV * NV), 0.0, NV);

package/src/shaders/{body.ts → materials/body.ts}

@@ -70,32 +70,16 @@ fn sampleShadow(worldPos: vec3f, n: vec3f) -> f32 {
 }
 
 const PI_B: f32 = 3.141592653589793;
-const F0_BODY: f32 = 0.04;
 const BODY_ROUGHNESS: f32 = 0.3;
-// Dump: 层权重.002 Blend; 运算.007 POWER exponent Value_001; 背景 Color; 运算.004 after invert
 const BODY_RIM2_LAYER_BLEND: f32 = 0.20000000298023224;
 const BODY_RIM2_POW: f32 = 1.4300000667572021;
 const BODY_RIM2_BG: vec3f = vec3f(1.0, 0.4303792119026184, 0.3315804898738861);
-const BODY_WARM_AO_MUL: f32 = 0.30000001192092896;
+const BODY_WARM_STR: f32 = 0.30000001192092896;
+const BODY_SPECULAR: f32 = 0.5;
 const BODY_MIX_NPR: f32 = 0.5;
 // EEVEE Light Clamp equivalent — caps firefly specular from noise-bumped NDF aliasing.
 const BODY_SPEC_CLAMP: f32 = 10.0;
 
-fn ggx_d_body(ndoth: f32, a2: f32) -> f32 {
-  let denom = ndoth * ndoth * (a2 - 1.0) + 1.0;
-  return a2 / (PI_B * denom * denom);
-}
-
-fn smith_g1_body(ndotx: f32, a2: f32) -> f32 {
-  return 2.0 * ndotx / (ndotx + sqrt(a2 + (1.0 - a2) * ndotx * ndotx));
-}
-
-fn fresnel_schlick_body(cosTheta: f32, f0: f32) -> f32 {
-  let m = 1.0 - cosTheta;
-  let m2 = m * m;
-  return f0 + (1.0 - f0) * (m2 * m2 * m);
-}
-
 // smoothstep-based ramp: t*t*(3-2*t) between two color stops
 fn ramp_ease(f: f32, p0: f32, c0: vec4f, p1: f32, c1: vec4f) -> vec4f {
   let t = saturate((f - p0) / max(p1 - p0, 1e-6));
@@ -148,49 +132,33 @@ struct FSOut {
   let tex_color = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
   let shadow = sampleShadow(input.worldPos, n);
 
-  // ═══ TOON MASK: ShaderToRGB → ramp.008 CONSTANT [0→black, 0.2966→white] ═══
   let ndotl_raw = shader_to_rgb_diffuse(n, l, sun, light.ambientColor.xyz, shadow);
   let toon = ramp_constant(ndotl_raw, 0.0, vec4f(0,0,0,1), 0.2966, vec4f(1,1,1,1)).r;
 
-  // ═══ TOON COLOR: Mix.004 A=HueSat, B=HueSat.001, Fac=ramp.008 (R) ═══
   let shadow_tint = hue_sat_id(2.0, 0.3499999940395355, 1.0, tex_color);
   let lit_tint = hue_sat_id(1.5, 1.0, 1.0, tex_color);
   let toon_color = mix_blend(toon, shadow_tint, lit_tint);
   let bc = bright_contrast(toon_color, 0.1, 0.2);
 
-  // ═══ AO CHAIN: AO → ramp CONSTANT [0→white, 0.5995→black] → Mix.003 ═══
-  let ao = 1.0; // ao_fake(n, v) — no SSAO yet; inline 1.0 so the ramp/mix chain folds at compile time.
-  let ao_ramp = ramp_constant(ao, 0.0, vec4f(1,1,1,1), 0.5995, vec4f(0,0,0,1)).r;
-  let ao_mixed = mix_blend(ao_ramp, bc, vec3f(0.8301780223846436, 0.3345769941806793, 0.27946099638938904));
-
-  // ═══ EMISSION.003 (strength=4.0) ═══
-  let emission3 = ao_mixed * 4.0;
+  let emission3 = bc * 4.0;
 
-  // ═══ WARM: 颜色渐变.008 → 运算.006 ADD +0.5 (m_graphs) → clamp → 颜色渐变.003 ═══
-  let ao_inv = invert_f(1.0, ao_ramp);
-  let warm_str = ao_inv * BODY_WARM_AO_MUL;
   let warm_input = clamp(toon + 0.5, 0.0, 1.0);
   let warm_color = ramp_cardinal(warm_input, 0.2409,
     vec4f(0.2426, 0.068, 0.0588, 1.0), 0.4663,
     vec4f(0.6677, 0.5024, 0.5126, 1.0)).rgb;
-  let warm_emission = warm_color * warm_str;
+  let warm_emission = warm_color * BODY_WARM_STR;
 
-  // ═══ RIM 1: 菲涅尔 × 层权重.001 Facing Blend=0.24 → 自发光 Strength ═══
   let rim1_str = fresnel(2.0, n, v) * layer_weight_facing(0.24000005424022675, n, v);
   let rim1 = vec3f(0.984157919883728, 0.6110184788703918, 0.5736401677131653) * rim1_str;
 
-  // ═══ RIM 2: 层权重.002 Facing → 运算.007 POWER → 颜色渐变.010 EASE → MixShader.002 Fac ═══
   let facing_raw = layer_weight_facing(BODY_RIM2_LAYER_BLEND, n, v);
   let facing_pow = math_power(facing_raw, BODY_RIM2_POW);
   let rim2_fac = ramp_ease(facing_pow, 0.0, vec4f(0,0,0,1), 0.5052, vec4f(1,1,1,1)).r;
   let rim2_mixed = mix(emission3, BODY_RIM2_BG, rim2_fac);
 
-  // ═══ NPR STACK: AddShader chain (no bright gate in body) ═══
-  let add0 = rim1 + rim2_mixed;
-  let npr_stack = add0 + warm_emission;
+  let npr_stack = rim1 + rim2_mixed + warm_emission;
 
-  // ═══ PRINCIPLED BSDF: noise bump, GGX specular, SSS from AO ═══
-  // Mapping loc=rot=0 → plain scale multiply, inline.
+  // Noise bump — Mapping loc=rot=0 folds to a plain scale multiply.
   let noise_val = tex_noise_d2(input.worldPos * vec3f(1.0, 1.0, 1.5), 1.0);
   let noise_ramp = ramp_linear(noise_val, 0.0, vec4f(0,0,0,1), 1.0, vec4f(1,1,1,1)).r;
   let bumped_n = bump_lh(0.324644535779953, noise_ramp, n, input.worldPos);
@@ -198,31 +166,30 @@ struct FSOut {
   let principled_base = mix_blend(noise_ramp, bc, vec3f(0.6831911206245422, 0.19474034011363983, 0.13732507824897766));
   let p_emission = bc * 0.2;
 
-  // Reuse 'ao' (ao_fake(n, v) above) — identical inputs, avoid a second procedural AO pass.
-  let sss = ramp_linear(ao, 0.003, vec4f(0,0,0,1), 1.0, vec4f(0.0786, 0.0786, 0.0786, 1.0)).r;
-
-  let p_ndotl = max(dot(bumped_n, l), 0.0);
-  let p_ndotv = max(dot(bumped_n, v), 0.001);
-  let h = normalize(l + v);
-  let p_ndoth = max(dot(bumped_n, h), 0.0);
-  let p_vdoth = max(dot(v, h), 0.0);
-  let a2 = BODY_ROUGHNESS * BODY_ROUGHNESS;
-  let D = ggx_d_body(p_ndoth, a2);
-  let G = smith_g1_body(p_ndotl, a2) * smith_g1_body(p_ndotv, a2);
-  let F = fresnel_schlick_body(p_vdoth, F0_BODY);
-  let brdf_lut = brdf_lut_sample(p_ndotv, BODY_ROUGHNESS);
-  let spec = (D * G * F) / max(4.0 * p_ndotl * p_ndotv, 0.001) * ltc_brdf_scale_from_lut(brdf_lut);
-  let kd = (1.0 - F) * principled_base / PI_B;
-  // Split so we can clamp only the spec firefly contribution (EEVEE Light Clamp).
-  let spec_radiance = vec3f(spec) * sun * p_ndotl * shadow;
-  let spec_clamped = min(spec_radiance, vec3f(BODY_SPEC_CLAMP));
-  let direct = kd * sun * p_ndotl * shadow + spec_clamped;
+  // Principled BSDF (EEVEE port): metallic=0, specular=0.5, roughness=0.3, specular_tint=0.
+  let NL = max(dot(bumped_n, l), 0.0);
+  let NV = max(dot(bumped_n, v), 1e-4);
+
+  // f0/f90 per gpu_shader_material_principled.glsl — specular_tint=0 → dielectric_f0_color=white.
+  let f0 = vec3f(0.08 * BODY_SPECULAR);
+  let f90 = mix(f0, vec3f(1.0), sqrt(BODY_SPECULAR));
+  let brdf_lut = brdf_lut_sample(NV, BODY_ROUGHNESS);
+  let reflection_color = F_brdf_multi_scatter(f0, f90, brdf_lut.xy);
+
+  // Direct glossy — bsdf_ggx already includes NL; no F applied here (tinted after accum).
+  // ltc_brdf_scale: EEVEE direct path uses LTC; split-sum LUT path is rescaled to match.
+  let spec_direct_raw = bsdf_ggx(bumped_n, l, v, NL, NV, BODY_ROUGHNESS) * sun * shadow * ltc_brdf_scale_from_lut(brdf_lut);
+  let spec_direct = min(spec_direct_raw, vec3f(BODY_SPEC_CLAMP));
+  // Indirect glossy — flat world probe (solid color). Phase 2 adds cubemap.
+  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 ambient = principled_base * light.ambientColor.xyz;
-  let principled = ambient + direct + p_emission + vec3f(sss);
+  // No (1-F) factor per EEVEE — it doesn't energy-conserve spec<->diffuse.
+  let diffuse_radiance = principled_base * (sun * NL * shadow / PI_B + light.ambientColor.xyz);
+  let principled = diffuse_radiance + spec_radiance + p_emission;
 
-  // 混合着色器.001: Shader=相加着色器.001, Shader_001=原理化BSDF
   let final_color = mix(npr_stack, principled, BODY_MIX_NPR);
 
   var out: FSOut;

package/src/shaders/{cloth_rough.ts → materials/cloth_rough.ts}

@@ -128,34 +128,22 @@ struct FSOut {
   let out_alpha = material.alpha * tex_s.a;
   if (out_alpha < 0.001) { discard; }
 
-  // Shader→RGB → 颜色渐变.008 CONSTANT (edge AA terminator)
   let lum_shade = shader_to_rgb_diffuse(n, l, sun, amb, shadow);
+  // ramp_constant_edge_aa: avoids binary fac shimmer on terminator (fwidth + smoothstep).
   let ramp008 = ramp_constant_edge_aa(lum_shade, CLOTH_R_TOON_EDGE, vec4f(0,0,0,1), vec4f(1,1,1,1));
-  let toon_r = ramp008.r;
-  let mix04_fac = math_multiply(toon_r, CLOTH_R_MIX04_MUL);
+  let mix04_fac = math_multiply(ramp008.r, CLOTH_R_MIX04_MUL);
 
-  // 混合.004: A=色相/饱和度/明度.002(Hue=0.5 Sat=1.0 Val=0.2), B=纹理
   let dark_tex = hue_sat_id(1.0, 0.19999998807907104, 1.0, tex_rgb);
   let mix04 = mix_blend(mix04_fac, dark_tex, tex_rgb);
 
-  // 倒角.001.Z → 混合.003: A=混合.004, B=色相/饱和度/明度.002
   let bevel_z = clamp(n.y, 0.0, 1.0);
   let mix03 = mix_blend(bevel_z, mix04, dark_tex);
 
-  // 环境光遮蔽 → 颜色渐变.001 LINEAR → 混合.001 (white/black) → 混合.002 OVERLAY Fac
-  let ao = 1.0; // ao_fake(n, v) — no SSAO yet; inline 1.0 so the ramp/mix chain folds at compile time.
-  let ao_ramp_c = ramp_linear(ao, 0.0, vec4f(1,1,1,1), 0.8808, vec4f(0,0,0,1));
-  let mix01_fac = ao_ramp_c.r;
-  let mix01_rgb = mix(vec3f(1.0), vec3f(0.0), mix01_fac);
-
-  // 混合.002 OVERLAY: Fac=混合.001, A=混合.003, B=色相/饱和度/明度.004
   let hue004 = hue_sat_id(0.800000011920929, 2.0, 1.0, mix03);
-  let overlay_fac = mix01_rgb.r;
-  let npr_rgb = mix_overlay(overlay_fac, mix03, hue004);
+  let npr_rgb = mix_overlay(1.0, mix03, hue004);
   let npr_emission = npr_rgb * CLOTH_R_EMIT_STR;
 
-  // 噪波→渐变→凹凸 (LIVE in M_Rough_Cloth — unlike Smooth Cloth): Strength=1.0, noise Scale=17.7.
-  // mapping scale=(1,1,1), loc=rot=0 → identity; use worldPos directly.
+  // Noise bump is LIVE in M_Rough_Cloth — unlike Smooth Cloth where the subtree is dead.
   let noise_val = tex_noise_d2(input.worldPos, CLOTH_R_NOISE_SCALE);
   let noise_ramp = ramp_linear(noise_val, 0.0, vec4f(0,0,0,1), 1.0, vec4f(1,1,1,1)).r;
   let bumped_n = bump_lh(CLOTH_R_BUMP_STR, noise_ramp, n, input.worldPos);

package/src/shaders/{cloth_smooth.ts → materials/cloth_smooth.ts}

@@ -123,35 +123,23 @@ struct FSOut {
   let out_alpha = material.alpha * tex_s.a;
   if (out_alpha < 0.001) { discard; }
 
-  // Shader→RGB → 颜色渐变.008 CONSTANT — AA like face (same terminator artifact class)
   let lum_shade = shader_to_rgb_diffuse(n, l, sun, amb, shadow);
+  // ramp_constant_edge_aa: avoids binary fac shimmer on terminator (fwidth + smoothstep).
   let ramp008 = ramp_constant_edge_aa(lum_shade, CLOTH_TOON_EDGE, vec4f(0,0,0,1), vec4f(1,1,1,1));
-  let toon_r = ramp008.r;
-  // 颜色渐变.008 → 运算.004 MULTIPLY 0.5 → 混合.004 Factor
-  let mix04_fac = math_multiply(toon_r, CLOTH_MIX04_MUL);
+  let mix04_fac = math_multiply(ramp008.r, CLOTH_MIX04_MUL);
 
-  // 混合.004: A=色相/饱和度/明度.002, B=纹理
   let dark_tex = hue_sat_id(1.0, 0.19999998807907104, 1.0, tex_rgb);
   let mix04 = mix_blend(mix04_fac, dark_tex, tex_rgb);
 
-  // 倒角.001→Z → 混合.003 Factor; A=混合.004, B=色相/饱和度/明度.002
   let bevel_z = clamp(n.y, 0.0, 1.0);
   let mix03 = mix_blend(bevel_z, mix04, dark_tex);
 
-  // 环境光遮蔽 → 颜色渐变.001 LINEAR → 混合.001 (白/黑) → 混合.002 OVERLAY Fac
-  let ao = 1.0; // ao_fake(n, v) — no SSAO yet; inline 1.0 so the ramp/mix chain folds at compile time.
-  let ao_ramp_c = ramp_linear(ao, 0.0, vec4f(1,1,1,1), 0.8808, vec4f(0,0,0,1));
-  let mix01_fac = ao_ramp_c.r;
-  let mix01_rgb = mix(vec3f(1.0), vec3f(0.0), mix01_fac);
-
-  // 混合.002 OVERLAY: Fac=混合.001, A=混合.003, B=色相/饱和度/明度.004
   let hue004 = hue_sat_id(0.800000011920929, 2.0, 1.0, mix03);
-  let overlay_fac = mix01_rgb.r;
-  let npr_rgb = mix_overlay(overlay_fac, mix03, hue004);
+  let npr_rgb = mix_overlay(1.0, mix03, hue004);
   let npr_emission = npr_rgb * NPR_EMIT_STR;
 
-  // 原理化BSDF (EEVEE port): metallic=0, specular=0.8, roughness=0.5, specular_tint=0.
-  // Bump subtree is dead in the Blender graph (噪波→凹凸 not linked to Principled.Normal).
+  // Principled BSDF (EEVEE port): metallic=0, specular=0.8, roughness=0.5, specular_tint=0.
+  // Bump subtree is dead in the Blender graph (noise→bump not linked to Principled.Normal).
   let principled_base = hue_sat_id(1.0, 0.800000011920929, 1.0, tex_rgb);
   let NL = max(dot(n, l), 0.0);
   let NV = max(dot(n, v), 1e-4);

package/src/shaders/{default.ts → materials/default.ts}

@@ -2,10 +2,14 @@
 // Metallic=0, Specular=0.5 (F0=0.04), Roughness=0.5.
 // Tone mapping via LUT sampled from Blender's OCIO pipeline (exposure -0.3 baked in).
 
+import { NODES_WGSL } from "./nodes"
+
 export const DEFAULT_SHADER_WGSL = /* wgsl */ `
 
+${NODES_WGSL}
+
 const PI: f32 = 3.141592653589793;
-const F0_DIELECTRIC: f32 = 0.04;
+const DEFAULT_SPECULAR: f32 = 0.5;
 const ROUGHNESS: f32 = 0.5;
 
 struct CameraUniforms {
@@ -52,23 +56,6 @@ struct LightVP { viewProj: mat4x4f, };
 @group(2) @binding(0) var diffuseTexture: texture_2d<f32>;
 @group(2) @binding(1) var<uniform> material: MaterialUniforms;
 
-// ─── GGX specular helpers ───────────────────────────────────────────
-
-fn ggx_d(ndoth: f32, a2: f32) -> f32 {
-  let denom = ndoth * ndoth * (a2 - 1.0) + 1.0;
-  return a2 / (PI * denom * denom);
-}
-
-fn smith_g1(ndotx: f32, a2: f32) -> f32 {
-  return 2.0 * ndotx / (ndotx + sqrt(a2 + (1.0 - a2) * ndotx * ndotx));
-}
-
-fn fresnel_schlick(cosTheta: f32, f0: f32) -> f32 {
-  let m = 1.0 - cosTheta;
-  let m2 = m * m;
-  return f0 + (1.0 - f0) * (m2 * m2 * m);
-}
-
 // ─── Filmic tone mapping (LUT extracted from Blender 3.6 OCIO) ─────
 // View transform = Filmic, Look = Medium High Contrast, Exposure = -0.3.
 // 14 samples at integer log2 stops from -10 to +3 (inclusive).
@@ -158,27 +145,27 @@ struct FSOut {
   let albedo = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
 
   let l = -light.lights[0].direction.xyz;
-  let sunColor = light.lights[0].color.xyz * light.lights[0].color.w;
-  let h = normalize(l + v);
+  let sun = light.lights[0].color.xyz * light.lights[0].color.w;
+  let amb = light.ambientColor.xyz;
+  let shadow = sampleShadow(input.worldPos, n);
 
-  let ndotl = max(dot(n, l), 0.0);
-  let ndotv = max(dot(n, v), 0.001);
-  let ndoth = max(dot(n, h), 0.0);
-  let vdoth = max(dot(v, h), 0.0);
+  // 原理化BSDF (EEVEE port): metallic=0, specular=0.5, roughness=0.5, specular_tint=0.
+  let NL = max(dot(n, l), 0.0);
+  let NV = max(dot(n, v), 1e-4);
 
-  let a2 = ROUGHNESS * ROUGHNESS;
-  let D = ggx_d(ndoth, a2);
-  let G = smith_g1(ndotl, a2) * smith_g1(ndotv, a2);
-  let F = fresnel_schlick(vdoth, F0_DIELECTRIC);
-  let spec = (D * G * F) / max(4.0 * ndotl * ndotv, 0.001);
+  let f0 = vec3f(0.08 * DEFAULT_SPECULAR);
+  let f90 = mix(f0, vec3f(1.0), sqrt(DEFAULT_SPECULAR));
+  let brdf_lut = brdf_lut_sample(NV, ROUGHNESS);
+  let reflection_color = F_brdf_multi_scatter(f0, f90, brdf_lut.xy);
 
-  let shadow = sampleShadow(input.worldPos, n);
-  let kd = (1.0 - F) * albedo / PI;
-  let direct = (kd + spec) * sunColor * ndotl * shadow;
-  let ambient = albedo * light.ambientColor.xyz;
+  let spec_direct = bsdf_ggx(n, l, v, NL, NV, ROUGHNESS) * sun * shadow * ltc_brdf_scale_from_lut(brdf_lut);
+  let spec_indirect = amb;
+  let spec_radiance = (spec_direct + spec_indirect) * reflection_color;
+
+  let diffuse_radiance = albedo * (sun * NL * shadow / PI + amb);
 
   var out: FSOut;
-  out.color = vec4f(ambient + direct, alpha);
+  out.color = vec4f(diffuse_radiance + spec_radiance, alpha);
   out.mask = 1.0;
   return out;
 }

package/src/shaders/{eye.ts → materials/eye.ts}

@@ -1,12 +1,16 @@
-// Eye preset — default Principled BSDF (F0=0.04, Roughness=0.5) + Emission socket set to albedo × 1.5.
+// Eye preset — default Principled BSDF (Specular=0.5, Roughness=0.5) + Emission socket set to albedo × 1.5.
 // Matches the published preset's instruction: "keep eyes in the default nodegraph, add emission 1.5".
 // Blender's Principled BSDF Emission socket is added on top of the shaded output (pre-tonemap, feeds bloom).
 
+import { NODES_WGSL } from "./nodes"
+
 export const EYE_SHADER_WGSL = /* wgsl */ `
 
-const PI: f32 = 3.141592653589793;
-const F0_DIELECTRIC: f32 = 0.04;
-const ROUGHNESS: f32 = 0.5;
+${NODES_WGSL}
+
+const PI_E: f32 = 3.141592653589793;
+const EYE_SPECULAR: f32 = 0.5;
+const EYE_ROUGHNESS: f32 = 0.5;
 const EYE_EMISSION_STRENGTH: f32 = 1.5;
 
 struct CameraUniforms {
@@ -50,21 +54,6 @@ struct LightVP { viewProj: mat4x4f, };
 @group(2) @binding(0) var diffuseTexture: texture_2d<f32>;
 @group(2) @binding(1) var<uniform> material: MaterialUniforms;
 
-fn ggx_d(ndoth: f32, a2: f32) -> f32 {
-  let denom = ndoth * ndoth * (a2 - 1.0) + 1.0;
-  return a2 / (PI * denom * denom);
-}
-
-fn smith_g1(ndotx: f32, a2: f32) -> f32 {
-  return 2.0 * ndotx / (ndotx + sqrt(a2 + (1.0 - a2) * ndotx * ndotx));
-}
-
-fn fresnel_schlick(cosTheta: f32, f0: f32) -> f32 {
-  let m = 1.0 - cosTheta;
-  let m2 = m * m;
-  return f0 + (1.0 - f0) * (m2 * m2 * m);
-}
-
 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; }
@@ -129,30 +118,29 @@ struct FSOut {
   let albedo = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
 
   let l = -light.lights[0].direction.xyz;
-  let sunColor = light.lights[0].color.xyz * light.lights[0].color.w;
-  let h = normalize(l + v);
+  let sun = light.lights[0].color.xyz * light.lights[0].color.w;
+  let amb = light.ambientColor.xyz;
+  let shadow = sampleShadow(input.worldPos, n);
 
-  let ndotl = max(dot(n, l), 0.0);
-  let ndotv = max(dot(n, v), 0.001);
-  let ndoth = max(dot(n, h), 0.0);
-  let vdoth = max(dot(v, h), 0.0);
+  // 原理化BSDF (EEVEE port): metallic=0, specular=0.5, roughness=0.5, specular_tint=0.
+  let NL = max(dot(n, l), 0.0);
+  let NV = max(dot(n, v), 1e-4);
 
-  let a2 = ROUGHNESS * ROUGHNESS;
-  let D = ggx_d(ndoth, a2);
-  let G = smith_g1(ndotl, a2) * smith_g1(ndotv, a2);
-  let F = fresnel_schlick(vdoth, F0_DIELECTRIC);
-  let spec = (D * G * F) / max(4.0 * ndotl * ndotv, 0.001);
+  let f0 = vec3f(0.08 * EYE_SPECULAR);
+  let f90 = mix(f0, vec3f(1.0), sqrt(EYE_SPECULAR));
+  let brdf_lut = brdf_lut_sample(NV, EYE_ROUGHNESS);
+  let reflection_color = F_brdf_multi_scatter(f0, f90, brdf_lut.xy);
 
-  let shadow = sampleShadow(input.worldPos, n);
-  let kd = (1.0 - F) * albedo / PI;
-  let direct = (kd + spec) * sunColor * ndotl * shadow;
-  let ambient = albedo * light.ambientColor.xyz;
+  let spec_direct = bsdf_ggx(n, l, v, NL, NV, EYE_ROUGHNESS) * sun * shadow * ltc_brdf_scale_from_lut(brdf_lut);
+  let spec_indirect = amb;
+  let spec_radiance = (spec_direct + spec_indirect) * reflection_color;
 
+  let diffuse_radiance = albedo * (sun * NL * shadow / PI_E + amb);
   // Principled Emission socket: emissive = emission_color × strength, added on top of shading.
   let emission = albedo * EYE_EMISSION_STRENGTH;
 
   var out: FSOut;
-  out.color = vec4f(ambient + direct + emission, alpha);
+  out.color = vec4f(diffuse_radiance + spec_radiance + emission, alpha);
   out.mask = 1.0;
   return out;
 }

package/src/shaders/{face.ts → materials/face.ts}

@@ -73,12 +73,11 @@ fn sampleShadow(worldPos: vec3f, n: vec3f) -> f32 {
 const PI_F: f32 = 3.141592653589793;
 const FACE_SPECULAR: f32 = 0.5;
 const FACE_ROUGHNESS: f32 = 0.3;
-// Dump M_Face unlinked defaults (math op enum not serialized — warm clamp chain still from m_graphs)
 const FACE_RIM2_POW: f32 = 0.6300000548362732;
 const FACE_RIM2_BG: vec3f = vec3f(1.0, 0.4684903025627136, 0.3698573112487793);
-const FACE_WARM_AO_MUL: f32 = 0.30000001192092896; // 运算.004 MULTIPLY after invert (was 0.5 in older trace)
-const FACE_BRIGHT_TEX_THRESH: f32 = 0.9300000071525574; // 运算.005 GREATER_THAN Value_001
-const FACE_MIX_NPR: f32 = 0.5; // 混合着色器.001 Fac
+const FACE_WARM_STR: f32 = 0.30000001192092896;
+const FACE_BRIGHT_TEX_THRESH: f32 = 0.9300000071525574;
+const FACE_MIX_NPR: f32 = 0.5;
 // EEVEE Light Clamp equivalent (Render Props → Sampling → Clamping). Caps direct
 // specular firefly from the noise-bumped normal's NDF aliasing — Blender hides this
 // via TAA, which we don't have. Value mirrors EEVEE's default Clamp Indirect=10.0.
@@ -112,10 +111,6 @@ const FACE_SPEC_CLAMP: f32 = 10.0;
   return output;
 }
 
-// Fragment: M_Face NPR + Principled hybrid
-// TEX → HueSat shadow/lit → toon gate → BrightContrast → AO chain → emission stack
-// Fresnel rims, warm AO emission, bright-texture gate, noise-bumped Principled
-// Final = mix(Principled, NPR, 0.5)
 struct FSOut {
   @location(0) color: vec4f,
   @location(1) mask: f32,
@@ -134,79 +129,49 @@ struct FSOut {
   let tex_color = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
   let shadow = sampleShadow(input.worldPos, n);
 
-  // ═══ SOURCES ═══
-  // DiffuseBSDF(white) → ShaderToRGB (energy-matched); shadow on direct only
   let ndotl_raw = shader_to_rgb_diffuse(n, l, sun, light.ambientColor.xyz, shadow);
-  // ramp.008 CONSTANT — edge AA avoids binary fac shimmer / white specks on terminator (fwidth + smoothstep)
+  // ramp_constant_edge_aa: avoids binary fac shimmer on terminator (fwidth + smoothstep).
   let toon = ramp_constant_edge_aa(ndotl_raw, 0.2966, vec4f(0,0,0,1), vec4f(1,1,1,1)).r;
-  let ao = 1.0; // ao_fake(n, v) — no SSAO yet; inline 1.0 so the ramp/mix chain folds at compile time.
 
-  // ═══ TOON COLOR ═══
-  let shadow_tint = hue_sat(0.46000000834465027, 2.0, 0.3499999940395355, 1.0, tex_color); // HueSat.002
-  let lit_tint = hue_sat(0.46000000834465027, 1.600000023841858, 1.5, 1.0, tex_color); // HueSat.001
-  let toon_color = mix_blend(toon, shadow_tint, lit_tint); // Mix.004
+  let shadow_tint = hue_sat(0.46000000834465027, 2.0, 0.3499999940395355, 1.0, tex_color);
+  let lit_tint = hue_sat(0.46000000834465027, 1.600000023841858, 1.5, 1.0, tex_color);
+  let toon_color = mix_blend(toon, shadow_tint, lit_tint);
   let bc = bright_contrast(toon_color, 0.1, 0.2);
 
-  // ═══ AO CHAIN ═══
-  // ramp CONSTANT [0→white, 0.5995→black]
-  let ao_ramp = ramp_constant(ao, 0.0, vec4f(1,1,1,1), 0.5995, vec4f(0,0,0,1)).r;
-  // Mix.003(Factor=ao_ramp, A=bc, B=reddish tint)
-  let ao_mixed = mix_blend(ao_ramp, bc, vec3f(0.8302, 0.3346, 0.2795));
+  let emission3 = bc * 2.5;
 
-  // ═══ EMISSION 3 ═══
-  let emission3 = ao_mixed * 2.5; // Emission.003(Strength=2.5)
-
-  // ═══ WARM EMISSION ═══
-  let ao_inv = invert_f(1.0, ao_ramp);
-  let warm_str = ao_inv * FACE_WARM_AO_MUL; // 反转 → 运算.004 MULTIPLY Value_001
-  let warm_input = clamp(toon * 0.5 + 0.5, 0.0, 1.0); // 运算.001→运算.006→Clamp
-  // ramp.003 CARDINAL [0.2409→warm dark, 0.4663→warm light]
+  let warm_input = clamp(toon * 0.5 + 0.5, 0.0, 1.0);
   let warm_color = ramp_cardinal(warm_input, 0.2409,
     vec4f(0.2426, 0.068, 0.0588, 1.0), 0.4663,
     vec4f(0.6677, 0.5024, 0.5126, 1.0)).rgb;
-  let warm_emission = warm_color * warm_str; // Emission.001
+  let warm_emission = warm_color * FACE_WARM_STR;
 
-  // ═══ RIM 1 ═══
-  // Fresnel(IOR=2.0) × LayerWeight.001(Facing, Blend=0.24)
   let rim1_str = fresnel(2.0, n, v) * layer_weight_facing(0.24, n, v);
   let rim1 = vec3f(0.984157919883728, 0.6110184788703918, 0.5736401677131653) * rim1_str;
 
-  // ═══ RIM 2 ═══
-  // Fresnel.001(IOR=1.45) × LayerWeight.002(Fresnel output, Blend=0.61)
   let rim2_raw = fresnel(1.45, n, v) * layer_weight_fresnel(0.61, n, v);
   let rim2_fac = math_power(rim2_raw, FACE_RIM2_POW);
-  // MixShader.002: Shader=Emission.003, Shader_001=背景
   let rim2_mixed = mix(emission3, FACE_RIM2_BG, rim2_fac);
 
-  // 转接点.005(tex) → 运算.005 GREATER_THAN Value_001
-  // Blender implicitly converts Color → Float via BT.601 grayscale when plugging a
-  // color output into a Math node's Value input. Our earlier trace used tex_color.r,
-  // which fires aggressively on R-dominant skin — single near-white R pixels produced
-  // firefly speckles. color_to_value matches the actual Blender socket semantic and
-  // only fires on genuinely near-white painted features (the author's intent).
+  // Blender implicitly converts Color → Float via BT.601 grayscale when plugging a color
+  // output into a Math node's Value input. An earlier trace used tex_color.r, which fires
+  // aggressively on R-dominant skin — single near-white R pixels produced firefly speckles.
+  // color_to_value matches the Blender socket semantic and only fires on genuinely near-
+  // white painted features (the author's intent).
   let tex_gate = math_greater_than(color_to_value(tex_color), FACE_BRIGHT_TEX_THRESH);
-  let bright_emit = vec3f(tex_gate) * 3.0; // Emission.002(Strength=3.0)
+  let bright_emit = vec3f(tex_gate) * 3.0;
 
-  // ═══ NPR STACK (AddShader chain) ═══
-  let add2 = rim2_mixed + bright_emit; // AddShader.002
-  let add0 = rim1 + add2; // AddShader
-  let npr_stack = add0 + warm_emission; // AddShader.001
+  let npr_stack = rim1 + rim2_mixed + bright_emit + warm_emission;
 
-  // ═══ PRINCIPLED BSDF ═══
-  // Noise-based bump normal. Mapping loc=rot=0 → plain scale multiply, inline.
+  // Noise bump — Mapping loc=rot=0 folds to a plain scale multiply.
   let noise_val = tex_noise_d2(input.worldPos * vec3f(1.0, 1.0, 1.5), 1.0);
   let noise_ramp = ramp_linear(noise_val, 0.0, vec4f(0,0,0,1), 1.0, vec4f(1,1,1,1)).r;
-  let bumped_n = bump_lh(0.324644535779953, noise_ramp, n, input.worldPos); // 凹凸 Strength; LH bump
+  let bumped_n = bump_lh(0.324644535779953, noise_ramp, n, input.worldPos);
 
-  // Mix.001(Factor=noise_ramp, A=bc, B=dark red)
   let principled_base = mix_blend(noise_ramp, bc, vec3f(0.6832, 0.1947, 0.1373));
-  // Emission input from reroute.011 (bc), Strength=0.2
   let p_emission = bc * 0.2;
-  // AO.002 → ramp.005 LINEAR [0.003→black, 1.0→gray] for subsurface approx.
-  // Reuse 'ao' (ao_fake(n, v) above) — identical inputs, avoid a second procedural AO pass.
-  let sss = ramp_linear(ao, 0.003, vec4f(0,0,0,1), 1.0, vec4f(0.0786, 0.0786, 0.0786, 1.0)).r;
 
-  // 原理化BSDF (EEVEE port): metallic=0, specular=0.5, roughness=0.3, specular_tint=0.
+  // Principled BSDF (EEVEE port): metallic=0, specular=0.5, roughness=0.3, specular_tint=0.
   let NL = max(dot(bumped_n, l), 0.0);
   let NV = max(dot(bumped_n, v), 1e-4);
 
@@ -223,9 +188,8 @@ struct FSOut {
   // 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 = principled_base * (sun * NL * shadow / PI_F + light.ambientColor.xyz);
-  let principled = diffuse_radiance + spec_radiance + p_emission + vec3f(sss);
+  let principled = diffuse_radiance + spec_radiance + p_emission;
 
-  // 混合着色器.001: Shader=相加着色器.001, Shader_001=原理化BSDF — Fac blends toward second
   let final_color = mix(npr_stack, principled, FACE_MIX_NPR);
 
   var out: FSOut;

package/src/shaders/{hair.ts → materials/hair.ts}

@@ -73,7 +73,6 @@ fn sampleShadow(worldPos: vec3f, n: vec3f) -> f32 {
 const PI_H: f32 = 3.141592653589793;
 const HAIR_SPECULAR: f32 = 1.0;
 const HAIR_ROUGHNESS: f32 = 0.3;
-// Dump M_Hair: 运算.004 GREATER_THAN second operand Value_001; 运算.007 POWER exponent Value_001; 背景 Color
 const HAIR_TEX_GATE_THRESH: f32 = 0.15000000596046448;
 const HAIR_RIM2_POW: f32 = 0.6300000548362732;
 const HAIR_MIX_BG: vec3f = vec3f(0.1673291176557541);
@@ -120,55 +119,37 @@ struct FSOut {
   let l = -light.lights[0].direction.xyz;
   let sun = light.lights[0].color.xyz * light.lights[0].color.w;
 
-  // 图像纹理 ← 纹理坐标.UV → 映射 (default 1,1,1 scale per JSON)
   let tex_color = textureSample(diffuseTexture, diffuseSampler, input.uv).rgb;
   let shadow = sampleShadow(input.worldPos, n);
 
-  // 色相/饱和度/明度 (Hue=0.5 Sat=1.2 Val=0.5 Fac=1) ← reroute from image
   let hue_sat_shadow = hue_sat_id(1.2, 0.5, 1.0, tex_color);
-  // 色相/饱和度/明度.002 (0.48, 1.2, 0.7, 1) ← previous
   let hue_sat_002 = hue_sat(0.48, 1.2, 0.7, 1.0, hue_sat_shadow);
-  // 色相/饱和度/明度.001 (0.5, 1.5, 1.0, 1) ← image reroute (lit path)
   let hue_sat_001 = hue_sat_id(1.5, 1.0, 1.0, tex_color);
 
-  // 漫射 BSDF.002 → Shader --> RGB → 颜色渐变.008 CONSTANT [0→0, 0.2966→1]
   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;
 
-  // 混合.004 MIX Fac=ramp_008, A=hue_sat_002, B=hue_sat_001
   let mix_004 = mix_blend(ramp_008, hue_sat_002, hue_sat_001);
-
-  // 亮度/对比度 (Bright=0.1 Contrast=0.2) ← mix_004 only (links: not bevel path)
   let bc = bright_contrast(mix_004, 0.1, 0.2);
 
-  // 倒角.001 → 分离 XYZ.001 → Z → 混合.003 Factor; A=bc, B=hue_sat_002
   let bevel_z = clamp(n.y, 0.0, 1.0);
   let mix_003 = mix_blend(bevel_z, bc, hue_sat_002);
 
-  // 环境光遮蔽 (AO).001 → 颜色渐变.001 → 混合.001 → 混合.002 chain collapses with fake AO=1:
-  //   ramp_constant(1, 0→white, 0.3756→black).r = 0 → ao_factor = mix(1,0,0) = 1 → mix_002 = mix_003.
-  //   hue_sat_004 becomes unreachable. When real SSAO lands, restore the original 5-line port.
-  let emission3 = mix_003; // Emission.003 Strength=1.0 (×1 omitted)
-
-  // 菲涅尔.001 × 层权重.002 → 运算.003 MULTIPLY → 运算.007 POWER(exponent Value_001) → MixShader.002 Fac
   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);
-  // MixShader.002: Shader=Emission.003, Shader_001=背景 — (1-Fac)*emission + Fac*bg
-  let mix_shader_002 = mix(emission3, HAIR_MIX_BG, rim2_fac);
+  let mix_shader_002 = mix(mix_003, HAIR_MIX_BG, rim2_fac);
 
-  // 运算.004 GREATER_THAN: 图像→Value, threshold Value_001. Blender converts Color→Float
-  // via BT.601 luminance, not raw R — same socket-semantic fix as M_Face.
+  // 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;
 
-  // 相加着色器: MixShader.002 + gate emission (color sum in linear space)
   let add_shader = mix_shader_002 + gate_emit;
 
-  // 原理化BSDF (EEVEE port): metallic=0, specular=1.0, roughness=0.3, specular_tint=0.
-  // Blender graph has 噪波→法线贴图 Strength=0.1 on Principled.Normal, but MixShader.001
-  // weights Principled at only 0.2; spec contribution × that weight is imperceptible in
-  // A/B with the noise-bump port enabled, so we drop it and keep plain n — saves a full
-  // tex_noise + bump_lh per hair fragment.
+  // 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);
 
@@ -186,7 +167,6 @@ struct FSOut {
   let diffuse_radiance = bc * (sun * NL * shadow / PI_H + light.ambientColor.xyz);
   let principled = diffuse_radiance + spec_radiance;
 
-  // 混合着色器.001 Fac=0.2: first socket=相加着色器, second=原理化BSDF
   let final_color = mix(add_shader, principled, 0.2);
 
   var out: FSOut;