@meimu/mutracer 0.1.5 → 0.3.0

package/lib/renderer/glsl/normalizeRayTraceOutput.frag.js

@@ -10,28 +10,36 @@ const normalizeRayTraceOutput = new FragmentShader({
         albedoTex: Shader.uniform('sampler2D'),
         normalTex: Shader.uniform('sampler2D'),
         shadowCatcherTex: Shader.uniform('sampler2D'),
+        catcherMomentsTex: Shader.uniform('sampler2D'),
         sampleCount: Shader.uniform('float', 1),
         lightScale: Shader.uniform('vec2', [1, 1])
     },
     main: glsl `
 void main() {
 vec2 uv = lightScale * v_Texcoord;
-vec4 rV = sample_albedoTex(uv);
-float hit = rV.a;
-vec4 rZ = sample_normalTex(uv);
+vec4 sY = sample_albedoTex(uv);
+float hit = sY.a;
+vec4 td = sample_normalTex(uv);
 
 
 
-float sr = max(rZ.a, 1.0);
-vec3 albedo = rV.rgb / sr;
-vec3 normal = rZ.rgb / sr;
-vec4 shadowCatcher= sample_shadowCatcherTex(uv) / sampleCount;
-vec4 sB = sample_colorTex(uv);
+float tL = max(td.a, 1.0);
+vec3 albedo = sY.rgb / tL;
+vec3 normal = td.rgb / tL;
+vec4 shadowCatcher = sample_shadowCatcherTex(uv);
 
 
 
+float th = sample_catcherMomentsTex(uv).w;
+float opacity = th > 0.0 ? shadowCatcher.a / th : 0.0;
+shadowCatcher /= sampleCount;
+shadowCatcher.a = 1.0 - shadowCatcher.r * opacity;
+vec4 tT = sample_colorTex(uv);
 
-vec4 light = vec4(sB.rgb / (hit > 0.0 ? hit : sampleCount), sB.a / sampleCount);
+
+
+
+vec4 light = vec4(tT.rgb / (hit > 0.0 ? hit : sampleCount), tT.a / sampleCount);
 
 
 

package/lib/renderer/glsl/normalizeRayTraceOutput.frag.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeRayTraceOutput.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/normalizeRayTraceOutput.frag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE5D;;GAEG;AACH,MAAM,uBAAuB,GAAG,IAAI,cAAc,CAAC;IACjD,IAAI,EAAE,yBAAyB;IAC/B,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC;IAEvD,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACrC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACtC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACtC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAE7C,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACvC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3C;IAED,IAAI,EAAE,IAAI,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BT;CACF,CAAC,CAAC;AAEH,eAAe,uBAAuB,CAAC","sourcesContent":["import { FragmentShader, glsl, Shader } from '../shader.js';\n\n/**\n * Normalize\n */\nconst normalizeRayTraceOutput = new FragmentShader({\n  name: 'normalizeRayTraceOutput',\n  outputs: ['color', 'albedo', 'normal', 'shadowCatcher'],\n\n  uniforms: {\n    colorTex: Shader.uniform('sampler2D'),\n    albedoTex: Shader.uniform('sampler2D'),\n    normalTex: Shader.uniform('sampler2D'),\n    shadowCatcherTex: Shader.uniform('sampler2D'),\n\n    sampleCount: Shader.uniform('float', 1),\n    lightScale: Shader.uniform('vec2', [1, 1])\n  },\n\n  main: glsl`\nvoid main() {\n  vec2 uv = lightScale * v_Texcoord;\n  vec4 albedoTexel = sample_albedoTex(uv);\n  float hit = albedoTexel.a;\n  vec4 normalTexel = sample_normalTex(uv);\n  // Spectral WebGL rendering submits three additive wavelength passes per\n  // sample. Normalize auxiliary guides by their actual contribution count,\n  // not the logical sample count, or they saturate before denoising.\n  float guideCount = max(normalTexel.a, 1.0);\n  vec3 albedo = albedoTexel.rgb / guideCount;\n  vec3 normal = normalTexel.rgb / guideCount;\n  vec4 shadowCatcher= sample_shadowCatcherTex(uv) / sampleCount;\n  vec4 lightTexel = sample_colorTex(uv);\n  // vec2 hit = sample_hitTex(uv).rg;\n  // average the color by hit count.\n  // So the antialised edge color will be correct when having transparent background\n  // TODO In some platforms. the output of hit.r is always 0. In this case we use sampleCount instead.\n  vec4 light = vec4(lightTexel.rgb / (hit > 0.0 ? hit : sampleCount), lightTexel.a / sampleCount);\n\n  // Pixels whose primary rays mostly miss geometry have no normal (alpha 0),\n  // as in the WebGPU output.\n  out_normal = dot(normal, normal) > 0.1 ? vec4(normal * 0.5 + 0.5, 1.0) : vec4(0.0);\n  out_albedo = vec4(albedo, 1.0);\n  out_shadowCatcher = shadowCatcher;\n  out_color = light;\n}\n  `\n});\n\nexport default normalizeRayTraceOutput;\n"]}
+{"version":3,"file":"normalizeRayTraceOutput.frag.js","sourceRoot":"","sources":["../../../src/renderer/glsl/normalizeRayTraceOutput.frag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE5D;;GAEG;AACH,MAAM,uBAAuB,GAAG,IAAI,cAAc,CAAC;IACjD,IAAI,EAAE,yBAAyB;IAC/B,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC;IAEvD,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACrC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACtC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QACtC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAC7C,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAE9C,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACvC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3C;IAED,IAAI,EAAE,IAAI,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCT;CACF,CAAC,CAAC;AAEH,eAAe,uBAAuB,CAAC","sourcesContent":["import { FragmentShader, glsl, Shader } from '../shader.js';\n\n/**\n * Normalize\n */\nconst normalizeRayTraceOutput = new FragmentShader({\n  name: 'normalizeRayTraceOutput',\n  outputs: ['color', 'albedo', 'normal', 'shadowCatcher'],\n\n  uniforms: {\n    colorTex: Shader.uniform('sampler2D'),\n    albedoTex: Shader.uniform('sampler2D'),\n    normalTex: Shader.uniform('sampler2D'),\n    shadowCatcherTex: Shader.uniform('sampler2D'),\n    catcherMomentsTex: Shader.uniform('sampler2D'),\n\n    sampleCount: Shader.uniform('float', 1),\n    lightScale: Shader.uniform('vec2', [1, 1])\n  },\n\n  main: glsl`\nvoid main() {\n  vec2 uv = lightScale * v_Texcoord;\n  vec4 albedoTexel = sample_albedoTex(uv);\n  float hit = albedoTexel.a;\n  vec4 normalTexel = sample_normalTex(uv);\n  // Spectral WebGL rendering submits three additive wavelength passes per\n  // sample. Normalize auxiliary guides by their actual contribution count,\n  // not the logical sample count, or they saturate before denoising.\n  float guideCount = max(normalTexel.a, 1.0);\n  vec3 albedo = albedoTexel.rgb / guideCount;\n  vec3 normal = normalTexel.rgb / guideCount;\n  vec4 shadowCatcher = sample_shadowCatcherTex(uv);\n  // Alpha sums occluded light samples and catcherMoments.w all valid ones.\n  // Their ratio is the shadow opacity of catcher samples; the output alpha\n  // keeps the visibility convention of non-catcher samples counting as 1.\n  float sampleTotal = sample_catcherMomentsTex(uv).w;\n  float opacity = sampleTotal > 0.0 ? shadowCatcher.a / sampleTotal : 0.0;\n  shadowCatcher /= sampleCount;\n  shadowCatcher.a = 1.0 - shadowCatcher.r * opacity;\n  vec4 lightTexel = sample_colorTex(uv);\n  // vec2 hit = sample_hitTex(uv).rg;\n  // average the color by hit count.\n  // So the antialised edge color will be correct when having transparent background\n  // TODO In some platforms. the output of hit.r is always 0. In this case we use sampleCount instead.\n  vec4 light = vec4(lightTexel.rgb / (hit > 0.0 ? hit : sampleCount), lightTexel.a / sampleCount);\n\n  // Pixels whose primary rays mostly miss geometry have no normal (alpha 0),\n  // as in the WebGPU output.\n  out_normal = dot(normal, normal) > 0.1 ? vec4(normal * 0.5 + 0.5, 1.0) : vec4(0.0);\n  out_albedo = vec4(albedo, 1.0);\n  out_shadowCatcher = shadowCatcher;\n  out_color = light;\n}\n  `\n});\n\nexport default normalizeRayTraceOutput;\n"]}

package/lib/renderer/glsl/rayTrace.frag.d.ts

@@ -1,2 +1,2 @@
 import { FragmentShader } from '../shader.js';
-export default function createRayTraceFragmentShader(): FragmentShader<Record<string, import("../shader.js").ShaderDefineValue>, Record<string, import("../shader.js").ShaderUniform<unknown>>>;
+export default function createRayTraceFragmentShader(...options: unknown[]): FragmentShader<Record<string, import("../shader.js").ShaderDefineValue>, Record<string, import("../shader.js").ShaderUniform<unknown>>>;