@meimu/mutracer 0.1.2 → 0.1.4

package/lib/renderer/WGPURenderingPipeline.js

@@ -40,30 +40,30 @@ encoded / 12.92,
 encoded <= vec3f(0.04045)
 );
 var result = linear;
-let ja = textureLoad(in_rawAlbedo, vec2i(globalId.xy), 0).a;
+let jg = textureLoad(in_rawAlbedo, vec2i(globalId.xy), 0).a;
 if (preserveSurfaceTexture != 0u) {
 
 
 
-let fM = vec2i(globalId.xy);
-let center = textureLoad(in_rawNormal, fM, 0);
+let fP = vec2i(globalId.xy);
+let center = textureLoad(in_rawNormal, fP, 0);
 let n = normalize(center.rgb * 2.0 - 1.0 + vec3f(1e-8));
-var mP = 0.0;
+var ng = 0.0;
 for (var y = -1; y <= 1; y++) {
 for (var x = -1; x <= 1; x++) {
-let tJ = textureLoad(in_rawNormal,
-clamp(fM + vec2i(x, y), vec2i(0), imageSize - 1), 0);
-let nn = normalize(tJ.rgb * 2.0 - 1.0 + vec3f(1e-8));
-mP = max(mP,
-max(1.0 - dot(n, nn), abs(center.a - tJ.a)));
+let tV = textureLoad(in_rawNormal,
+clamp(fP + vec2i(x, y), vec2i(0), imageSize - 1), 0);
+let nn = normalize(tV.rgb * 2.0 - 1.0 + vec3f(1e-8));
+ng = max(ng,
+max(1.0 - dot(n, nn), abs(center.a - tV.a)));
 }
 }
-let ub = smoothstep(0.02, 0.1, mP);
-let raw = clamp(textureLoad(in_rawAlbedo, fM, 0).rgb,
+let un = smoothstep(0.02, 0.1, ng);
+let raw = clamp(textureLoad(in_rawAlbedo, fP, 0).rgb,
 vec3f(0.0), vec3f(1.0));
-result = mix(raw, linear, ub);
+result = mix(raw, linear, un);
 }
-out_albedo[index] = vec4f(result, ja);
+out_albedo[index] = vec4f(result, jg);
 `;
 export const oidnNormalSanitizeMain = /* wgsl */ `
 if (globalId.x >= u32(imageSize.x) || globalId.y >= u32(imageSize.y)) { return; }
@@ -314,7 +314,7 @@ output.color = color;
                 data: 0.25
             }
         ],
-        outputs: ['color', 'denoiseColor'],
+        outputs: ['color', 'denoiseColor', 'denoiseAlbedo'],
         inputs: [
             'colorTex',
             'foregroundTex',
@@ -329,7 +329,8 @@ output.color = color;
         color: {
             format: composeColorFormat
         },
-        denoiseColor: { format: 'rgba32float' }
+        denoiseColor: { format: 'rgba32float' },
+        denoiseAlbedo: { format: 'rgba8unorm' }
     });
     const compositeDenoiseDisplayPass = scratch.get('compositeDenoiseDisplayPass', () => new WGPUFullQuadPass('OIDN composed display', device, {
         textureWillBeRead: true,
@@ -374,11 +375,11 @@ output.color = color;
     oidnNormalSanitizePass.setOutputParams({ normal: { channels: 4 } });
     const outputPass = scratch.get('outputPass', () => new WGPUFullQuadPass('output', device, {
         fsMain: /* wgsl */ `
-let vA = min(
+let vM = min(
 vec2i(uv2 * vec2f(colorTexRegion())),
 vec2i(colorTexRegion()) - vec2i(1)
 );
-var color = load_colorTex(vA, 0);
+var color = load_colorTex(vM, 0);
 color = vec4(color.rgb * color.a, color.a);
 output.color = color;
 `,
@@ -488,7 +489,7 @@ output.color = color;
     }
     function prepareComposition() {
         composePass.setSize(renderWidth, renderHeight);
-        composePass.setOutputParams({ color: { format: composeColorFormat }, denoiseColor: { format: 'rgba32float' } });
+        composePass.setOutputParams({ color: { format: composeColorFormat }, denoiseColor: { format: 'rgba32float' }, denoiseAlbedo: { format: 'rgba8unorm' } });
         composePass.setUniform('exposure', exposure);
         composePass.setUniform('toneMappingParams', [toneMappingMode, vignette]);
         composePass.setUniform('colorGradingParams', [contrast, saturation, temperature, tint]);
@@ -847,7 +848,8 @@ output.color = color;
             composeColorFormat = nextComposeColorFormat;
             composePass.setOutputParams({
                 color: { format: composeColorFormat },
-                denoiseColor: { format: 'rgba32float' }
+                denoiseColor: { format: 'rgba32float' },
+                denoiseAlbedo: { format: 'rgba8unorm' }
             });
         }
         if (wasActive !== hdrOutputActive) {
@@ -1001,7 +1003,7 @@ output.color = color;
             if (!auxiliaryDenoisers) {
                 return {
                     albedo: {
-                        data: copyGuide('OIDN raw albedo', getFrameInput('albedo')),
+                        data: copyGuide('OIDN raw albedo', composePass.getOutput('denoiseAlbedo')),
                         ...size
                     },
                     normal: {
@@ -1015,7 +1017,7 @@ output.color = color;
             const encodeEncoder = device.createCommandEncoder();
             oidnAlbedoEncodePass.createPass(encodeEncoder, {
                 albedo: {
-                    texture: getFrameInput('albedo'),
+                    texture: composePass.getOutput('denoiseAlbedo'),
                     channels: 4
                 }
             });
@@ -1039,7 +1041,7 @@ output.color = color;
             oidnAlbedoDecodePass.setUniform('preserveSurfaceTexture', +false);
             oidnAlbedoDecodePass.createPass(decodeEncoder, {
                 albedo: { buffer: albedoOutput.data, channels: 4 },
-                rawAlbedo: { texture: getFrameInput('albedo'), channels: 4 },
+                rawAlbedo: { texture: composePass.getOutput('denoiseAlbedo'), channels: 4 },
                 rawNormal: { texture: getFrameInput('normal'), channels: 4 }
             });
             device.queue.submit([decodeEncoder.finish()]);