reze-engine 0.16.1 → 0.16.3

package/src/shaders/materials/hair.ts

@@ -1,82 +1,92 @@
-// 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 25% 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.25; }
-
-  var out: FSOut;
-  out.color = vec4f(final_color, outAlpha);
-  out.mask = vec4f(1.0, 1.0, 0.0, out.color.a);
-  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 25% 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;
+// EEVEE Light Clamp equivalent (same value as body/face/cloth_rough). Hair
+// is the firefly-prone material: physics-animated with the noisiest blended
+// normals, so grazing NV spikes the GGX term and flashes white through
+// bloom without this.
+const HAIR_SPEC_CLAMP: f32 = 10.0;
+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 tex_s = textureSample(diffuseTexture, diffuseSampler, input.uv);
+  // MMD alpha semantics: material alpha × texture alpha. Hair/lace/accessory
+  // textures cut their shapes in the alpha channel — ignoring it renders each
+  // card's full quad with the texture's padding color (white shimmer on dark
+  // hair for models whose textures pad with white).
+  let alpha = material.alpha * tex_s.a;
+  if (alpha < 0.001) { discard; }
+
+  let n = safe_normal(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 = tex_s.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, HAIR_SPEC_CLAMP, 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.25; }
+
+  var out: FSOut;
+  out.color = vec4f(final_color, outAlpha);
+  out.mask = vec4f(1.0, 1.0, 0.0, out.color.a);
+  return out;
+}
+
+`

package/src/shaders/materials/metal.ts

@@ -26,7 +26,7 @@ const METAL_MIX_SHADER_FAC: f32 = 0.6967;
 const METAL_VORONOI_SCALE: f32 = 4.3;
 
 @fragment fn fs(input: VertexOutput) -> FSOut {
-  let n = normalize(input.normal);
+  let n = safe_normal(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;

package/src/shaders/materials/stockings.ts

@@ -66,7 +66,7 @@ fn ramp_ease_s(f: f32, p0: f32, p1: f32) -> f32 {
 }
 
 @fragment fn fs(input: VertexOutput) -> FSOut {
-  let n = normalize(input.normal);
+  let n = safe_normal(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;

package/dist/gpu-profile.d.ts

@@ -1,19 +0,0 @@
-export declare class GpuTimestamp {
-    enabled: boolean;
-    readonly supported: boolean;
-    private device;
-    private querySet;
-    private resolveBuffer;
-    private readbackBuffer;
-    private nextSlot;
-    private frameLabels;
-    private inFlight;
-    private pendingLabels;
-    constructor(device: GPUDevice);
-    private ensureCreated;
-    beginFrame(): void;
-    wrap(desc: GPURenderPassDescriptor, label: string): GPURenderPassDescriptor;
-    endFrame(encoder: GPUCommandEncoder): void;
-    afterSubmit(): void;
-}
-//# sourceMappingURL=gpu-profile.d.ts.map

package/dist/gpu-profile.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gpu-profile.d.ts","sourceRoot":"","sources":["../src/gpu-profile.ts"],"names":[],"mappings":"AAoBA,qBAAa,YAAY;IACvB,OAAO,UAAQ;IACf,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAQ;IAKxB,OAAO,CAAC,aAAa,CAAwB;gBAEjC,MAAM,EAAE,SAAS;IAK7B,OAAO,CAAC,aAAa;IAiBrB,UAAU,IAAI,IAAI;IAWlB,IAAI,CAAC,IAAI,EAAE,uBAAuB,EAAE,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAqB3E,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAW1C,WAAW,IAAI,IAAI;CAwBpB"}

package/dist/gpu-profile.js

@@ -1,120 +0,0 @@
-// WebGPU timestamp-query profiling. Records pass durations into the same
-// profiler module as CPU phases (so the snapshot table mixes both with a
-// "gpu." prefix). Read-only — no effect on rendering output.
-//
-// Pattern (per spec):
-//   1. Each render pass declares timestampWrites { begin, end } slot indices.
-//   2. After all passes, encoder.resolveQuerySet writes uint64 ns timestamps
-//      into a QUERY_RESOLVE buffer.
-//   3. We copy the resolve buffer into a MAP_READ readback buffer.
-//   4. Submit. After the GPU finishes, mapAsync resolves; we read durations
-//      and record them.
-//
-// One readback buffer with an in-flight gate: if mapAsync hasn't resolved
-// from a previous frame, we skip the copy this frame (no contention, just
-// one frame of dropped sampling).
-import { profiler } from "./physics/profile";
-const MAX_PASSES_PER_FRAME = 64;
-export class GpuTimestamp {
-    constructor(device) {
-        this.enabled = false;
-        this.querySet = null;
-        this.resolveBuffer = null;
-        this.readbackBuffer = null;
-        this.nextSlot = 0;
-        this.frameLabels = [];
-        this.inFlight = false;
-        // Set inside endFrame() when a copy was queued this frame; consumed by
-        // afterSubmit() to kick mapAsync. mapAsync must run AFTER queue.submit —
-        // calling it before submit puts the buffer into "mapping pending" state,
-        // which makes the copy in the encoder illegal.
-        this.pendingLabels = null;
-        this.device = device;
-        this.supported = device.features.has("timestamp-query");
-    }
-    ensureCreated() {
-        if (this.querySet || !this.supported)
-            return;
-        const slots = MAX_PASSES_PER_FRAME * 2;
-        this.querySet = this.device.createQuerySet({ type: "timestamp", count: slots });
-        this.resolveBuffer = this.device.createBuffer({
-            label: "gpu-timestamp-resolve",
-            size: slots * 8,
-            usage: GPUBufferUsage.QUERY_RESOLVE | GPUBufferUsage.COPY_SRC,
-        });
-        this.readbackBuffer = this.device.createBuffer({
-            label: "gpu-timestamp-readback",
-            size: slots * 8,
-            usage: GPUBufferUsage.MAP_READ | GPUBufferUsage.COPY_DST,
-        });
-    }
-    // Called once at the top of each render() before any pass wrap.
-    beginFrame() {
-        if (!this.enabled || !this.supported)
-            return;
-        this.ensureCreated();
-        this.nextSlot = 0;
-        this.frameLabels = [];
-    }
-    // Wrap a render-pass descriptor with timestampWrites for `label`. If
-    // profiling is off / unsupported / out of slots, returns desc unchanged.
-    // The same label called multiple times (e.g. each bloom mip) is fine —
-    // the profiler accumulates by label.
-    wrap(desc, label) {
-        if (!this.enabled || !this.querySet)
-            return desc;
-        if (this.nextSlot + 2 > MAX_PASSES_PER_FRAME * 2)
-            return desc;
-        const begin = this.nextSlot;
-        const end = this.nextSlot + 1;
-        this.nextSlot += 2;
-        this.frameLabels.push(label);
-        return {
-            ...desc,
-            timestampWrites: {
-                querySet: this.querySet,
-                beginningOfPassWriteIndex: begin,
-                endOfPassWriteIndex: end,
-            },
-        };
-    }
-    // Call on the encoder after all passes, BEFORE encoder.finish(). Adds
-    // resolveQuerySet + copyBufferToBuffer commands. mapAsync is deferred to
-    // afterSubmit() — calling it before submit transitions the readback buffer
-    // into "mapping pending" state, which makes the queued copy illegal.
-    endFrame(encoder) {
-        if (!this.enabled || !this.querySet || this.frameLabels.length === 0)
-            return;
-        const count = this.frameLabels.length * 2;
-        encoder.resolveQuerySet(this.querySet, 0, count, this.resolveBuffer, 0);
-        if (this.inFlight)
-            return;
-        encoder.copyBufferToBuffer(this.resolveBuffer, 0, this.readbackBuffer, 0, count * 8);
-        this.pendingLabels = this.frameLabels.slice();
-    }
-    // Call AFTER device.queue.submit(). Kicks mapAsync if a copy was queued
-    // this frame; the .then() reads durations and unmaps.
-    afterSubmit() {
-        const labels = this.pendingLabels;
-        if (!labels)
-            return;
-        this.pendingLabels = null;
-        this.inFlight = true;
-        const readback = this.readbackBuffer;
-        void readback.mapAsync(GPUMapMode.READ).then(() => {
-            const arr = new BigInt64Array(readback.getMappedRange());
-            for (let i = 0; i < labels.length; i++) {
-                const start = arr[i * 2];
-                const end = arr[i * 2 + 1];
-                // Per spec, timestamps are nanoseconds.
-                const ms = Number(end - start) / 1e6;
-                if (ms >= 0 && ms < 1000)
-                    profiler.record("gpu." + labels[i], ms);
-            }
-            readback.unmap();
-            this.inFlight = false;
-        }, () => {
-            this.inFlight = false;
-        });
-    }
-}

package/dist/physics/profile.d.ts

@@ -1,18 +0,0 @@
-declare class PhysicsProfiler {
-    enabled: boolean;
-    private sums;
-    private counts;
-    begin(): number;
-    end(label: string, t0: number): void;
-    record(label: string, ms: number): void;
-    snapshot(): Record<string, {
-        avgMs: number;
-        calls: number;
-        totalMs: number;
-    }>;
-    reset(): void;
-}
-export declare const profiler: PhysicsProfiler;
-export type ProfileSnapshot = ReturnType<PhysicsProfiler["snapshot"]>;
-export {};
-//# sourceMappingURL=profile.d.ts.map

package/dist/physics/profile.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/physics/profile.ts"],"names":[],"mappings":"AAIA,cAAM,eAAe;IACnB,OAAO,UAAQ;IACf,OAAO,CAAC,IAAI,CAA8C;IAC1D,OAAO,CAAC,MAAM,CAA8C;IAE5D,KAAK,IAAI,MAAM;IAIf,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IASpC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAQvC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAU7E,KAAK,IAAI,IAAI;CAId;AAED,eAAO,MAAM,QAAQ,iBAAwB,CAAA;AAC7C,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAA"}

package/dist/physics/profile.js

@@ -1,44 +0,0 @@
-// Per-phase wall-clock accumulator. Off by default — when `enabled` is false,
-// begin()/end() short-circuit so production has zero overhead. Toggle via
-// `RezePhysics.setProfileEnabled(true)` and read with `getProfile()`.
-class PhysicsProfiler {
-    constructor() {
-        this.enabled = false;
-        this.sums = Object.create(null);
-        this.counts = Object.create(null);
-    }
-    begin() {
-        return this.enabled ? performance.now() : 0;
-    }
-    end(label, t0) {
-        if (!this.enabled)
-            return;
-        const dt = performance.now() - t0;
-        this.sums[label] = (this.sums[label] ?? 0) + dt;
-        this.counts[label] = (this.counts[label] ?? 0) + 1;
-    }
-    // Direct accumulator for durations not measured via begin()/end() — used by
-    // GPU timestamp readback, which arrives async after the frame has ended.
-    record(label, ms) {
-        if (!this.enabled)
-            return;
-        this.sums[label] = (this.sums[label] ?? 0) + ms;
-        this.counts[label] = (this.counts[label] ?? 0) + 1;
-    }
-    // Snapshot since last reset(). avgMs is per call; totalMs is the cumulative
-    // window cost — divide by elapsed wall time to get a "% of frame budget".
-    snapshot() {
-        const out = {};
-        for (const k in this.sums) {
-            const total = this.sums[k];
-            const calls = this.counts[k];
-            out[k] = { avgMs: calls > 0 ? total / calls : 0, calls, totalMs: total };
-        }
-        return out;
-    }
-    reset() {
-        this.sums = Object.create(null);
-        this.counts = Object.create(null);
-    }
-}
-export const profiler = new PhysicsProfiler();