@zephyr3d/scene 0.9.22 → 0.9.23

package/dist/posteffect/sss.js

@@ -1,4 +1,4 @@
-import { Vector2, Vector4, Matrix4x4 } from '@zephyr3d/base';
+import { Vector2, Vector4, Matrix4x4, DEPTH_COMPARE_FARTHER, DEPTH_FARTHEST } from '@zephyr3d/base';
 import { ShaderHelper } from '../material/shader/helper.js';
 import '../material/lambert.js';
 import '../material/blinn.js';
@@ -112,6 +112,9 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
     requireDepthAttachment() {
         return true;
     }
+    requireSceneNormalTexture() {
+        return true;
+    }
     requireShadowMask(ctx) {
         // Runs at graph-build time, before shadowMapInfo is populated (that happens
         // during the ShadowMaps pass execute), so it cannot inspect the combine
@@ -161,8 +164,8 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
     }
     blur(ctx, inputColorTexture, sceneDepthTexture, profileLUT, targetWidth, targetHeight, kernelRadius, horizontal, sssSettings) {
         const device = ctx.device;
-        const sssNormalTexture = ctx.SSRNormalTexture ?? ctx.SSSParamTexture;
-        const hasNormalTexture = !!ctx.SSRNormalTexture;
+        const sssNormalTexture = ctx.SceneNormalTexture ?? ctx.SSSParamTexture;
+        const hasNormalTexture = !!ctx.SceneNormalTexture;
         const key = `${horizontal ? 'h' : 'v'}:${kernelRadius}`;
         let program = SSS._blurPrograms[key];
         if (!program) {
@@ -195,10 +198,10 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
     }
     combine(ctx, inputColorTexture, blurredTexture, sceneDepthTexture, profileLUT, srgbOutput) {
         const device = ctx.device;
-        const sssRoughnessTexture = ctx.SSRRoughnessTexture ?? ctx.SSSParamTexture;
-        const sssNormalTexture = ctx.SSRNormalTexture ?? ctx.SSSParamTexture;
-        const hasRoughnessTexture = !!ctx.SSRRoughnessTexture;
-        const hasNormalTexture = !!ctx.SSRNormalTexture;
+        const sssRoughnessTexture = ctx.SceneRoughnessTexture ?? ctx.SSSParamTexture;
+        const sssNormalTexture = ctx.SceneNormalTexture ?? ctx.SSSParamTexture;
+        const hasRoughnessTexture = !!ctx.SceneRoughnessTexture;
+        const hasNormalTexture = !!ctx.SceneNormalTexture;
         const shadowLight = this.getCombineShadowLight(ctx);
         const programKey = this.getCombineProgramKey(ctx, shadowLight);
         let program = SSS._combinePrograms[programKey];
@@ -218,7 +221,7 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
             y: 0,
             z: 1
         };
-        const sunColorIntensity = mainTransmissionLight ? mainTransmissionLight.diffuseAndIntensity : {
+        const sunColorIntensity = mainTransmissionLight ? ShaderHelper.getPreExposedColorIntensity(mainTransmissionLight, ctx) : {
             x: 1,
             y: 1,
             z: 1,
@@ -317,13 +320,13 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
                         sunDir.y,
                         sunDir.z
                     ]),
-                    envLightStrength: ctx.env?.light.strength ?? 0,
+                    envLightStrength: ShaderHelper.getEnvLightLuminance(ctx),
                     envLightSpecularStrength: ctx.env?.light.specularStrength ?? 1,
                     shadowStrength: shadowLight.shadow.shadowStrength,
                     shadowCascades: shadowMapParams.numShadowCascades,
                     positionAndRange: shadowLight.positionAndRange,
                     directionAndCutoff: shadowLight.directionAndCutoff,
-                    diffuseAndIntensity: shadowLight.diffuseAndIntensity,
+                    diffuseAndIntensity: ShaderHelper.getPreExposedColorIntensity(shadowLight, ctx),
                     extraParams: shadowLight.extraParams,
                     implParams: shadowMapParams.impl.getParams(),
                     cascadeDistances: shadowMapParams.cascadeDistances,
@@ -337,7 +340,7 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
         }
         device.setProgram(program);
         device.setBindGroup(0, bindGroup);
-        this.drawFullscreenQuad(AbstractPostEffect.getDefaultRenderState(ctx, 'gt'));
+        this.drawFullscreenQuad(AbstractPostEffect.getDefaultRenderState(ctx, DEPTH_COMPARE_FARTHER));
     }
     createBlurProgram(ctx, kernelRadius, horizontal) {
         const sampleCount = Math.max(1, Math.ceil(kernelRadius / 2));
@@ -347,7 +350,7 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
                 this.$inputs.pos = pb.vec2().attrib('position');
                 this.$outputs.uv = pb.vec2();
                 pb.main(function() {
-                    this.$builtins.position = pb.vec4(this.$inputs.pos, 1, 1);
+                    this.$builtins.position = pb.vec4(this.$inputs.pos, DEPTH_FARTHEST, 1);
                     this.$outputs.uv = pb.add(pb.mul(this.$inputs.pos.xy, 0.5), pb.vec2(0.5));
                     this.$if(pb.notEqual(this.flip, 0), function() {
                         this.$builtins.position.y = pb.neg(this.$builtins.position.y);
@@ -551,7 +554,7 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
                 this.$inputs.pos = pb.vec2().attrib('position');
                 this.$outputs.uv = pb.vec2();
                 pb.main(function() {
-                    this.$builtins.position = pb.vec4(this.$inputs.pos, 1, 1);
+                    this.$builtins.position = pb.vec4(this.$inputs.pos, DEPTH_FARTHEST, 1);
                     this.$outputs.uv = pb.add(pb.mul(this.$inputs.pos.xy, 0.5), pb.vec2(0.5));
                     this.$if(pb.notEqual(this.flip, 0), function() {
                         this.$builtins.position.y = pb.neg(this.$builtins.position.y);
@@ -741,8 +744,8 @@ import { AbstractPostEffect, PostEffectLayer } from './posteffect.js';
                     pb.float('linearDepth')
                 ], function() {
                     this.$l.viewDepth = pb.max(pb.mul(this.linearDepth, this.cameraNearFar.y), 1e-5);
-                    this.$l.nonLinearDepth = pb.div(pb.sub(pb.div(pb.mul(this.cameraNearFar.x, this.cameraNearFar.y), this.viewDepth), this.cameraNearFar.y), pb.sub(this.cameraNearFar.x, this.cameraNearFar.y));
-                    this.$l.clipPos = pb.vec4(pb.sub(pb.mul(this.uv, 2), pb.vec2(1)), pb.sub(pb.mul(pb.clamp(this.nonLinearDepth, 0, 1), 2), 1), 1);
+                    this.$l.nonLinearDepth = ShaderHelper.linearDepthToNonLinear(this, this.viewDepth, this.cameraNearFar);
+                    this.$l.clipPos = pb.vec4(pb.sub(pb.mul(this.uv, 2), pb.vec2(1)), ShaderHelper.deviceDepthToClipZ(this, pb.clamp(this.nonLinearDepth, 0, 1)), 1);
                     this.$l.viewPos = pb.mul(this.invProjMatrix, this.clipPos);
                     this.$return(pb.div(this.viewPos.xyz, pb.max(this.viewPos.w, 1e-5)));
                 });