@meimu/mutracer 0.1.2 → 0.1.4

package/lib/renderer/wgsl/compose.frag.wgsl.js

@@ -1,5 +1,5 @@
 export const linearToSrgbDefine = /* wgsl */ `
-fn fJ(color: vec3f) -> vec3f {
+fn fM(color: vec3f) -> vec3f {
 let linear = max(color, vec3f(0.0));
 let low = linear * 12.92;
 let high = 1.055 * pow(linear, vec3f(1.0 / 2.4)) - 0.055;
@@ -8,90 +8,90 @@ return select(high, low, linear <= vec3f(0.0031308));
 `;
 export const composeDefine = /* wgsl */ `
 
-fn jL(color: vec3f) -> vec3f {
+fn jU(color: vec3f) -> vec3f {
 return clamp(color, vec3f(0.0), vec3f(1.0));
 }
-fn iJ(color: vec3f) -> vec3f {
+fn iP(color: vec3f) -> vec3f {
 return clamp(color / (vec3f(1.0) + color), vec3f(0.0), vec3f(1.0));
 }
-fn jC(jk: vec3f) -> vec3f {
-let color = max(vec3f(0.0), jk - 0.004);
+fn jJ(jr: vec3f) -> vec3f {
+let color = max(vec3f(0.0), jr - 0.004);
 return pow((color * (6.2 * color + 0.5)) /
 (color * (6.2 * color + 1.7) + 0.06), vec3f(2.2));
 }
-fn ox(value: vec3f) -> vec3f {
-let kC = value * (value + 0.0245786) - 0.000090537;
+fn oJ(value: vec3f) -> vec3f {
+let kO = value * (value + 0.0245786) - 0.000090537;
 let ap = value * (0.983729 * value + 0.4329510) + 0.238081;
-return kC / ap;
+return kO / ap;
 }
-fn lh(jk: vec3f) -> vec3f {
-let pj = mat3x3f(
+fn lv(jr: vec3f) -> vec3f {
+let pw = mat3x3f(
 vec3f(0.59719, 0.07600, 0.02840),
 vec3f(0.35458, 0.90834, 0.13383),
 vec3f(0.04823, 0.01566, 0.83777)
 );
-let os = mat3x3f(
+let oE = mat3x3f(
 vec3f(1.60475, -0.10208, -0.00327),
 vec3f(-0.53108, 1.10813, -0.07276),
 vec3f(-0.07367, -0.00605, 1.07602)
 );
-let color = pj * (jk / 0.6);
-return clamp(os * ox(color), vec3f(0.0), vec3f(1.0));
-}
-fn fP(value: vec3f) -> vec3f {
-let mB = value * value;
-let qy = mB * mB;
-return 15.5 * qy * mB - 40.14 * qy * value
-+ 31.96 * qy - 6.868 * mB * value
-+ 0.4298 * mB + 0.1191 * value - 0.00232;
-}
-fn lP(jk: vec3f) -> vec3f {
-let mD = mat3x3f(
+let color = pw * (jr / 0.6);
+return clamp(oE * oJ(color), vec3f(0.0), vec3f(1.0));
+}
+fn fT(value: vec3f) -> vec3f {
+let mO = value * value;
+let qK = mO * mO;
+return 15.5 * qK * mO - 40.14 * qK * value
++ 31.96 * qK - 6.868 * mO * value
++ 0.4298 * mO + 0.1191 * value - 0.00232;
+}
+fn me(jr: vec3f) -> vec3f {
+let mR = mat3x3f(
 vec3f(1.6605, -0.1246, -0.0182),
 vec3f(-0.5876, 1.1329, -0.1006),
 vec3f(-0.0728, -0.0083, 1.1187)
 );
-let mE = mat3x3f(
+let mS = mat3x3f(
 vec3f(0.6274, 0.0691, 0.0164),
 vec3f(0.3293, 0.9195, 0.0880),
 vec3f(0.0433, 0.0113, 0.8956)
 );
-let pl = mat3x3f(
+let pH = mat3x3f(
 vec3f(0.856627153315983, 0.137318972929847, 0.11189821299995),
 vec3f(0.0951212405381588, 0.761241990602591, 0.0767994186031903),
 vec3f(0.0482516061458583, 0.101439036467562, 0.811302368396859)
 );
-let ot = mat3x3f(
+let oF = mat3x3f(
 vec3f(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),
 vec3f(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),
 vec3f(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405)
 );
-var color = pl * (mE * jk);
+var color = pH * (mS * jr);
 color = clamp((log2(max(color, vec3f(1e-10))) + 12.47393) / 16.5, vec3f(0.0), vec3f(1.0));
-color = ot * fP(color);
+color = oF * fT(color);
 color = pow(max(color, vec3f(0.0)), vec3f(2.2));
-return clamp(mD * color, vec3f(0.0), vec3f(1.0));
+return clamp(mR * color, vec3f(0.0), vec3f(1.0));
 }
-fn cH(color: vec3f) -> vec3f {
+fn cl(color: vec3f) -> vec3f {
 let toneMappingMode = i32(toneMappingParams.x);
-if (toneMappingMode == 1) { return lh(color); }
-if (toneMappingMode == 2) { return jC(color); }
-if (toneMappingMode == 3) { return iJ(color); }
-if (toneMappingMode == 4) { return jL(color); }
-return lP(color);
+if (toneMappingMode == 1) { return lv(color); }
+if (toneMappingMode == 2) { return jJ(color); }
+if (toneMappingMode == 3) { return iP(color); }
+if (toneMappingMode == 4) { return jU(color); }
+return me(color);
 }
 ${linearToSrgbDefine}
-fn gS(jk: vec3f) -> vec3f {
+fn gb(jr: vec3f) -> vec3f {
 let contrast = colorGradingParams.x;
 let saturation = colorGradingParams.y;
 let temperature = colorGradingParams.z;
 let tint = colorGradingParams.w;
-let sW = vec3f(
+let tj = vec3f(
 1.0 + temperature * 0.16 + tint * 0.04,
 1.0 - tint * 0.12,
 1.0 - temperature * 0.16 + tint * 0.04
 );
-var color = max(jk * sW, vec3f(0.0));
+var color = max(jr * tj, vec3f(0.0));
 color = max((color - 0.18) * contrast + 0.18, vec3f(0.0));
 let luminance = dot(color, vec3f(0.2126, 0.7152, 0.0722));
 return max(mix(vec3f(luminance), color, saturation), vec3f(0.0));
@@ -100,91 +100,97 @@ return max(mix(vec3f(luminance), color, saturation), vec3f(0.0));
 export const composeMain = /* wgsl */ `
 
 var dY = load_colorTex(uv, 0);
-var jf = vec4(0.0);
+var jl = vec4(0.0);
 if (bloomIntensity > 0.0) {
-jf = load_bloomTex(uv, 0) * bloomIntensity;
-dY = vec4f(dY.rgb + jf.rgb, dY.a);
+jl = load_bloomTex(uv, 0) * bloomIntensity;
+dY = vec4f(dY.rgb + jl.rgb, dY.a);
 }
 
-var kX = gS(dY.rgb * exposure);
-let kj = smoothstep(0.2, 0.72, distance(vec2f(uv) / vec2f(colorTexRegion()), vec2f(0.5)));
-kX *= 1.0 - toneMappingParams.y * kj;
-let hx = hdrOutputEnabled > 0.5;
-if (!hx) {
-kX = cH(kX);
-}
-let lX = select(
-pow(max(kX, vec3f(0.0)), vec3f(1.0 / 2.2)),
-fJ(kX),
-hx
+var ll = gb(dY.rgb * exposure);
+let iI = smoothstep(0.2, 0.72, distance(vec2f(uv) / vec2f(colorTexRegion()), vec2f(0.5)));
+ll *= 1.0 - toneMappingParams.y * iI;
+let gA = hdrOutputEnabled > 0.5;
+if (!gA) {
+ll = cl(ll);
+}
+let mn = select(
+pow(max(ll, vec3f(0.0)), vec3f(1.0 / 2.2)),
+fM(ll),
+gA
 );
-var nO = lX;
+var oc = mn;
 if (flatBackgroundColor.a > 0.5) {
-let ja = clamp(
+let jg = clamp(
 load_flatBackgroundMaskTex(uv, 0).a,
 0.0,
 1.0
 );
-let oO = fJ(max(flatBackgroundColor.rgb, vec3f(0.0)));
-nO = mix(oO, lX, ja);
+let pb = fM(max(flatBackgroundColor.rgb, vec3f(0.0)));
+oc = mix(pb, mn, jg);
 if (bloomIntensity > 0.0) {
-var il = gS(
-max(dY.rgb - jf.rgb, vec3f(0.0))
+var ir = gb(
+max(dY.rgb - jl.rgb, vec3f(0.0))
 * exposure
 );
-il *= 1.0 - toneMappingParams.y * kj;
-if (!hx) {
-il = cH(il);
-}
-let rp = select(
-pow(max(il, vec3f(0.0)), vec3f(1.0 / 2.2)),
-fJ(il),
-hx
+ir *= 1.0 - toneMappingParams.y * iI;
+if (!gA) {
+ir = cl(ir);
+}
+let rF = select(
+pow(max(ir, vec3f(0.0)), vec3f(1.0 / 2.2)),
+fM(ir),
+gA
 );
-nO += max(lX - rp, vec3f(0.0))
-* (1.0 - ja);
+oc += max(mn - rF, vec3f(0.0))
+* (1.0 - jg);
 }
 }
-dY = vec4f(nO, dY.a);
+dY = vec4f(oc, dY.a);
 if (bloomIntensity > 0.0) {
-dY.a = max(dY.a, min(dot(jf.rgb, vec3f(0.2125, 0.7154, 0.0721)), 1.0));
+dY.a = max(dY.a, min(dot(jl.rgb, vec3f(0.2125, 0.7154, 0.0721)), 1.0));
 }
 
 if (shadowCatcherEnabled > 0.5) {
 let shadowCatcher = load_shadowCatcherTex(uv, 0);
 let coverage = clamp(shadowCatcher.r, 0.0, 1.0);
 let opacity = max(clamp(shadowCatcher.a / max(coverage, 0.000001), 0.0, 1.0) - (1.0 - shadowCatcherAlpha), 0.0);
-if (coverage > 0.0) {
+if (coverage > 0.0 || flatBackgroundColor.a > 0.5) {
 let foreground = load_foregroundTex(uv, 0);
 let background = load_catcherBackgroundTex(uv, 0);
-var bK = gS((foreground.rgb + jf.rgb) * exposure);
-var backgroundColor = gS((background.rgb / max(background.a, 0.000001) + jf.rgb) * exposure);
-bK *= 1.0 - toneMappingParams.y * kj;
-backgroundColor *= 1.0 - toneMappingParams.y * kj;
-if (!hx) {
-bK = cH(bK);
-backgroundColor = cH(backgroundColor);
-}
-bK = select(pow(max(bK, vec3f(0.0)), vec3f(1.0 / 2.2)), fJ(bK), hx);
-backgroundColor = select(pow(max(backgroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), fJ(backgroundColor), hx);
+
+
+
+
+let kH = select(0.0, clamp(background.a - coverage, 0.0, 1.0 - coverage), flatBackgroundColor.a > 0.5);
+var bK = gb((foreground.rgb + jl.rgb) * exposure);
+var backgroundColor = gb((background.rgb / max(background.a, 0.000001) + jl.rgb) * exposure);
+bK *= 1.0 - toneMappingParams.y * iI;
+backgroundColor *= 1.0 - toneMappingParams.y * iI;
+if (!gA) {
+bK = cl(bK);
+backgroundColor = cl(backgroundColor);
+}
+bK = select(pow(max(bK, vec3f(0.0)), vec3f(1.0 / 2.2)), fM(bK), gA);
+backgroundColor = select(pow(max(backgroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), fM(backgroundColor), gA);
 if (flatBackgroundColor.a > 0.5) {
-var eM = gS(background.rgb / max(background.a, 0.000001) * exposure);
-eM *= 1.0 - toneMappingParams.y * kj;
-if (!hx) { eM = cH(eM); }
-let lY = select(pow(max(eM, vec3f(0.0)), vec3f(1.0 / 2.2)), fJ(eM), hx);
-let tY = select(vec3f(0.0), max(backgroundColor - lY, vec3f(0.0)), bloomIntensity > 0.0);
-backgroundColor = fJ(max(flatBackgroundColor.rgb, vec3f(0.0))) + tY;
-}
-
-
-let fO = coverage * opacity;
-let lR = clamp(dot(jf.rgb, vec3f(0.2125, 0.7154, 0.0721)), 0.0, 1.0);
-let hr = max(foreground.a, lR * (1.0 - coverage));
-let hg = max(background.a, lR * coverage);
-let alpha = hr + hg * (1.0 - opacity) + fO;
-let premultiplied = bK * hr
-+ backgroundColor * hg * (1.0 - opacity)
-+ shadowCatcherColor * fO;
+var eP = gb(background.rgb / max(background.a, 0.000001) * exposure);
+eP *= 1.0 - toneMappingParams.y * iI;
+if (!gA) { eP = cl(eP); }
+let mo = select(pow(max(eP, vec3f(0.0)), vec3f(1.0 / 2.2)), fM(eP), gA);
+let uk = select(vec3f(0.0), max(backgroundColor - mo, vec3f(0.0)), bloomIntensity > 0.0);
+backgroundColor = fM(max(flatBackgroundColor.rgb, vec3f(0.0))) + uk;
+}
+
+
+let fR = coverage * opacity;
+let mg = clamp(dot(jl.rgb, vec3f(0.2125, 0.7154, 0.0721)), 0.0, 1.0);
+let hv = max(foreground.a, mg * (1.0 - coverage - kH));
+let jd = max(background.a, mg * coverage);
+let ku = (jd - kH) * (1.0 - opacity) + kH;
+let alpha = hv + ku + fR;
+let premultiplied = bK * hv
++ backgroundColor * ku
++ shadowCatcherColor * fR;
 dY = vec4f(premultiplied / max(alpha, 0.000001), alpha);
 }
 }
@@ -197,13 +203,35 @@ output.color = dY;
 // linear-light image. Alpha is deliberately not used as a second color layer.
 export const compositeDenoiseOutputMain = /* wgsl */ `
 let encoded = max(dY.rgb, vec3f(0.0));
-let sK = select(
+let sW = select(
 pow(encoded, vec3f(2.2)),
 select(pow((encoded + 0.055) / 1.055, vec3f(2.4)), encoded / 12.92,
 encoded <= vec3f(0.04045)),
-hx
+gA
 );
-output.denoiseColor = vec4f(sK, dY.a);
+output.denoiseColor = vec4f(sW, dY.a);
+
+
+
+
+
+let rawAlbedo = load_flatBackgroundMaskTex(uv, 0);
+var oW = rawAlbedo.rgb;
+if (shadowCatcherEnabled > 0.5 && flatBackgroundColor.a < 0.5) {
+let coverage = clamp(load_shadowCatcherTex(uv, 0).r, 0.0, 1.0);
+let background = load_catcherBackgroundTex(uv, 0);
+if (coverage > 0.0 && background.a > 0.0) {
+var iv = gb(background.rgb / background.a * exposure);
+iv *= 1.0 - toneMappingParams.y * iI;
+if (!gA) { iv = cl(iv); }
+
+
+
+let rs = clamp(background.a, 0.0, coverage);
+oW += rs * (clamp(iv, vec3f(0.0), vec3f(1.0)) - vec3f(1.0));
+}
+}
+output.denoiseAlbedo = vec4f(clamp(oW, vec3f(0.0), vec3f(1.0)), rawAlbedo.a);
 `;
 export const compositeDenoiseDisplayMain = /* wgsl */ `
 let denoised = load_colorTex(uv, 0);
@@ -212,7 +240,7 @@ let denoised = load_colorTex(uv, 0);
 
 let alpha = select(load_composedTex(uv, 0).a, clamp(denoised.a, 0.0, 1.0), denoisedAlpha > 0.5);
 let linear = max(denoised.rgb, vec3f(0.0));
-let encoded = select(pow(linear, vec3f(1.0 / 2.2)), fJ(linear), hdrOutputEnabled > 0.5);
+let encoded = select(pow(linear, vec3f(1.0 / 2.2)), fM(linear), hdrOutputEnabled > 0.5);
 output.color = vec4f(select(vec3f(0.0), encoded, alpha > 0.0), alpha);
 `;
 //# sourceMappingURL=compose.frag.wgsl.js.map

package/lib/renderer/wgsl/compose.frag.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"compose.frag.wgsl.js","sourceRoot":"","sources":["../../../src/renderer/wgsl/compose.frag.wgsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;;;;;;;CAO5C,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0EtC,kBAAkB;;;;;;;;;;;;;;;;CAgBnB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+FrC,CAAC;AAEF,6EAA6E;AAC7E,8EAA8E;AAC9E,MAAM,CAAC,MAAM,0BAA0B,GAAG,UAAU,CAAC;;;;;;;;;CASpD,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAC;;;;;;;;;CASrD,CAAC","sourcesContent":["export const linearToSrgbDefine = /* wgsl */ `\nfn linearToSrgb(color: vec3f) -> vec3f {\n  let linear = max(color, vec3f(0.0));\n  let low = linear * 12.92;\n  let high = 1.055 * pow(linear, vec3f(1.0 / 2.4)) - 0.055;\n  return select(high, low, linear <= vec3f(0.0031308));\n}\n`;\n\nexport const composeDefine = /* wgsl */ `\n\nfn linearToneMapping(color: vec3f) -> vec3f {\n  return clamp(color, vec3f(0.0), vec3f(1.0));\n}\nfn reinhardToneMapping(color: vec3f) -> vec3f {\n  return clamp(color / (vec3f(1.0) + color), vec3f(0.0), vec3f(1.0));\n}\nfn cineonToneMapping(inputColor: vec3f) -> vec3f {\n  let color = max(vec3f(0.0), inputColor - 0.004);\n  return pow((color * (6.2 * color + 0.5)) /\n    (color * (6.2 * color + 1.7) + 0.06), vec3f(2.2));\n}\nfn rrtAndOdtFit(value: vec3f) -> vec3f {\n  let numerator = value * (value + 0.0245786) - 0.000090537;\n  let denominator = value * (0.983729 * value + 0.4329510) + 0.238081;\n  return numerator / denominator;\n}\nfn acesToneMapping(inputColor: vec3f) -> vec3f {\n  let inputMatrix = mat3x3f(\n    vec3f(0.59719, 0.07600, 0.02840),\n    vec3f(0.35458, 0.90834, 0.13383),\n    vec3f(0.04823, 0.01566, 0.83777)\n  );\n  let outputMatrix = mat3x3f(\n    vec3f(1.60475, -0.10208, -0.00327),\n    vec3f(-0.53108, 1.10813, -0.07276),\n    vec3f(-0.07367, -0.00605, 1.07602)\n  );\n  let color = inputMatrix * (inputColor / 0.6);\n  return clamp(outputMatrix * rrtAndOdtFit(color), vec3f(0.0), vec3f(1.0));\n}\nfn agxDefaultContrastApprox(value: vec3f) -> vec3f {\n  let value2 = value * value;\n  let value4 = value2 * value2;\n  return 15.5 * value4 * value2 - 40.14 * value4 * value\n    + 31.96 * value4 - 6.868 * value2 * value\n    + 0.4298 * value2 + 0.1191 * value - 0.00232;\n}\nfn agxToneMapping(inputColor: vec3f) -> vec3f {\n  let linearRec2020ToLinearSrgb = mat3x3f(\n    vec3f(1.6605, -0.1246, -0.0182),\n    vec3f(-0.5876, 1.1329, -0.1006),\n    vec3f(-0.0728, -0.0083, 1.1187)\n  );\n  let linearSrgbToLinearRec2020 = mat3x3f(\n    vec3f(0.6274, 0.0691, 0.0164),\n    vec3f(0.3293, 0.9195, 0.0880),\n    vec3f(0.0433, 0.0113, 0.8956)\n  );\n  let insetMatrix = mat3x3f(\n    vec3f(0.856627153315983, 0.137318972929847, 0.11189821299995),\n    vec3f(0.0951212405381588, 0.761241990602591, 0.0767994186031903),\n    vec3f(0.0482516061458583, 0.101439036467562, 0.811302368396859)\n  );\n  let outsetMatrix = mat3x3f(\n    vec3f(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),\n    vec3f(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),\n    vec3f(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405)\n  );\n  var color = insetMatrix * (linearSrgbToLinearRec2020 * inputColor);\n  color = clamp((log2(max(color, vec3f(1e-10))) + 12.47393) / 16.5, vec3f(0.0), vec3f(1.0));\n  color = outsetMatrix * agxDefaultContrastApprox(color);\n  color = pow(max(color, vec3f(0.0)), vec3f(2.2));\n  return clamp(linearRec2020ToLinearSrgb * color, vec3f(0.0), vec3f(1.0));\n}\nfn applyToneMapping(color: vec3f) -> vec3f {\n  let toneMappingMode = i32(toneMappingParams.x);\n  if (toneMappingMode == 1) { return acesToneMapping(color); }\n  if (toneMappingMode == 2) { return cineonToneMapping(color); }\n  if (toneMappingMode == 3) { return reinhardToneMapping(color); }\n  if (toneMappingMode == 4) { return linearToneMapping(color); }\n  return agxToneMapping(color);\n}\n${linearToSrgbDefine}\nfn gradeColor(inputColor: vec3f) -> vec3f {\n  let contrast = colorGradingParams.x;\n  let saturation = colorGradingParams.y;\n  let temperature = colorGradingParams.z;\n  let tint = colorGradingParams.w;\n  let balance = vec3f(\n    1.0 + temperature * 0.16 + tint * 0.04,\n    1.0 - tint * 0.12,\n    1.0 - temperature * 0.16 + tint * 0.04\n  );\n  var color = max(inputColor * balance, vec3f(0.0));\n  color = max((color - 0.18) * contrast + 0.18, vec3f(0.0));\n  let luminance = dot(color, vec3f(0.2126, 0.7152, 0.0722));\n  return max(mix(vec3f(luminance), color, saturation), vec3f(0.0));\n}\n`;\n\nexport const composeMain = /* wgsl */ `\n\nvar finalColor = load_colorTex(uv, 0);\nvar bloomTexel = vec4(0.0);\nif (bloomIntensity > 0.0) {\n  bloomTexel = load_bloomTex(uv, 0) * bloomIntensity;\n  finalColor = vec4f(finalColor.rgb + bloomTexel.rgb, finalColor.a);\n}\n\nvar gradedColor = gradeColor(finalColor.rgb * exposure);\nlet vignetteEdge = smoothstep(0.2, 0.72, distance(vec2f(uv) / vec2f(colorTexRegion()), vec2f(0.5)));\ngradedColor *= 1.0 - toneMappingParams.y * vignetteEdge;\nlet hdrOutput = hdrOutputEnabled > 0.5;\nif (!hdrOutput) {\n  gradedColor = applyToneMapping(gradedColor);\n}\nlet encodedDisplay = select(\n  pow(max(gradedColor, vec3f(0.0)), vec3f(1.0 / 2.2)),\n  linearToSrgb(gradedColor),\n  hdrOutput\n);\nvar displayColor = encodedDisplay;\nif (flatBackgroundColor.a > 0.5) {\n  let surfaceCoverage = clamp(\n    load_flatBackgroundMaskTex(uv, 0).a,\n    0.0,\n    1.0\n  );\n  let flatBackgroundDisplay = linearToSrgb(max(flatBackgroundColor.rgb, vec3f(0.0)));\n  displayColor = mix(flatBackgroundDisplay, encodedDisplay, surfaceCoverage);\n  if (bloomIntensity > 0.0) {\n    var unbloomedColor = gradeColor(\n      max(finalColor.rgb - bloomTexel.rgb, vec3f(0.0))\n        * exposure\n    );\n    unbloomedColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    if (!hdrOutput) {\n      unbloomedColor = applyToneMapping(unbloomedColor);\n    }\n    let encodedUnbloomed = select(\n      pow(max(unbloomedColor, vec3f(0.0)), vec3f(1.0 / 2.2)),\n      linearToSrgb(unbloomedColor),\n      hdrOutput\n    );\n    displayColor += max(encodedDisplay - encodedUnbloomed, vec3f(0.0))\n      * (1.0 - surfaceCoverage);\n  }\n}\nfinalColor = vec4f(displayColor, finalColor.a);\nif (bloomIntensity > 0.0) {\n  finalColor.a = max(finalColor.a, min(dot(bloomTexel.rgb, vec3f(0.2125, 0.7154, 0.0721)), 1.0));\n}\n\nif (shadowCatcherEnabled > 0.5) {\n  let shadowCatcher = load_shadowCatcherTex(uv, 0);\n  let coverage = clamp(shadowCatcher.r, 0.0, 1.0);\n  let opacity = max(clamp(shadowCatcher.a / max(coverage, 0.000001), 0.0, 1.0) - (1.0 - shadowCatcherAlpha), 0.0);\n  if (coverage > 0.0) {\n    let foreground = load_foregroundTex(uv, 0);\n    let background = load_catcherBackgroundTex(uv, 0);\n    var foregroundColor = gradeColor((foreground.rgb + bloomTexel.rgb) * exposure);\n    var backgroundColor = gradeColor((background.rgb / max(background.a, 0.000001) + bloomTexel.rgb) * exposure);\n    foregroundColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    backgroundColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    if (!hdrOutput) {\n      foregroundColor = applyToneMapping(foregroundColor);\n      backgroundColor = applyToneMapping(backgroundColor);\n    }\n    foregroundColor = select(pow(max(foregroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(foregroundColor), hdrOutput);\n    backgroundColor = select(pow(max(backgroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(backgroundColor), hdrOutput);\n    if (flatBackgroundColor.a > 0.5) {\n      var unbloomedBackground = gradeColor(background.rgb / max(background.a, 0.000001) * exposure);\n      unbloomedBackground *= 1.0 - toneMappingParams.y * vignetteEdge;\n      if (!hdrOutput) { unbloomedBackground = applyToneMapping(unbloomedBackground); }\n      let encodedUnbloomedBackground = select(pow(max(unbloomedBackground, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(unbloomedBackground), hdrOutput);\n      let bloomSpill = select(vec3f(0.0), max(backgroundColor - encodedUnbloomedBackground, vec3f(0.0)), bloomIntensity > 0.0);\n      backgroundColor = linearToSrgb(max(flatBackgroundColor.rgb, vec3f(0.0))) + bloomSpill;\n    }\n    // Foreground and catcher are disjoint primary samples, not overlapping\n    // alpha layers. Shadow only the catcher background before averaging.\n    let shadowAlpha = coverage * opacity;\n    let bloomAlpha = clamp(dot(bloomTexel.rgb, vec3f(0.2125, 0.7154, 0.0721)), 0.0, 1.0);\n    let foregroundAlpha = max(foreground.a, bloomAlpha * (1.0 - coverage));\n    let backgroundAlpha = max(background.a, bloomAlpha * coverage);\n    let alpha = foregroundAlpha + backgroundAlpha * (1.0 - opacity) + shadowAlpha;\n    let premultiplied = foregroundColor * foregroundAlpha\n      + backgroundColor * backgroundAlpha * (1.0 - opacity)\n      + shadowCatcherColor * shadowAlpha;\n    finalColor = vec4f(premultiplied / max(alpha, 0.000001), alpha);\n  }\n}\n\noutput.color = finalColor;\n\n// output.color = load_bloomTex(uv, 0) * bloomIntensity;\n`;\n\n// Preserve the existing display composition, but give OIDN a floating-point,\n// linear-light image. Alpha is deliberately not used as a second color layer.\nexport const compositeDenoiseOutputMain = /* wgsl */ `\nlet encoded = max(finalColor.rgb, vec3f(0.0));\nlet displayLinear = select(\n  pow(encoded, vec3f(2.2)),\n  select(pow((encoded + 0.055) / 1.055, vec3f(2.4)), encoded / 12.92,\n    encoded <= vec3f(0.04045)),\n  hdrOutput\n);\noutput.denoiseColor = vec4f(displayLinear, finalColor.a);\n`;\n\nexport const compositeDenoiseDisplayMain = /* wgsl */ `\nlet denoised = load_colorTex(uv, 0);\n// Keep the original primary coverage, including transparency. OIDN only\n// filters RGB; filtering coverage separately reintroduces silhouette seams.\n// The built-in filter weights color and coverage together and may replace it.\nlet alpha = select(load_composedTex(uv, 0).a, clamp(denoised.a, 0.0, 1.0), denoisedAlpha > 0.5);\nlet linear = max(denoised.rgb, vec3f(0.0));\nlet encoded = select(pow(linear, vec3f(1.0 / 2.2)), linearToSrgb(linear), hdrOutputEnabled > 0.5);\noutput.color = vec4f(select(vec3f(0.0), encoded, alpha > 0.0), alpha);\n`;\n"]}
+{"version":3,"file":"compose.frag.wgsl.js","sourceRoot":"","sources":["../../../src/renderer/wgsl/compose.frag.wgsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;;;;;;;CAO5C,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0EtC,kBAAkB;;;;;;;;;;;;;;;;CAgBnB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqGrC,CAAC;AAEF,6EAA6E;AAC7E,8EAA8E;AAC9E,MAAM,CAAC,MAAM,0BAA0B,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BpD,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAC;;;;;;;;;CASrD,CAAC","sourcesContent":["export const linearToSrgbDefine = /* wgsl */ `\nfn linearToSrgb(color: vec3f) -> vec3f {\n  let linear = max(color, vec3f(0.0));\n  let low = linear * 12.92;\n  let high = 1.055 * pow(linear, vec3f(1.0 / 2.4)) - 0.055;\n  return select(high, low, linear <= vec3f(0.0031308));\n}\n`;\n\nexport const composeDefine = /* wgsl */ `\n\nfn linearToneMapping(color: vec3f) -> vec3f {\n  return clamp(color, vec3f(0.0), vec3f(1.0));\n}\nfn reinhardToneMapping(color: vec3f) -> vec3f {\n  return clamp(color / (vec3f(1.0) + color), vec3f(0.0), vec3f(1.0));\n}\nfn cineonToneMapping(inputColor: vec3f) -> vec3f {\n  let color = max(vec3f(0.0), inputColor - 0.004);\n  return pow((color * (6.2 * color + 0.5)) /\n    (color * (6.2 * color + 1.7) + 0.06), vec3f(2.2));\n}\nfn rrtAndOdtFit(value: vec3f) -> vec3f {\n  let numerator = value * (value + 0.0245786) - 0.000090537;\n  let denominator = value * (0.983729 * value + 0.4329510) + 0.238081;\n  return numerator / denominator;\n}\nfn acesToneMapping(inputColor: vec3f) -> vec3f {\n  let inputMatrix = mat3x3f(\n    vec3f(0.59719, 0.07600, 0.02840),\n    vec3f(0.35458, 0.90834, 0.13383),\n    vec3f(0.04823, 0.01566, 0.83777)\n  );\n  let outputMatrix = mat3x3f(\n    vec3f(1.60475, -0.10208, -0.00327),\n    vec3f(-0.53108, 1.10813, -0.07276),\n    vec3f(-0.07367, -0.00605, 1.07602)\n  );\n  let color = inputMatrix * (inputColor / 0.6);\n  return clamp(outputMatrix * rrtAndOdtFit(color), vec3f(0.0), vec3f(1.0));\n}\nfn agxDefaultContrastApprox(value: vec3f) -> vec3f {\n  let value2 = value * value;\n  let value4 = value2 * value2;\n  return 15.5 * value4 * value2 - 40.14 * value4 * value\n    + 31.96 * value4 - 6.868 * value2 * value\n    + 0.4298 * value2 + 0.1191 * value - 0.00232;\n}\nfn agxToneMapping(inputColor: vec3f) -> vec3f {\n  let linearRec2020ToLinearSrgb = mat3x3f(\n    vec3f(1.6605, -0.1246, -0.0182),\n    vec3f(-0.5876, 1.1329, -0.1006),\n    vec3f(-0.0728, -0.0083, 1.1187)\n  );\n  let linearSrgbToLinearRec2020 = mat3x3f(\n    vec3f(0.6274, 0.0691, 0.0164),\n    vec3f(0.3293, 0.9195, 0.0880),\n    vec3f(0.0433, 0.0113, 0.8956)\n  );\n  let insetMatrix = mat3x3f(\n    vec3f(0.856627153315983, 0.137318972929847, 0.11189821299995),\n    vec3f(0.0951212405381588, 0.761241990602591, 0.0767994186031903),\n    vec3f(0.0482516061458583, 0.101439036467562, 0.811302368396859)\n  );\n  let outsetMatrix = mat3x3f(\n    vec3f(1.1271005818144368, -0.1413297634984383, -0.14132976349843826),\n    vec3f(-0.11060664309660323, 1.157823702216272, -0.11060664309660294),\n    vec3f(-0.016493938717834573, -0.016493938717834257, 1.2519364065950405)\n  );\n  var color = insetMatrix * (linearSrgbToLinearRec2020 * inputColor);\n  color = clamp((log2(max(color, vec3f(1e-10))) + 12.47393) / 16.5, vec3f(0.0), vec3f(1.0));\n  color = outsetMatrix * agxDefaultContrastApprox(color);\n  color = pow(max(color, vec3f(0.0)), vec3f(2.2));\n  return clamp(linearRec2020ToLinearSrgb * color, vec3f(0.0), vec3f(1.0));\n}\nfn applyToneMapping(color: vec3f) -> vec3f {\n  let toneMappingMode = i32(toneMappingParams.x);\n  if (toneMappingMode == 1) { return acesToneMapping(color); }\n  if (toneMappingMode == 2) { return cineonToneMapping(color); }\n  if (toneMappingMode == 3) { return reinhardToneMapping(color); }\n  if (toneMappingMode == 4) { return linearToneMapping(color); }\n  return agxToneMapping(color);\n}\n${linearToSrgbDefine}\nfn gradeColor(inputColor: vec3f) -> vec3f {\n  let contrast = colorGradingParams.x;\n  let saturation = colorGradingParams.y;\n  let temperature = colorGradingParams.z;\n  let tint = colorGradingParams.w;\n  let balance = vec3f(\n    1.0 + temperature * 0.16 + tint * 0.04,\n    1.0 - tint * 0.12,\n    1.0 - temperature * 0.16 + tint * 0.04\n  );\n  var color = max(inputColor * balance, vec3f(0.0));\n  color = max((color - 0.18) * contrast + 0.18, vec3f(0.0));\n  let luminance = dot(color, vec3f(0.2126, 0.7152, 0.0722));\n  return max(mix(vec3f(luminance), color, saturation), vec3f(0.0));\n}\n`;\n\nexport const composeMain = /* wgsl */ `\n\nvar finalColor = load_colorTex(uv, 0);\nvar bloomTexel = vec4(0.0);\nif (bloomIntensity > 0.0) {\n  bloomTexel = load_bloomTex(uv, 0) * bloomIntensity;\n  finalColor = vec4f(finalColor.rgb + bloomTexel.rgb, finalColor.a);\n}\n\nvar gradedColor = gradeColor(finalColor.rgb * exposure);\nlet vignetteEdge = smoothstep(0.2, 0.72, distance(vec2f(uv) / vec2f(colorTexRegion()), vec2f(0.5)));\ngradedColor *= 1.0 - toneMappingParams.y * vignetteEdge;\nlet hdrOutput = hdrOutputEnabled > 0.5;\nif (!hdrOutput) {\n  gradedColor = applyToneMapping(gradedColor);\n}\nlet encodedDisplay = select(\n  pow(max(gradedColor, vec3f(0.0)), vec3f(1.0 / 2.2)),\n  linearToSrgb(gradedColor),\n  hdrOutput\n);\nvar displayColor = encodedDisplay;\nif (flatBackgroundColor.a > 0.5) {\n  let surfaceCoverage = clamp(\n    load_flatBackgroundMaskTex(uv, 0).a,\n    0.0,\n    1.0\n  );\n  let flatBackgroundDisplay = linearToSrgb(max(flatBackgroundColor.rgb, vec3f(0.0)));\n  displayColor = mix(flatBackgroundDisplay, encodedDisplay, surfaceCoverage);\n  if (bloomIntensity > 0.0) {\n    var unbloomedColor = gradeColor(\n      max(finalColor.rgb - bloomTexel.rgb, vec3f(0.0))\n        * exposure\n    );\n    unbloomedColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    if (!hdrOutput) {\n      unbloomedColor = applyToneMapping(unbloomedColor);\n    }\n    let encodedUnbloomed = select(\n      pow(max(unbloomedColor, vec3f(0.0)), vec3f(1.0 / 2.2)),\n      linearToSrgb(unbloomedColor),\n      hdrOutput\n    );\n    displayColor += max(encodedDisplay - encodedUnbloomed, vec3f(0.0))\n      * (1.0 - surfaceCoverage);\n  }\n}\nfinalColor = vec4f(displayColor, finalColor.a);\nif (bloomIntensity > 0.0) {\n  finalColor.a = max(finalColor.a, min(dot(bloomTexel.rgb, vec3f(0.2125, 0.7154, 0.0721)), 1.0));\n}\n\nif (shadowCatcherEnabled > 0.5) {\n  let shadowCatcher = load_shadowCatcherTex(uv, 0);\n  let coverage = clamp(shadowCatcher.r, 0.0, 1.0);\n  let opacity = max(clamp(shadowCatcher.a / max(coverage, 0.000001), 0.0, 1.0) - (1.0 - shadowCatcherAlpha), 0.0);\n  if (coverage > 0.0 || flatBackgroundColor.a > 0.5) {\n    let foreground = load_foregroundTex(uv, 0);\n    let background = load_catcherBackgroundTex(uv, 0);\n    // An opaque flat backdrop also owns primary misses outside the receiver.\n    // Its alpha contains catcher coverage plus miss coverage; only the catcher\n    // fraction receives shadow. These weights come from the accumulation,\n    // independently of the quantized denoising/albedo guide.\n    let flatMissCoverage = select(0.0, clamp(background.a - coverage, 0.0, 1.0 - coverage), flatBackgroundColor.a > 0.5);\n    var foregroundColor = gradeColor((foreground.rgb + bloomTexel.rgb) * exposure);\n    var backgroundColor = gradeColor((background.rgb / max(background.a, 0.000001) + bloomTexel.rgb) * exposure);\n    foregroundColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    backgroundColor *= 1.0 - toneMappingParams.y * vignetteEdge;\n    if (!hdrOutput) {\n      foregroundColor = applyToneMapping(foregroundColor);\n      backgroundColor = applyToneMapping(backgroundColor);\n    }\n    foregroundColor = select(pow(max(foregroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(foregroundColor), hdrOutput);\n    backgroundColor = select(pow(max(backgroundColor, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(backgroundColor), hdrOutput);\n    if (flatBackgroundColor.a > 0.5) {\n      var unbloomedBackground = gradeColor(background.rgb / max(background.a, 0.000001) * exposure);\n      unbloomedBackground *= 1.0 - toneMappingParams.y * vignetteEdge;\n      if (!hdrOutput) { unbloomedBackground = applyToneMapping(unbloomedBackground); }\n      let encodedUnbloomedBackground = select(pow(max(unbloomedBackground, vec3f(0.0)), vec3f(1.0 / 2.2)), linearToSrgb(unbloomedBackground), hdrOutput);\n      let bloomSpill = select(vec3f(0.0), max(backgroundColor - encodedUnbloomedBackground, vec3f(0.0)), bloomIntensity > 0.0);\n      backgroundColor = linearToSrgb(max(flatBackgroundColor.rgb, vec3f(0.0))) + bloomSpill;\n    }\n    // Foreground and catcher are disjoint primary samples, not overlapping\n    // alpha layers. Shadow only the catcher background before averaging.\n    let shadowAlpha = coverage * opacity;\n    let bloomAlpha = clamp(dot(bloomTexel.rgb, vec3f(0.2125, 0.7154, 0.0721)), 0.0, 1.0);\n    let foregroundAlpha = max(foreground.a, bloomAlpha * (1.0 - coverage - flatMissCoverage));\n    let backgroundAlpha = max(background.a, bloomAlpha * coverage);\n    let visibleBackgroundAlpha = (backgroundAlpha - flatMissCoverage) * (1.0 - opacity) + flatMissCoverage;\n    let alpha = foregroundAlpha + visibleBackgroundAlpha + shadowAlpha;\n    let premultiplied = foregroundColor * foregroundAlpha\n      + backgroundColor * visibleBackgroundAlpha\n      + shadowCatcherColor * shadowAlpha;\n    finalColor = vec4f(premultiplied / max(alpha, 0.000001), alpha);\n  }\n}\n\noutput.color = finalColor;\n\n// output.color = load_bloomTex(uv, 0) * bloomIntensity;\n`;\n\n// Preserve the existing display composition, but give OIDN a floating-point,\n// linear-light image. Alpha is deliberately not used as a second color layer.\nexport const compositeDenoiseOutputMain = /* wgsl */ `\nlet encoded = max(finalColor.rgb, vec3f(0.0));\nlet displayLinear = select(\n  pow(encoded, vec3f(2.2)),\n  select(pow((encoded + 0.055) / 1.055, vec3f(2.4)), encoded / 12.92,\n    encoded <= vec3f(0.04045)),\n  hdrOutput\n);\noutput.denoiseColor = vec4f(displayLinear, finalColor.a);\n\n// The receiver is invisible: its visible texture is the displayed background,\n// not the neutral reflectance used for its lighting estimate. Match the beauty\n// reconstruction filter, including mixed foreground/receiver primary samples.\n// Exclude the stochastic shadow and bloom so neither is preserved as texture.\nlet rawAlbedo = load_flatBackgroundMaskTex(uv, 0);\nvar compositeAlbedo = rawAlbedo.rgb;\nif (shadowCatcherEnabled > 0.5 && flatBackgroundColor.a < 0.5) {\n  let coverage = clamp(load_shadowCatcherTex(uv, 0).r, 0.0, 1.0);\n  let background = load_catcherBackgroundTex(uv, 0);\n  if (coverage > 0.0 && background.a > 0.0) {\n    var backgroundAlbedo = gradeColor(background.rgb / background.a * exposure);\n    backgroundAlbedo *= 1.0 - toneMappingParams.y * vignetteEdge;\n    if (!hdrOutput) { backgroundAlbedo = applyToneMapping(backgroundAlbedo); }\n    // Background alpha already includes primary catcher coverage. Retain the\n    // neutral receiver for its transparent part, without counting coverage twice\n    // or adding the stochastic shadow opacity to the texture guide.\n    let backgroundWeight = clamp(background.a, 0.0, coverage);\n    compositeAlbedo += backgroundWeight * (clamp(backgroundAlbedo, vec3f(0.0), vec3f(1.0)) - vec3f(1.0));\n  }\n}\noutput.denoiseAlbedo = vec4f(clamp(compositeAlbedo, vec3f(0.0), vec3f(1.0)), rawAlbedo.a);\n`;\n\nexport const compositeDenoiseDisplayMain = /* wgsl */ `\nlet denoised = load_colorTex(uv, 0);\n// Keep the original primary coverage, including transparency. OIDN only\n// filters RGB; filtering coverage separately reintroduces silhouette seams.\n// The built-in filter weights color and coverage together and may replace it.\nlet alpha = select(load_composedTex(uv, 0).a, clamp(denoised.a, 0.0, 1.0), denoisedAlpha > 0.5);\nlet linear = max(denoised.rgb, vec3f(0.0));\nlet encoded = select(pow(linear, vec3f(1.0 / 2.2)), linearToSrgb(linear), hdrOutputEnabled > 0.5);\noutput.color = vec4f(select(vec3f(0.0), encoded, alpha > 0.0), alpha);\n`;\n"]}

package/lib/renderer/wgsl/customDenoise.wgsl.js

@@ -5,19 +5,19 @@ let filtered = load_filteredTex(uv, 0).rgb;
 let foreground = load_foregroundTex(uv, 0);
 let background = load_backgroundTex(uv, 0);
 
-var me = foreground;
-var mc = background;
+var mt = foreground;
+var mr = background;
 if (any(filtered != original)) {
-let uk = abs(original) > vec3f(0.000001);
-let ap = select(vec3f(1.0), original, uk);
-let scale = select(vec3f(1.0), filtered / ap, uk);
-let tP = select(filtered - original, vec3f(0.0), uk);
-me = vec4f(foreground.rgb * scale + tP, foreground.a);
+let uz = abs(original) > vec3f(0.000001);
+let ap = select(vec3f(1.0), original, uz);
+let scale = select(vec3f(1.0), filtered / ap, uz);
+let ub = select(filtered - original, vec3f(0.0), uz);
+mt = vec4f(foreground.rgb * scale + ub, foreground.a);
 
-mc = vec4f(background.rgb * scale + tP * background.a, background.a);
+mr = vec4f(background.rgb * scale + ub * background.a, background.a);
 }
-output.foreground = me;
-output.background = mc;
+output.foreground = mt;
+output.background = mr;
 `;
 /** Custom output alpha is ignored; retain the input composition's coverage. */
 export const customDenoiseCoverageMain = /* wgsl */ `

package/lib/renderer/wgsl/depthQuery.wgsl.d.ts

@@ -1,3 +1,3 @@
 /** Extra entry point in the ray-tracing module; reuses its scene bindings. */
-declare const _default: "\n@group(3) @binding(4) var<uniform> depthArea: vec4f;\n\n@compute @workgroup_size(7, 7)\nfn depthQuery(@builtin(global_invocation_id) id: vec3u) {\n  let index = id.x + id.y * 7u;\n  let offset = vec2f(id.xy) / 6.0 * 2.0 - 1.0;\n  let uv = depthArea.xy + depthArea.zw * offset * vec2f(1.0, -1.0);\n  outColor[index] = vec4f(0.0);\n  if (any(uv < vec2f(0.0)) || any(uv > vec2f(1.0))) { return; }\n  var ray = initCameraRay(uv);\n  let eye = cameraUniform.viewInv[3].xyz;\n  let forward = -normalize(cameraUniform.viewInv[2].xyz);\n  var si: SurfaceInteraction;\n  si.triangleIndex = -1;\n  // Ignore invisible catchers and alpha-cutout holes, without stochastic DOF\n  // or pixel jitter. A bounded continuation prevents coincident surfaces\n  // from keeping the query alive indefinitely.\n  for (var layer = 0; layer < 32; layer++) {\n    intersectScene(ray, &si, 0, false, false);\n    if (!si.hit) { return; }\n    var material: OpenPbrResolvedMaterial;\n    getMaterial(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      outColor[index] = vec4f(max(dot(si.position - eye, forward), 0.0), 0.0, 0.0, 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n";
+declare const _default: "\n@group(3) @binding(4) var<uniform> depthArea: vec4f;\n\n@compute @workgroup_size(7, 7)\nfn depthQuery(@builtin(global_invocation_id) id: vec3u) {\n  let index = id.x + id.y * 7u;\n  let offset = vec2f(id.xy) / 6.0 * 2.0 - 1.0;\n  let uv = depthArea.xy + depthArea.zw * offset * vec2f(1.0, -1.0);\n  outColor[index] = vec4f(0.0);\n  if (any(uv < vec2f(0.0)) || any(uv > vec2f(1.0))) { return; }\n  var ray = initCameraRay(uv);\n  let eye = cameraUniform.viewInv[3].xyz;\n  let forward = -normalize(cameraUniform.viewInv[2].xyz);\n  var si: SurfaceInteraction;\n  si.triangleIndex = -1;\n  // Ignore invisible catchers and alpha-cutout holes, without stochastic DOF\n  // or pixel jitter. A bounded continuation prevents coincident surfaces\n  // from keeping the query alive indefinitely.\n  for (var layer = 0; layer < 32; layer++) {\n    intersectScene(ray, &si, 0, false, false);\n    if (!si.hit) { return; }\n    var material: OpenPbrResolvedMaterial;\n    getMaterial(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      outColor[index] = vec4f(max(dot(si.position - eye, forward), 0.0), 0.0, 0.0, 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n";
 export default _default;

package/lib/renderer/wgsl/depthQuery.wgsl.js

@@ -10,21 +10,21 @@ let offset = vec2f(id.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;
 let uv = depthArea.xy + depthArea.zw * offset * vec2f(1.0, -1.0);
 outColor[index] = vec4f(0.0);
 if (any(uv < vec2f(0.0)) || any(uv > vec2f(1.0))) { return; }
-var ray = hz(uv);
+var ray = hC(uv);
 let eye = cameraUniform.viewInv[3].xyz;
-let nV = -normalize(cameraUniform.viewInv[2].xyz);
+let ol = -normalize(cameraUniform.viewInv[2].xyz);
 var si: ad;
 si.triangleIndex = -1;
 
 
 
 for (var layer = 0; layer < 32; layer++) {
-cY(ray, &si, 0, false, false);
+cZ(ray, &si, 0, false, false);
 if (!si.hit) { return; }
 var material: J;
-eT(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex);
+eX(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);
 if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {
-outColor[index] = vec4f(max(dot(si.position - eye, nV), 0.0), 0.0, 0.0, 0.0);
+outColor[index] = vec4f(max(dot(si.position - eye, ol), 0.0), 0.0, 0.0, 0.0);
 return;
 }
 ray.o = si.position + ray.d * (EPS * 0.02);

package/lib/renderer/wgsl/depthQuery.wgsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"depthQuery.wgsl.js","sourceRoot":"","sources":["../../../src/renderer/wgsl/depthQuery.wgsl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,8EAA8E;AAC9E,eAAe,UAAU,CAAC;;;2BAGC,iBAAiB,KAAK,iBAAiB;;4BAEpC,iBAAiB;8BACf,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAwBpD,CAAC","sourcesContent":["import { DEPTH_SAMPLE_GRID } from '../depthQuery.js';\n\n/** Extra entry point in the ray-tracing module; reuses its scene bindings. */\nexport default /* wgsl */ `\n@group(3) @binding(4) var<uniform> depthArea: vec4f;\n\n@compute @workgroup_size(${DEPTH_SAMPLE_GRID}, ${DEPTH_SAMPLE_GRID})\nfn depthQuery(@builtin(global_invocation_id) id: vec3u) {\n  let index = id.x + id.y * ${DEPTH_SAMPLE_GRID}u;\n  let offset = vec2f(id.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  let uv = depthArea.xy + depthArea.zw * offset * vec2f(1.0, -1.0);\n  outColor[index] = vec4f(0.0);\n  if (any(uv < vec2f(0.0)) || any(uv > vec2f(1.0))) { return; }\n  var ray = initCameraRay(uv);\n  let eye = cameraUniform.viewInv[3].xyz;\n  let forward = -normalize(cameraUniform.viewInv[2].xyz);\n  var si: SurfaceInteraction;\n  si.triangleIndex = -1;\n  // Ignore invisible catchers and alpha-cutout holes, without stochastic DOF\n  // or pixel jitter. A bounded continuation prevents coincident surfaces\n  // from keeping the query alive indefinitely.\n  for (var layer = 0; layer < 32; layer++) {\n    intersectScene(ray, &si, 0, false, false);\n    if (!si.hit) { return; }\n    var material: OpenPbrResolvedMaterial;\n    getMaterial(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      outColor[index] = vec4f(max(dot(si.position - eye, forward), 0.0), 0.0, 0.0, 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`;\n"]}
+{"version":3,"file":"depthQuery.wgsl.js","sourceRoot":"","sources":["../../../src/renderer/wgsl/depthQuery.wgsl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,8EAA8E;AAC9E,eAAe,UAAU,CAAC;;;2BAGC,iBAAiB,KAAK,iBAAiB;;4BAEpC,iBAAiB;8BACf,iBAAiB,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAwBpD,CAAC","sourcesContent":["import { DEPTH_SAMPLE_GRID } from '../depthQuery.js';\n\n/** Extra entry point in the ray-tracing module; reuses its scene bindings. */\nexport default /* wgsl */ `\n@group(3) @binding(4) var<uniform> depthArea: vec4f;\n\n@compute @workgroup_size(${DEPTH_SAMPLE_GRID}, ${DEPTH_SAMPLE_GRID})\nfn depthQuery(@builtin(global_invocation_id) id: vec3u) {\n  let index = id.x + id.y * ${DEPTH_SAMPLE_GRID}u;\n  let offset = vec2f(id.xy) / ${DEPTH_SAMPLE_GRID - 1}.0 * 2.0 - 1.0;\n  let uv = depthArea.xy + depthArea.zw * offset * vec2f(1.0, -1.0);\n  outColor[index] = vec4f(0.0);\n  if (any(uv < vec2f(0.0)) || any(uv > vec2f(1.0))) { return; }\n  var ray = initCameraRay(uv);\n  let eye = cameraUniform.viewInv[3].xyz;\n  let forward = -normalize(cameraUniform.viewInv[2].xyz);\n  var si: SurfaceInteraction;\n  si.triangleIndex = -1;\n  // Ignore invisible catchers and alpha-cutout holes, without stochastic DOF\n  // or pixel jitter. A bounded continuation prevents coincident surfaces\n  // from keeping the query alive indefinitely.\n  for (var layer = 0; layer < 32; layer++) {\n    intersectScene(ray, &si, 0, false, false);\n    if (!si.hit) { return; }\n    var material: OpenPbrResolvedMaterial;\n    getMaterial(&material, si.materialIndex, si.uv, si.uv1, si.instanceIndex, si.vertexColor);\n    if (material.materialType != SHADOW_CATCHER && material.alpha > 0.0) {\n      outColor[index] = vec4f(max(dot(si.position - eye, forward), 0.0), 0.0, 0.0, 0.0);\n      return;\n    }\n    ray.o = si.position + ray.d * (EPS * 0.02);\n  }\n}\n`;\n"]}

package/lib/renderer/wgsl/offlineAdaptive.compute.js

@@ -27,8 +27,8 @@ _padding: f32,
 const LUMINANCE = vec3f(0.2126, 0.7152, 0.0722);
 
 @compute @workgroup_size(64)
-fn main(@builtin(global_invocation_id) ud: vec3u) {
-let tile = ud.x;
+fn main(@builtin(global_invocation_id) uq: vec3u) {
+let tile = uq.x;
 let tileCount = params.columns * params.rows;
 if (tile >= tileCount) {
 return;
@@ -36,18 +36,18 @@ return;
 
 let tileX = tile % params.columns;
 let tileY = tile / params.columns;
-let ui = tileX * params.tileSize;
-let uj = tileY * params.tileSize;
-let vY = min(ui + params.tileSize, params.width);
-let vZ = min(uj + params.tileSize, params.height);
-var mL = 0.0;
-var iY = 0.0;
+let ux = tileX * params.tileSize;
+let uy = tileY * params.tileSize;
+let wl = min(ux + params.tileSize, params.width);
+let wm = min(uy + params.tileSize, params.height);
+var mZ = 0.0;
+var je = 0.0;
 var count = 0u;
 
-for (var y = uj; y < vZ; y++) {
-for (var x = ui; x < vY; x++) {
-let fM = y * params.width + x;
-let offset = fM * 4u;
+for (var y = uy; y < wm; y++) {
+for (var x = ux; x < wl; x++) {
+let fP = y * params.width + x;
+let offset = fP * 4u;
 let samples = pilotMoments[offset + 3u];
 if (samples <= 0.0) {
 continue;
@@ -60,28 +60,28 @@ pilotColor[offset + 2u]
 ),
 LUMINANCE
 ) / samples;
-let tv = pilotMoments[offset] / samples;
-let oV = max(tv - mean * mean, 0.0);
-var variance = oV;
+let tK = pilotMoments[offset] / samples;
+let pi = max(tK - mean * mean, 0.0);
+var variance = pi;
 if (samples > 1.0) {
-variance = oV * samples / (samples - 1.0);
+variance = pi * samples / (samples - 1.0);
 }
-mL += mean;
-iY = max(iY, variance);
+mZ += mean;
+je = max(je, variance);
 count += 1u;
 }
 }
 
-let mean = mL / f32(max(count, 1u));
-var oK = 0.0;
+let mean = mZ / f32(max(count, 1u));
+var oX = 0.0;
 if (params.hasPrevious != 0u) {
-oK = previousVariance[tile];
+oX = previousVariance[tile];
 }
-let rV = max(iY, oK);
-let sT = params.absoluteError + params.relativeError * abs(mean);
+let sj = max(je, oX);
+let tf = params.absoluteError + params.relativeError * abs(mean);
 let required = ceil(
-params.confidence * params.confidence * rV /
-max(sT * sT, 1e-16)
+params.confidence * params.confidence * sj /
+max(tf * tf, 1e-16)
 );
 let targetSamples = u32(min(
 f32(params.maxSamples),
@@ -91,11 +91,11 @@ max(f32(params.minSamples), required)
 tileMeans[tile] = mean;
 
 
-tileVariances[tile] = iY;
+tileVariances[tile] = je;
 tileTargets[tile] = targetSamples;
 
-for (var y = uj; y < vZ; y++) {
-for (var x = ui; x < vY; x++) {
+for (var y = uy; y < wm; y++) {
+for (var x = ux; x < wl; x++) {
 textureStore(
 targetTexture,
 vec2i(i32(x), i32(y)),