reze-engine 0.57.5 → 0.58.0

package/dist/shaders/passes/particles.js

@@ -1,4 +1,5 @@
 import { castDistanceStub } from "./cast-distance";
+import { gridReadApi } from "./grid";
 import { RZ_LIGHT_STRUCT_WGSL } from "../lights";
 import { audioApi } from "../audio-api";
 import { lyricsApi } from "../lyrics-api";
@@ -91,12 +92,14 @@ fn rzProject(p: vec3f) -> vec3f {
 }
 fn rzCamPos() -> vec3f { return cam.camPos; }
 `;
-/** Does the source define the particle contract? All three are required together. */
+/** Does the source define the particle contract? All three are required
+ *  together; `cover` is optional and only means anything to a cutout. */
 export function particleEntryPoints(wgsl) {
     return {
         init: /\bfn\s+particleInit\s*\(/.test(wgsl),
         step: /\bfn\s+particleStep\s*\(/.test(wgsl),
         shade: /\bfn\s+particleShade\s*\(/.test(wgsl),
+        cover: /\bfn\s+particleCover\s*\(/.test(wgsl),
     };
 }
 /**
@@ -123,6 +126,11 @@ ${src.paramsDecl}
         audioApi(0, 4) +
         midiApi(0, 5) +
         lyricsApi(0, 6) +
+        // Always, even with no grid — then it samples a 1x1 of zeroes. Same reason
+        // composite compiles it unconditionally, plus one this module owns: an
+        // effect's whole file is spliced here, so a `gridStep` written for the grid
+        // pass has to RESOLVE here too, and the stubs that let it are in here.
+        gridReadApi(0, 8, 9, src.gridSize) +
         PRELUDE +
         // Stubbed: this module cannot read an attachment the scene pass writes — see
         // id-api.ts. The author's whole file compiles here, so the names must exist.
@@ -168,7 +176,13 @@ fn main(@builtin(global_invocation_id) gid: vec3u) {
  */
 export function buildParticleRenderShader(src, cast) {
     return (`override BLOOM: bool = ${src.bloom ? "true" : "false"};
-override ADDITIVE: bool = ${src.blend === "additive" ? "true" : "false"};\n` +
+override ADDITIVE: bool = ${src.blend === "additive" ? "true" : "false"};
+override CUTOUT: bool = ${src.blend === "cutout" ? "true" : "false"};
+// A cutout with a prepass: the depth is already written and this pass draws at
+// depthCompare equal, so it neither discards nor masks — the depth test IS the
+// coverage, per sample, and a shader with no discard keeps the hardware's
+// early rejection.
+override PREPASSED: bool = ${src.blend === "cutout" && src.cover ? "true" : "false"};\n` +
         PARTICLE_STRUCT_WGSL +
         CAMERA_STRUCT +
         PARTICLE_UNIFORMS +
@@ -183,6 +197,11 @@ ${src.paramsDecl}
         audioApi(0, 4) +
         midiApi(0, 5) +
         lyricsApi(0, 6) +
+        // Always, even with no grid — then it samples a 1x1 of zeroes. Same reason
+        // composite compiles it unconditionally, plus one this module owns: an
+        // effect's whole file is spliced here, so a `gridStep` written for the grid
+        // pass has to RESOLVE here too, and the stubs that let it are in here.
+        gridReadApi(0, 8, 9, src.gridSize) +
         PRELUDE +
         // Stubbed: this module cannot read an attachment the scene pass writes — see
         // id-api.ts. The author's whole file compiles here, so the names must exist.
@@ -239,6 +258,12 @@ fn vs(@builtin(vertex_index) vi: u32, @builtin(instance_index) ii: u32) -> VSOut
 
 struct FSOut {
   @location(0) color: vec4f,
+  // Which of the pixel's MSAA samples this fragment covers. Alpha-to-coverage
+  // by hand: the hardware kind reads alpha off the first colour target, and
+  // the HDR target is rg11b10, which has no alpha to read. Every particle
+  // writes it; a blended one writes all four, which is what not declaring it
+  // would have meant.
+  @builtin(sample_mask) samples: u32,
   // The scene's aux target: (bloom mask, coverage). Materials write it, so a
   // particle that skipped it would punch a hole in the mask of whatever it drew
   // over.
@@ -266,8 +291,25 @@ fn fs(in: VSOut) -> FSOut {
   c.a *= pu.weight;
   // Weight 0 therefore discards every fragment, so an effect faded out costs
   // nothing past the vertex stage even on the frame the draw is still issued.
-  if (c.a <= 0.0) { discard; }
+  // Not after a prepass: that pass already decided coverage into depth, and
+  // a discard here would cost this pass the early rejection it exists for.
+  if (!PREPASSED && c.a <= 0.0) { discard; }
   var out: FSOut;
+  out.samples = 0xFu;
+  if (PREPASSED) {
+    c.a = 1.0;
+  } else if (CUTOUT) {
+    // Alpha becomes coverage: 0..4 of the pixel's samples, and the fragment is
+    // then opaque wherever it lands. The pattern is turned by pixel position
+    // so a half-covered edge is not the same two samples on every pixel along
+    // it, which is what makes a2c edges look dithered rather than stepped.
+    let n = u32(clamp(c.a, 0.0, 1.0) * 4.0 + 0.5);
+    if (n == 0u) { discard; }
+    let low = (1u << n) - 1u;
+    let turn = (u32(in.clip.x) + u32(in.clip.y)) & 3u;
+    out.samples = ((low << turn) | (low >> (4u - turn))) & 0xFu;
+    c.a = 1.0;
+  }
   // PREMULTIPLIED: the scene's colour target blends with srcFactor \"one\", so a
   // straight-alpha fragment would come out over-bright wherever it is
   // translucent — which is most of a soft particle.
@@ -288,5 +330,29 @@ fn fs(in: VSOut) -> FSOut {
   out.mask = vec4f(mg.x, mg.y, 0.0, c.a);
 ${sceneIdPadWgsl("out")}  return out;
 }
-`);
+` +
+        (src.blend === "cutout" && src.cover
+            ? /* wgsl */ `
+/**
+ * The prepass: the shape to depth, nothing to colour. Every output is still
+ * declared — the pipeline takes the colour targets at writeMask 0 — and the
+ * sample mask is exactly what the single-pass cutout would have written, so
+ * the shading pass's equal test lands on the same samples.
+ */
+@fragment
+fn fsDepth(in: VSOut) -> FSOut {
+  let p = particles[in.id];
+  let a = particleCover(p, in.uv) * pu.weight;
+  let n = u32(clamp(a, 0.0, 1.0) * 4.0 + 0.5);
+  if (n == 0u) { discard; }
+  let low = (1u << n) - 1u;
+  let turn = (u32(in.clip.x) + u32(in.clip.y)) & 3u;
+  var out: FSOut;
+  out.samples = ((low << turn) | (low >> (4u - turn))) & 0xFu;
+  out.color = vec4f(0.0);
+  out.mask = vec4f(0.0);
+${sceneIdPadWgsl("out")}  return out;
+}
+`
+            : ""));
 }

package/dist/shaders/passes/trails.d.ts

@@ -11,6 +11,9 @@ type TrailSource = {
     /** Additive, like most glowing ribbons, or straight alpha. */
     blend: "alpha" | "additive";
     bloom: boolean;
+    /** The side of this effect's grid, or 0 when it declared none. See the note
+     *  on the same field in particles.ts: a ribbon reads the grid, never steps it. */
+    gridSize: number;
 };
 /**
  * Sub-segments drawn between each pair of recorded samples.

package/dist/shaders/passes/trails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trails.d.ts","sourceRoot":"","sources":["../../../src/shaders/passes/trails.ts"],"names":[],"mappings":"AA4BA,KAAK,WAAW,GAAG;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAA;IACb;oEACgE;IAChE,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAA;IAClB,8DAA8D;IAC9D,KAAK,EAAE,OAAO,GAAG,UAAU,CAAA;IAC3B,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,IAAI,CAAA;AAEnC,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAKjF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,EAAE,CAAA;IACf;;;;kFAI8E;IAC9E,SAAS,EAAE,OAAO,CAAA;CACnB,GACA,MAAM,CAyZR"}
+{"version":3,"file":"trails.d.ts","sourceRoot":"","sources":["../../../src/shaders/passes/trails.ts"],"names":[],"mappings":"AA6BA,KAAK,WAAW,GAAG;IACjB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAA;IACb;oEACgE;IAChE,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAA;IAClB,8DAA8D;IAC9D,KAAK,EAAE,OAAO,GAAG,UAAU,CAAA;IAC3B,KAAK,EAAE,OAAO,CAAA;IACd;sFACkF;IAClF,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,IAAI,CAAA;AAEnC,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAKjF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,EAAE,CAAA;IACf;;;;kFAI8E;IAC9E,SAAS,EAAE,OAAO,CAAA;CACnB,GACA,MAAM,CA6ZR"}

package/dist/shaders/passes/trails.js

@@ -1,4 +1,5 @@
 import { castDistanceStub } from "./cast-distance";
+import { gridReadApi } from "./grid";
 import { RZ_LIGHT_STRUCT_WGSL } from "../lights";
 import { audioApi } from "../audio-api";
 import { lyricsApi } from "../lyrics-api";
@@ -240,6 +241,10 @@ fn rzTurnRadius(a: vec3f, b: vec3f, c: vec3f) -> f32 {
         audioApi(0, 4) +
         midiApi(0, 5) +
         lyricsApi(0, 6) +
+        // Always, with or without a grid — and required either way, because an
+        // effect's whole file is spliced here and a `gridStep` written for the grid
+        // pass has to resolve in this module too.
+        gridReadApi(0, 8, 9, src.gridSize) +
         // Stubbed: this module cannot read an attachment the scene pass writes — see
         // id-api.ts. The author's whole file compiles here, so the names must exist.
         idApi(false, 0, 0) + castDistanceStub() +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reze-engine",
-  "version": "0.57.5",
+  "version": "0.58.0",
   "description": "A lightweight WebGPU engine for real-time 3D MMD/PMX model rendering",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",