reze-engine 0.65.0 → 0.66.1

package/src/graph/compile.ts

@@ -340,6 +340,10 @@ export function compileGraph(graph: ShaderGraph, opts: CompileOptions = {}): Com
       args.distortion.literal === 0
     )
       return `tex_noise_d2(${raw.vector}, ${raw.scale})`
+    // Lit is the SURFACE only when it is the graph's output: then it shades the
+    // lamps' diffuse by its own albedo, as URP does. Mixed in as a layer (a
+    // toon look's gloss), the lamps stay the epilogue's, on the whole material.
+    if (node.type === "lit" && node.id !== out.node) return spec(node).emit!(raw).replace(/, true\)$/, ", false)")
     return spec(node).emit!(raw)
   }
 

package/src/graph/presets/body.ts

@@ -1,5 +1,5 @@
 // M_Body as a ShaderGraph — port of shaders/materials/body.ts (仿深空之眼 "M_Body").
-// Toon + warm rim + rim1/rim2 stack mixed 50/50 against a Principled BSDF with
+// Toon + warm rim + rim1/rim2 stack mixed 50/50 against a Lit layer with
 // noise-bumped normal. The hand port's local ramp_ease is ramp_cardinal (identical
 // smoothstep form); the Mapping node's zero loc/rot folds to a scale multiply.
 
@@ -18,13 +18,13 @@ export const BODY_GRAPH: ShaderGraph = {
     { id: "mat_diffuse", type: "material_diffuse" },
     { id: "tex_base", type: "mix/multiply", inputs: { fac: 1.0 } },
     { id: "geo", type: "geometry" },
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "toon", type: "ramp_cardinal", inputs: { pos0: 0.2466, pos1: 0.3466 } },
     { id: "shadow_tint", type: "hue_sat", inputs: { hue: 0.5, saturation: 2.0, value: 0.3499999940395355, fac: 1.0 } },
     { id: "lit_tint", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.5, value: 1.0, fac: 1.0 } },
     { id: "toon_color", type: "mix/blend" },
     { id: "bc", type: "bright_contrast", inputs: { bright: 0.1, contrast: 0.2 } },
-    { id: "emission3", type: "emission", inputs: { strength: 4.0 } },
+    { id: "emission3", type: "vector_math/scale", inputs: { scale: 4.0 } },
     { id: "warm_add", type: "math/add", inputs: { b: 0.5 } },
     { id: "warm_clamp", type: "math/clamp01" },
     {
@@ -37,17 +37,18 @@ export const BODY_GRAPH: ShaderGraph = {
         color1: [0.6677, 0.5024, 0.5126, 1.0],
       },
     },
-    { id: "warm_emit", type: "emission", inputs: { strength: 0.30000001192092896 } },
+    { id: "warm_emit", type: "vector_math/scale", inputs: { scale: 0.30000001192092896 } },
     { id: "rim1_fres", type: "fresnel", inputs: { ior: 2.0 } },
     { id: "rim1_lw", type: "layer_weight/facing", inputs: { blend: 0.24000005424022675 } },
     { id: "rim1_str", type: "math/multiply" },
-    { id: "rim1", type: "emission", inputs: { color: [0.984157919883728, 0.6110184788703918, 0.5736401677131653] } },
+    { id: "rim1", type: "vector_math/scale" },
+    { id: "rim1_color", type: "rgb", inputs: { color: [0.984157919883728, 0.6110184788703918, 0.5736401677131653] } },
     { id: "rim2_lw", type: "layer_weight/facing", inputs: { blend: 0.20000000298023224 } },
     { id: "rim2_pow", type: "math/power", inputs: { b: 1.4300000667572021 } },
     { id: "rim2_ramp", type: "ramp_cardinal", inputs: { pos0: 0.0, pos1: 0.5052 } },
-    { id: "rim2_mix", type: "mix_shader", inputs: { b: [1.0, 0.4303792119026184, 0.3315804898738861] } },
-    { id: "npr_add1", type: "add_shader" },
-    { id: "npr_stack", type: "add_shader" },
+    { id: "rim2_mix", type: "mix/blend", inputs: { b: [1.0, 0.4303792119026184, 0.3315804898738861] } },
+    { id: "npr_add1", type: "vector_math/add" },
+    { id: "npr_stack", type: "vector_math/add" },
     { id: "map", type: "mapping", inputs: { scl: [1.0, 1.0, 1.5] } },
     { id: "noise", type: "tex_noise", inputs: { scale: 1.0 } },
     { id: "noise_ramp", type: "ramp_linear", inputs: { pos0: 0.0, pos1: 1.0 } },
@@ -57,14 +58,14 @@ export const BODY_GRAPH: ShaderGraph = {
       type: "mix/blend",
       inputs: { b: [0.6831911206245422, 0.19474034011363983, 0.13732507824897766] },
     },
-    { id: "p_emit", type: "emission", inputs: { strength: 0.2 } },
+    { id: "p_emit", type: "vector_math/scale", inputs: { scale: 0.2 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.5, roughness: 0.3, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.4523 },
     },
-    { id: "p_sum", type: "add_shader" },
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.5 } },
+    { id: "p_sum", type: "vector_math/add" },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.5 } },
   ],
   links: [
     { from: { node: "str", socket: "value" }, to: { node: "toon", socket: "fac" } },
@@ -76,22 +77,23 @@ export const BODY_GRAPH: ShaderGraph = {
     { from: { node: "shadow_tint", socket: "color" }, to: { node: "toon_color", socket: "a" } },
     { from: { node: "lit_tint", socket: "color" }, to: { node: "toon_color", socket: "b" } },
     { from: { node: "toon_color", socket: "color" }, to: { node: "bc", socket: "color" } },
-    { from: { node: "bc", socket: "color" }, to: { node: "emission3", socket: "color" } },
+    { from: { node: "bc", socket: "color" }, to: { node: "emission3", socket: "a" } },
     { from: { node: "toon", socket: "fac_out" }, to: { node: "warm_add", socket: "a" } },
     { from: { node: "warm_add", socket: "value" }, to: { node: "warm_clamp", socket: "a" } },
     { from: { node: "warm_clamp", socket: "value" }, to: { node: "warm_ramp", socket: "fac" } },
-    { from: { node: "warm_ramp", socket: "color" }, to: { node: "warm_emit", socket: "color" } },
+    { from: { node: "warm_ramp", socket: "color" }, to: { node: "warm_emit", socket: "a" } },
     { from: { node: "rim1_fres", socket: "value" }, to: { node: "rim1_str", socket: "a" } },
     { from: { node: "rim1_lw", socket: "value" }, to: { node: "rim1_str", socket: "b" } },
-    { from: { node: "rim1_str", socket: "value" }, to: { node: "rim1", socket: "strength" } },
+    { from: { node: "rim1_str", socket: "value" }, to: { node: "rim1", socket: "scale" } },
     { from: { node: "rim2_lw", socket: "value" }, to: { node: "rim2_pow", socket: "a" } },
     { from: { node: "rim2_pow", socket: "value" }, to: { node: "rim2_ramp", socket: "fac" } },
-    { from: { node: "emission3", socket: "color" }, to: { node: "rim2_mix", socket: "a" } },
+    { from: { node: "emission3", socket: "vector" }, to: { node: "rim2_mix", socket: "a" } },
     { from: { node: "rim2_ramp", socket: "fac_out" }, to: { node: "rim2_mix", socket: "fac" } },
-    { from: { node: "rim1", socket: "color" }, to: { node: "npr_add1", socket: "a" } },
+    { from: { node: "rim1_color", socket: "color" }, to: { node: "rim1", socket: "a" } },
+    { from: { node: "rim1", socket: "vector" }, to: { node: "npr_add1", socket: "a" } },
     { from: { node: "rim2_mix", socket: "color" }, to: { node: "npr_add1", socket: "b" } },
-    { from: { node: "npr_add1", socket: "color" }, to: { node: "npr_stack", socket: "a" } },
-    { from: { node: "warm_emit", socket: "color" }, to: { node: "npr_stack", socket: "b" } },
+    { from: { node: "npr_add1", socket: "vector" }, to: { node: "npr_stack", socket: "a" } },
+    { from: { node: "warm_emit", socket: "vector" }, to: { node: "npr_stack", socket: "b" } },
     { from: { node: "geo", socket: "rest_pos" }, to: { node: "map", socket: "vector" } },
     { from: { node: "map", socket: "vector" }, to: { node: "noise", socket: "vector" } },
     { from: { node: "noise", socket: "value" }, to: { node: "noise_ramp", socket: "fac" } },
@@ -99,13 +101,13 @@ export const BODY_GRAPH: ShaderGraph = {
     { from: { node: "geo", socket: "normal" }, to: { node: "bump", socket: "normal" } },
     { from: { node: "noise_ramp", socket: "fac_out" }, to: { node: "principled_base", socket: "fac" } },
     { from: { node: "bc", socket: "color" }, to: { node: "principled_base", socket: "a" } },
-    { from: { node: "bc", socket: "color" }, to: { node: "p_emit", socket: "color" } },
+    { from: { node: "bc", socket: "color" }, to: { node: "p_emit", socket: "a" } },
     { from: { node: "principled_base", socket: "color" }, to: { node: "principled", socket: "base_color" } },
     { from: { node: "bump", socket: "vector" }, to: { node: "principled", socket: "normal" } },
     { from: { node: "principled", socket: "color" }, to: { node: "p_sum", socket: "a" } },
-    { from: { node: "p_emit", socket: "color" }, to: { node: "p_sum", socket: "b" } },
-    { from: { node: "npr_stack", socket: "color" }, to: { node: "mix_shader_001", socket: "a" } },
-    { from: { node: "p_sum", socket: "color" }, to: { node: "mix_shader_001", socket: "b" } },
+    { from: { node: "p_emit", socket: "vector" }, to: { node: "p_sum", socket: "b" } },
+    { from: { node: "npr_stack", socket: "vector" }, to: { node: "mix_shader_001", socket: "a" } },
+    { from: { node: "p_sum", socket: "vector" }, to: { node: "mix_shader_001", socket: "b" } },
   ],
   output: { node: "mix_shader_001", socket: "color" },
 }

package/src/graph/presets/cloth_rough.ts

@@ -1,6 +1,6 @@
 // M_Rough_Cloth as a ShaderGraph — port of shaders/materials/cloth_rough.ts.
 // NPR graph identical to M_Smooth_Cloth, but the noise bump subtree IS live on
-// Principled.Normal (weave bump in rest space), and it is MATTE where smooth cloth
+// the Lit layer's normal (weave bump in rest space), and it is MATTE where smooth cloth
 // shines: roughness 1, specular 0.25, and a wider toon band (0.20-0.45) so the
 // light rolls off cotton instead of cutting. Smooth keeps 0.5 / 0.8 / 0.25-0.35.
 // The tex_noise node hits the detail=2 peephole → tex_noise_d2.
@@ -20,7 +20,7 @@ export const CLOTH_ROUGH_GRAPH: ShaderGraph = {
     { id: "mat_diffuse", type: "material_diffuse" },
     { id: "tex_base", type: "mix/multiply", inputs: { fac: 1.0 } },
     { id: "geo", type: "geometry" },
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "ramp_008", type: "ramp_cardinal", inputs: { pos0: 0.2, pos1: 0.45 } },
     { id: "mix04_fac", type: "math/multiply", inputs: { b: 0.5 } },
     { id: "dark_tex", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.19999998807907104, fac: 1.0 } },
@@ -30,17 +30,17 @@ export const CLOTH_ROUGH_GRAPH: ShaderGraph = {
     { id: "mix_003", type: "mix/blend" },
     { id: "hue_004", type: "hue_sat", inputs: { hue: 0.5, saturation: 0.800000011920929, value: 2.0, fac: 1.0 } },
     { id: "npr_overlay", type: "mix/overlay", inputs: { fac: 1.0 } },
-    { id: "npr_emit", type: "emission", inputs: { strength: 18.200000762939453 } },
+    { id: "npr_emit", type: "vector_math/scale", inputs: { scale: 18.200000762939453 } },
     { id: "noise", type: "tex_noise", inputs: { scale: 17.7 } },
     { id: "noise_ramp", type: "ramp_linear", inputs: { pos0: 0.0, pos1: 1.0 } },
     { id: "bump", type: "bump", inputs: { strength: 1.0 } },
     { id: "principled_base", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.800000011920929, fac: 1.0 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.25, roughness: 1.0, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.0, specular: 0.25 },
     },
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.8999999761581421 } },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.8999999761581421 } },
   ],
   links: [
     { from: { node: "str", socket: "value" }, to: { node: "ramp_008", socket: "fac" } },
@@ -59,7 +59,7 @@ export const CLOTH_ROUGH_GRAPH: ShaderGraph = {
     { from: { node: "mix_003", socket: "color" }, to: { node: "hue_004", socket: "color" } },
     { from: { node: "mix_003", socket: "color" }, to: { node: "npr_overlay", socket: "a" } },
     { from: { node: "hue_004", socket: "color" }, to: { node: "npr_overlay", socket: "b" } },
-    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "color" } },
+    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "a" } },
     { from: { node: "geo", socket: "rest_pos" }, to: { node: "noise", socket: "vector" } },
     { from: { node: "noise", socket: "value" }, to: { node: "noise_ramp", socket: "fac" } },
     { from: { node: "noise_ramp", socket: "fac_out" }, to: { node: "bump", socket: "height" } },
@@ -67,7 +67,7 @@ export const CLOTH_ROUGH_GRAPH: ShaderGraph = {
     { from: { node: "tex_base", socket: "color" }, to: { node: "principled_base", socket: "color" } },
     { from: { node: "principled_base", socket: "color" }, to: { node: "principled", socket: "base_color" } },
     { from: { node: "bump", socket: "vector" }, to: { node: "principled", socket: "normal" } },
-    { from: { node: "npr_emit", socket: "color" }, to: { node: "mix_shader_001", socket: "a" } },
+    { from: { node: "npr_emit", socket: "vector" }, to: { node: "mix_shader_001", socket: "a" } },
     { from: { node: "principled", socket: "color" }, to: { node: "mix_shader_001", socket: "b" } },
   ],
   output: { node: "mix_shader_001", socket: "color" },

package/src/graph/presets/cloth_smooth.ts

@@ -1,6 +1,6 @@
 // M_Smooth_Cloth as a ShaderGraph — port of shaders/materials/cloth_smooth.ts.
 // NPR toon + bevel + overlay-boosted emission (18.2×) mixed 10/90 against a plain
-// Principled BSDF. The Blender graph's dead bump subtree is omitted (as in the hand
+// Lit layer. The Blender graph's dead bump subtree is omitted (as in the hand
 // port). hue_sat nodes with hue=0.5 compile to the hue_sat_id specialization.
 
 import type { ShaderGraph } from "../schema"
@@ -18,7 +18,7 @@ export const CLOTH_SMOOTH_GRAPH: ShaderGraph = {
     { id: "mat_diffuse", type: "material_diffuse" },
     { id: "tex_base", type: "mix/multiply", inputs: { fac: 1.0 } },
     { id: "geo", type: "geometry" },
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "ramp_008", type: "ramp_cardinal", inputs: { pos0: 0.2466, pos1: 0.3466 } },
     { id: "mix04_fac", type: "math/multiply", inputs: { b: 0.5 } },
     { id: "dark_tex", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.19999998807907104, fac: 1.0 } },
@@ -28,14 +28,14 @@ export const CLOTH_SMOOTH_GRAPH: ShaderGraph = {
     { id: "mix_003", type: "mix/blend" },
     { id: "hue_004", type: "hue_sat", inputs: { hue: 0.5, saturation: 0.800000011920929, value: 2.0, fac: 1.0 } },
     { id: "npr_overlay", type: "mix/overlay", inputs: { fac: 1.0 } },
-    { id: "npr_emit", type: "emission", inputs: { strength: 18.200000762939453 } },
+    { id: "npr_emit", type: "vector_math/scale", inputs: { scale: 18.200000762939453 } },
     { id: "principled_base", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.800000011920929, fac: 1.0 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.8, roughness: 0.5, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.2929, specular: 0.8 },
     },
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.8999999761581421 } },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.8999999761581421 } },
   ],
   links: [
     { from: { node: "str", socket: "value" }, to: { node: "ramp_008", socket: "fac" } },
@@ -54,10 +54,10 @@ export const CLOTH_SMOOTH_GRAPH: ShaderGraph = {
     { from: { node: "mix_003", socket: "color" }, to: { node: "hue_004", socket: "color" } },
     { from: { node: "mix_003", socket: "color" }, to: { node: "npr_overlay", socket: "a" } },
     { from: { node: "hue_004", socket: "color" }, to: { node: "npr_overlay", socket: "b" } },
-    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "color" } },
+    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "a" } },
     { from: { node: "tex_base", socket: "color" }, to: { node: "principled_base", socket: "color" } },
     { from: { node: "principled_base", socket: "color" }, to: { node: "principled", socket: "base_color" } },
-    { from: { node: "npr_emit", socket: "color" }, to: { node: "mix_shader_001", socket: "a" } },
+    { from: { node: "npr_emit", socket: "vector" }, to: { node: "mix_shader_001", socket: "a" } },
     { from: { node: "principled", socket: "color" }, to: { node: "mix_shader_001", socket: "b" } },
   ],
   output: { node: "mix_shader_001", socket: "color" },

package/src/graph/presets/default.ts

@@ -1,7 +1,7 @@
 // Default material — the neutral base used two ways: the ungrouped fallback (a material
 // in no style group renders this) and the blank-canvas starter the editor's "New graph"
 // begins from, so the two always agree. MMD-correct PBSDF base: diffuse texture × the
-// PMX material diffuse color → Principled BSDF (Metallic 0, Specular 0.5, Roughness 0.5).
+// PMX material diffuse color → Lit (metallic 0, smoothness 0.29).
 // The material-color multiply is what keeps untextured/solid-color materials from
 // rendering white (they carry their color in material.diffuse, not a texture).
 
@@ -9,7 +9,7 @@ import type { ShaderGraph } from "../schema"
 
 export const DEFAULT_GRAPH: ShaderGraph = {
   version: 1,
-  name: "Principled BSDF",
+  name: "Lit",
   tags: ["default"],
   nodes: [
     { id: "tex", type: "texture" },
@@ -17,8 +17,8 @@ export const DEFAULT_GRAPH: ShaderGraph = {
     { id: "base", type: "mix/multiply", inputs: { fac: 1.0 } }, // texture × material diffuse
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.5, roughness: 0.5, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.2929 },
     },
   ],
   links: [

package/src/graph/presets/eye.ts

@@ -1,7 +1,7 @@
 // Eye as a ShaderGraph — port of shaders/materials/eye.ts. The published preset
 // author's instruction: "keep eyes in the default nodegraph, add emission 1.5".
-// So it's the default Principled BSDF plus an Emission of the diffuse texture at
-// 1.5× (Blender's Principled Emission socket, decomposed as a separate Emission +
+// So it's the default Lit plus an emission of the diffuse texture at
+// 1.5× (the emission, decomposed as a separate scale +
 // Add Shader — the emission feeds bloom pre-tonemap).
 //
 // The rear-view gate and the see-through stencil stamp are slot-owned (built-in eye
@@ -23,11 +23,11 @@ export const EYE_GRAPH: ShaderGraph = {
     { id: "tex_base", type: "mix/multiply", inputs: { fac: 1.0 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.5, roughness: 0.5, spec_clamp: 1e30, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.2929 },
     },
-    { id: "emission", type: "emission", inputs: { strength: 1.5 } },
-    { id: "add", type: "add_shader" },
+    { id: "emission", type: "vector_math/scale", inputs: { scale: 1.5 } },
+    { id: "add", type: "vector_math/add" },
     // The iris glow follows the key round her head: full (1.5) lit from the
     // front, easing to 0.2 of it lit from behind - a fixed 1.5 left the eyes
     // bright white in a backlit face. head_basis.forward · L, half-Lambert,
@@ -44,9 +44,9 @@ export const EYE_GRAPH: ShaderGraph = {
     { from: { node: "tex", socket: "color" }, to: { node: "tex_base", socket: "a" } },
     { from: { node: "mat_diffuse", socket: "color" }, to: { node: "tex_base", socket: "b" } },
     { from: { node: "tex_base", socket: "color" }, to: { node: "principled", socket: "base_color" } },
-    { from: { node: "tex_base", socket: "color" }, to: { node: "emission", socket: "color" } },
+    { from: { node: "tex_base", socket: "color" }, to: { node: "emission", socket: "a" } },
     { from: { node: "principled", socket: "color" }, to: { node: "add", socket: "a" } },
-    { from: { node: "emission", socket: "color" }, to: { node: "add", socket: "b" } },
+    { from: { node: "emission", socket: "vector" }, to: { node: "add", socket: "b" } },
     { from: { node: "eye_hb", socket: "forward" }, to: { node: "eye_fl", socket: "a" } },
     { from: { node: "eye_lt", socket: "direction" }, to: { node: "eye_fl", socket: "b" } },
     { from: { node: "eye_fl", socket: "value" }, to: { node: "eye_half", socket: "a" } },
@@ -54,7 +54,7 @@ export const EYE_GRAPH: ShaderGraph = {
     { from: { node: "eye_lt", socket: "shadow" }, to: { node: "eye_sh", socket: "b" } },
     { from: { node: "eye_sh", socket: "value" }, to: { node: "eye_lvl", socket: "value" } },
     { from: { node: "eye_lvl", socket: "value" }, to: { node: "eye_str", socket: "a" } },
-    { from: { node: "eye_str", socket: "value" }, to: { node: "emission", socket: "strength" } },
+    { from: { node: "eye_str", socket: "value" }, to: { node: "emission", socket: "scale" } },
   ],
-  output: { node: "add", socket: "color" },
+  output: { node: "add", socket: "vector" },
 }

package/src/graph/presets/face.ts

@@ -1,6 +1,6 @@
 // M_Face as a ShaderGraph — port of shaders/materials/face.ts (仿深空之眼 "M_Face").
 // Toon + warm rim + dual fresnel rim + BT.601 bright-tex gate, mixed 50/50 against a
-// Principled BSDF with noise bump. Structurally close to body, but: the toon uses the
+// a Lit layer with noise bump. Structurally close to body, but: the toon uses the
 // edge-AA ramp, hue tints are 0.46 (full hue_sat, not the 0.5 _id specialization),
 // rim2 is the hair-style fresnel×layer_weight_fresnel rim, and there's an extra
 // near-white texture gate that emits (freckle/highlight paint). Plain material — no
@@ -23,13 +23,13 @@ export const FACE_GRAPH: ShaderGraph = {
     { id: "geo", type: "geometry" },
 
     // ── toon shading ──
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "toon", type: "ramp_cardinal", inputs: { pos0: 0.2466, pos1: 0.3466 } },
     { id: "shadow_tint", type: "hue_sat", inputs: { hue: 0.46000000834465027, saturation: 2.0, value: 0.3499999940395355, fac: 1.0 } },
     { id: "lit_tint", type: "hue_sat", inputs: { hue: 0.46000000834465027, saturation: 1.600000023841858, value: 1.5, fac: 1.0 } },
     { id: "toon_color", type: "mix/blend" },
     { id: "bc", type: "bright_contrast", inputs: { bright: 0.1, contrast: 0.2 } },
-    { id: "emission3", type: "emission", inputs: { strength: 2.5 } },
+    { id: "emission3", type: "vector_math/scale", inputs: { scale: 2.5 } },
 
     // ── warm rim (toon*0.5+0.5 → cardinal ramp) ──
     { id: "warm_mul", type: "math/multiply", inputs: { b: 0.5 } },
@@ -45,29 +45,30 @@ export const FACE_GRAPH: ShaderGraph = {
         color1: [0.6677, 0.5024, 0.5126, 1.0],
       },
     },
-    { id: "warm_emit", type: "emission", inputs: { strength: 0.30000001192092896 } },
+    { id: "warm_emit", type: "vector_math/scale", inputs: { scale: 0.30000001192092896 } },
 
     // ── rim1: fresnel × facing ──
     { id: "rim1_fres", type: "fresnel", inputs: { ior: 2.0 } },
     { id: "rim1_lw", type: "layer_weight/facing", inputs: { blend: 0.24 } },
     { id: "rim1_str", type: "math/multiply" },
-    { id: "rim1", type: "emission", inputs: { color: [0.984157919883728, 0.6110184788703918, 0.5736401677131653] } },
+    { id: "rim1", type: "vector_math/scale" },
+    { id: "rim1_color", type: "rgb", inputs: { color: [0.984157919883728, 0.6110184788703918, 0.5736401677131653] } },
 
     // ── rim2: fresnel × fresnel-layer-weight, powered (hair-style) ──
     { id: "rim2_fres", type: "fresnel", inputs: { ior: 1.45 } },
     { id: "rim2_lw", type: "layer_weight/fresnel", inputs: { blend: 0.61 } },
     { id: "rim2_raw", type: "math/multiply" },
     { id: "rim2_pow", type: "math/power", inputs: { b: 0.6300000548362732 } },
-    { id: "rim2_mix", type: "mix_shader", inputs: { b: [1.0, 0.4684903025627136, 0.3698573112487793] } },
+    { id: "rim2_mix", type: "mix/blend", inputs: { b: [1.0, 0.4684903025627136, 0.3698573112487793] } },
 
     // ── near-white texture gate emission ──
     { id: "gate", type: "math/greater_than", inputs: { b: 0.9300000071525574 } },
     { id: "gate_scale", type: "math/multiply", inputs: { b: 3.0 } },
 
     // ── npr stack (rim1 + rim2 + bright_emit + warm) ──
-    { id: "npr_add1", type: "add_shader" },
-    { id: "npr_add2", type: "add_shader" },
-    { id: "npr_stack", type: "add_shader" },
+    { id: "npr_add1", type: "vector_math/add" },
+    { id: "npr_add2", type: "vector_math/add" },
+    { id: "npr_stack", type: "vector_math/add" },
 
     // ── principled with noise bump ──
     { id: "map", type: "mapping", inputs: { scl: [1.0, 1.0, 1.5] } },
@@ -75,15 +76,15 @@ export const FACE_GRAPH: ShaderGraph = {
     { id: "noise_ramp", type: "ramp_linear", inputs: { pos0: 0.0, pos1: 1.0 } },
     { id: "bump", type: "bump", inputs: { strength: 0.324644535779953 } },
     { id: "principled_base", type: "mix/blend", inputs: { b: [0.6832, 0.1947, 0.1373] } },
-    { id: "p_emit", type: "emission", inputs: { strength: 0.2 } },
+    { id: "p_emit", type: "vector_math/scale", inputs: { scale: 0.2 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 0.5, roughness: 0.3, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.4523 },
     },
-    { id: "p_sum", type: "add_shader" },
+    { id: "p_sum", type: "vector_math/add" },
 
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.5 } },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.5 } },
   ],
   links: [
     // toon
@@ -96,33 +97,34 @@ export const FACE_GRAPH: ShaderGraph = {
     { from: { node: "shadow_tint", socket: "color" }, to: { node: "toon_color", socket: "a" } },
     { from: { node: "lit_tint", socket: "color" }, to: { node: "toon_color", socket: "b" } },
     { from: { node: "toon_color", socket: "color" }, to: { node: "bc", socket: "color" } },
-    { from: { node: "bc", socket: "color" }, to: { node: "emission3", socket: "color" } },
+    { from: { node: "bc", socket: "color" }, to: { node: "emission3", socket: "a" } },
     // warm rim
     { from: { node: "toon", socket: "fac_out" }, to: { node: "warm_mul", socket: "a" } },
     { from: { node: "warm_mul", socket: "value" }, to: { node: "warm_add", socket: "a" } },
     { from: { node: "warm_add", socket: "value" }, to: { node: "warm_clamp", socket: "a" } },
     { from: { node: "warm_clamp", socket: "value" }, to: { node: "warm_ramp", socket: "fac" } },
-    { from: { node: "warm_ramp", socket: "color" }, to: { node: "warm_emit", socket: "color" } },
+    { from: { node: "warm_ramp", socket: "color" }, to: { node: "warm_emit", socket: "a" } },
     // rim1
     { from: { node: "rim1_fres", socket: "value" }, to: { node: "rim1_str", socket: "a" } },
     { from: { node: "rim1_lw", socket: "value" }, to: { node: "rim1_str", socket: "b" } },
-    { from: { node: "rim1_str", socket: "value" }, to: { node: "rim1", socket: "strength" } },
+    { from: { node: "rim1_str", socket: "value" }, to: { node: "rim1", socket: "scale" } },
     // rim2
     { from: { node: "rim2_fres", socket: "value" }, to: { node: "rim2_raw", socket: "a" } },
     { from: { node: "rim2_lw", socket: "value" }, to: { node: "rim2_raw", socket: "b" } },
     { from: { node: "rim2_raw", socket: "value" }, to: { node: "rim2_pow", socket: "a" } },
-    { from: { node: "emission3", socket: "color" }, to: { node: "rim2_mix", socket: "a" } },
+    { from: { node: "emission3", socket: "vector" }, to: { node: "rim2_mix", socket: "a" } },
     { from: { node: "rim2_pow", socket: "value" }, to: { node: "rim2_mix", socket: "fac" } },
     // gate
     { from: { node: "tex", socket: "color" }, to: { node: "gate", socket: "a" } },
     { from: { node: "gate", socket: "value" }, to: { node: "gate_scale", socket: "a" } },
     // npr stack
-    { from: { node: "rim1", socket: "color" }, to: { node: "npr_add1", socket: "a" } },
+    { from: { node: "rim1_color", socket: "color" }, to: { node: "rim1", socket: "a" } },
+    { from: { node: "rim1", socket: "vector" }, to: { node: "npr_add1", socket: "a" } },
     { from: { node: "rim2_mix", socket: "color" }, to: { node: "npr_add1", socket: "b" } },
-    { from: { node: "npr_add1", socket: "color" }, to: { node: "npr_add2", socket: "a" } },
+    { from: { node: "npr_add1", socket: "vector" }, to: { node: "npr_add2", socket: "a" } },
     { from: { node: "gate_scale", socket: "value" }, to: { node: "npr_add2", socket: "b" } },
-    { from: { node: "npr_add2", socket: "color" }, to: { node: "npr_stack", socket: "a" } },
-    { from: { node: "warm_emit", socket: "color" }, to: { node: "npr_stack", socket: "b" } },
+    { from: { node: "npr_add2", socket: "vector" }, to: { node: "npr_stack", socket: "a" } },
+    { from: { node: "warm_emit", socket: "vector" }, to: { node: "npr_stack", socket: "b" } },
     // principled + noise bump
     { from: { node: "geo", socket: "rest_pos" }, to: { node: "map", socket: "vector" } },
     { from: { node: "map", socket: "vector" }, to: { node: "noise", socket: "vector" } },
@@ -131,14 +133,14 @@ export const FACE_GRAPH: ShaderGraph = {
     { from: { node: "geo", socket: "normal" }, to: { node: "bump", socket: "normal" } },
     { from: { node: "noise_ramp", socket: "fac_out" }, to: { node: "principled_base", socket: "fac" } },
     { from: { node: "bc", socket: "color" }, to: { node: "principled_base", socket: "a" } },
-    { from: { node: "bc", socket: "color" }, to: { node: "p_emit", socket: "color" } },
+    { from: { node: "bc", socket: "color" }, to: { node: "p_emit", socket: "a" } },
     { from: { node: "principled_base", socket: "color" }, to: { node: "principled", socket: "base_color" } },
     { from: { node: "bump", socket: "vector" }, to: { node: "principled", socket: "normal" } },
     { from: { node: "principled", socket: "color" }, to: { node: "p_sum", socket: "a" } },
-    { from: { node: "p_emit", socket: "color" }, to: { node: "p_sum", socket: "b" } },
+    { from: { node: "p_emit", socket: "vector" }, to: { node: "p_sum", socket: "b" } },
     // final mix
-    { from: { node: "npr_stack", socket: "color" }, to: { node: "mix_shader_001", socket: "a" } },
-    { from: { node: "p_sum", socket: "color" }, to: { node: "mix_shader_001", socket: "b" } },
+    { from: { node: "npr_stack", socket: "vector" }, to: { node: "mix_shader_001", socket: "a" } },
+    { from: { node: "p_sum", socket: "vector" }, to: { node: "mix_shader_001", socket: "b" } },
   ],
   output: { node: "mix_shader_001", socket: "color" },
 }

package/src/graph/presets/hair.ts

@@ -4,7 +4,7 @@
 // (golden test #1 — see tests/graph.test.mjs).
 //
 // Inherited authoring decisions from the hand port: the noise→bump subtree on
-// Principled.Normal is omitted (imperceptible at 0.2 mix weight), and Blender's bevel
+// the Lit layer's normal is omitted (imperceptible at 0.2 mix weight), and Blender's bevel
 // node is approximated by saturate(normal.y) — Blender Z-up ⇒ engine Y-up.
 //
 // The object is pure JSON (no functions/undefined) — JSON.stringify round-trips it,
@@ -28,7 +28,7 @@ export const HAIR_GRAPH: ShaderGraph = {
     { id: "hs_shadow", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.2, value: 0.5, fac: 1.0 } },
     { id: "hs_002", type: "hue_sat", inputs: { hue: 0.48, saturation: 1.2, value: 0.7, fac: 1.0 } },
     { id: "hs_001", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.5, value: 1.0, fac: 1.0 } },
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "ramp_008", type: "ramp_cardinal", inputs: { pos0: 0.2466, color0: [0, 0, 0, 1], pos1: 0.3466, color1: [1, 1, 1, 1] } },
     { id: "mix_004", type: "mix/blend" },
     { id: "bc", type: "bright_contrast", inputs: { bright: 0.1, contrast: 0.2 } },
@@ -41,7 +41,7 @@ export const HAIR_GRAPH: ShaderGraph = {
     { id: "rim_pow", type: "math/power", inputs: { b: 0.6300000548362732 } },
     {
       id: "mix_shader_002",
-      type: "mix_shader",
+      type: "mix/blend",
       inputs: { b: [0.1673291176557541, 0.1673291176557541, 0.1673291176557541] },
     },
     { id: "gate", type: "math/greater_than", inputs: { b: 0.15000000596046448 } },
@@ -49,10 +49,10 @@ export const HAIR_GRAPH: ShaderGraph = {
     { id: "npr_add", type: "mix/add_emit" },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 0.0, specular_ior_level: 1.0, roughness: 0.3, spec_clamp: 10.0, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 0.0, smoothness: 0.4523, specular: 1.0 },
     },
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.2 } },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.2 } },
   ],
   links: [
     { from: { node: "tex", socket: "color" }, to: { node: "tex_base", socket: "a" } },

package/src/graph/presets/metal.ts

@@ -1,5 +1,5 @@
 // M_Metal as a ShaderGraph — port of shaders/materials/metal.ts.
-// Metallic Principled (Metallic=1, Specular=1, Roughness=0.3) with a
+// a metallic Lit (metallic 1, smoothness 0.45) with a
 // reflection-coord voronoi driving base color (metallic sparkle), plus an NPR
 // toon/overlay emission stack mixed at Fac=0.6967. The voronoi Color→ramp Fac
 // link goes through Blender's implicit BT.601 conversion (color_to_value).
@@ -20,14 +20,14 @@ export const METAL_GRAPH: ShaderGraph = {
     { id: "tex_base", type: "mix/multiply", inputs: { fac: 1.0 } },
     { id: "geo", type: "geometry" },
     { id: "tex_tint", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.800000011920929, fac: 1.0 } },
-    { id: "str", type: "shader_to_rgb_diffuse" },
+    { id: "str", type: "lambert" },
     { id: "ramp_008", type: "ramp_cardinal", inputs: { pos0: 0.2466, pos1: 0.3466 } },
     { id: "mix04_fac", type: "math/multiply", inputs: { b: 0.5 } },
     { id: "dark_tex", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 0.19999998807907104, fac: 1.0 } },
     { id: "mix_004", type: "mix/blend" },
     { id: "hue_004", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 2.0, fac: 1.0 } },
     { id: "npr_overlay", type: "mix/overlay", inputs: { fac: 1.0 } },
-    { id: "npr_emit", type: "emission", inputs: { strength: 8.100000381469727 } },
+    { id: "npr_emit", type: "vector_math/scale", inputs: { scale: 8.100000381469727 } },
     { id: "voro_cross", type: "vect_cross", inputs: { b: [0, 1, 0] } },
     { id: "voro", type: "tex_voronoi/color", inputs: { scale: 4.3 } },
     { id: "voro_ramp", type: "ramp_linear", inputs: { pos0: 0.0, pos1: 1.0 } },
@@ -35,10 +35,10 @@ export const METAL_GRAPH: ShaderGraph = {
     { id: "albedo", type: "mix/blend" },
     {
       id: "principled",
-      type: "principled",
-      inputs: { metallic: 1.0, specular_ior_level: 1.0, roughness: 0.3, spec_clamp: 1e30, sheen_weight: 0.0, sheen_tint: 0.0 },
+      type: "lit",
+      inputs: { metallic: 1.0, smoothness: 0.4523, specular: 1.0 },
     },
-    { id: "mix_shader_001", type: "mix_shader", inputs: { fac: 0.6967 } },
+    { id: "mix_shader_001", type: "mix/blend", inputs: { fac: 0.6967 } },
   ],
   links: [
     { from: { node: "tex", socket: "color" }, to: { node: "tex_base", socket: "a" } },
@@ -53,7 +53,7 @@ export const METAL_GRAPH: ShaderGraph = {
     { from: { node: "mix_004", socket: "color" }, to: { node: "hue_004", socket: "color" } },
     { from: { node: "mix_004", socket: "color" }, to: { node: "npr_overlay", socket: "a" } },
     { from: { node: "hue_004", socket: "color" }, to: { node: "npr_overlay", socket: "b" } },
-    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "color" } },
+    { from: { node: "npr_overlay", socket: "color" }, to: { node: "npr_emit", socket: "a" } },
     { from: { node: "geo", socket: "reflection" }, to: { node: "voro_cross", socket: "a" } },
     { from: { node: "voro_cross", socket: "vector" }, to: { node: "voro", socket: "vector" } },
     { from: { node: "voro", socket: "color" }, to: { node: "voro_ramp", socket: "fac" } },
@@ -62,7 +62,7 @@ export const METAL_GRAPH: ShaderGraph = {
     { from: { node: "voro_ramp", socket: "fac_out" }, to: { node: "albedo", socket: "a" } },
     { from: { node: "hue_006", socket: "color" }, to: { node: "albedo", socket: "b" } },
     { from: { node: "albedo", socket: "color" }, to: { node: "principled", socket: "base_color" } },
-    { from: { node: "npr_emit", socket: "color" }, to: { node: "mix_shader_001", socket: "a" } },
+    { from: { node: "npr_emit", socket: "vector" }, to: { node: "mix_shader_001", socket: "a" } },
     { from: { node: "principled", socket: "color" }, to: { node: "mix_shader_001", socket: "b" } },
   ],
   output: { node: "mix_shader_001", socket: "color" },

package/src/graph/presets/stockings.ts

@@ -1,6 +1,6 @@
 // M_Stockings as a ShaderGraph — port of shaders/materials/stockings.ts.
 // A bbox-gradient × facing-rim mask drives a Mix Shader between an HSV-boosted
-// emission (val 5×) and a sheen Principled. The hashed-alpha discard and the
+// emission (val 5×) and a Lit layer. The hashed-alpha discard and the
 // alpha=1 output are slot-owned (see STOCKINGS_TEMPLATE in slots.ts) — the graph
 // computes only the radiance. Blender's Generated coord is approximated with UV,
 // as in the hand port. The grayscale mask feeds Mix Shader Fac through Blender's
@@ -32,17 +32,10 @@ export const STOCKINGS_GRAPH: ShaderGraph = {
     { id: "emission_hs", type: "hue_sat", inputs: { hue: 0.5, saturation: 1.0, value: 5.0, fac: 1.0 } },
     {
       id: "principled",
-      type: "principled",
-      inputs: {
-        metallic: 0.1,
-        specular_ior_level: 1.0,
-        roughness: 0.5,
-        spec_clamp: 1e30,
-        sheen_weight: 0.7017999887466431,
-        sheen_tint: 0.5,
-      },
+      type: "lit",
+      inputs: { metallic: 0.1, smoothness: 0.2929, specular: 1.0 },
     },
-    { id: "mix_shader_001", type: "mix_shader" },
+    { id: "mix_shader_001", type: "mix/blend" },
   ],
   links: [
     { from: { node: "geo", socket: "uv" }, to: { node: "map", socket: "vector" } },