@zephyr3d/scene 0.9.6 → 0.9.8

package/dist/shaders/shadow.js

@@ -2,307 +2,8 @@ import { hasDepthChannel } from '@zephyr3d/device';
 import { LIGHT_TYPE_DIRECTIONAL, LIGHT_TYPE_RECT, LIGHT_TYPE_POINT, LIGHT_TYPE_SPOT } from '../values.js';
 import { encodeNormalizedFloatToRGBA, decode2HalfFromRGBA, decodeNormalizedFloatFromRGBA } from './misc.js';
 import { ShaderHelper } from '../material/shader/helper.js';
-import { interleavedGradientNoise } from './noise.js';
 import { getDevice } from '../app/api.js';
 
-/*
-  const PCF_KERNEL_3x3 = [
-    [0.5, 1.0, 0.5],
-    [1.0, 1.0, 1.0],
-    [0.5, 1.0, 0.5]
-  ];
-  const PCF_KERNEL_SUM_3x3 = 7;
-
-  const PCF_KERNEL_5x5 = [
-    [0.0, 0.5, 1.0, 0.5, 0.0],
-    [0.5, 1.0, 1.0, 1.0, 0.5],
-    [1.0, 1.0, 1.0, 1.0, 1.0],
-    [0.5, 1.0, 1.0, 1.0, 0.5],
-    [0.0, 0.5, 1.0, 0.5, 0.0]
-  ];
-  const PCF_KERNEL_SUM_5x5 = 17;
-
-  const PCF_KERNEL_7x7 = [
-    [0.0, 0.0, 0.5, 1.0, 0.5, 0.0, 0.0],
-    [0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0],
-    [0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 0.5],
-    [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-    [0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 0.5],
-    [0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0],
-    [0.0, 0.0, 0.5, 1.0, 0.5, 0.0, 0.0]
-  ];
-  const PCF_KERNEL_SUM_7x7 = 33;
-
-  const PCF_KERNEL_9x9 = [
-    [0.0, 0.0, 0.0, 0.5, 1.0, 0.5, 0.0, 0.0, 0.0],
-    [0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 0.0],
-    [0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0],
-    [0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.5],
-    [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-    [0.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.5],
-    [0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0],
-    [0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 0.0],
-    [0.0, 0.0, 0.0, 0.5, 1.0, 0.5, 0.0, 0.0, 0.0]
-  ];
-  const PCF_KERNEL_SUM_9x9 = 53;
-  */ const PCF_POISSON_DISC = [
-    [
-        0.511749,
-        0.547686
-    ],
-    [
-        0.58929,
-        0.257224
-    ],
-    [
-        0.165018,
-        0.57663
-    ],
-    [
-        0.407692,
-        0.742285
-    ],
-    [
-        0.707012,
-        0.646523
-    ],
-    [
-        0.31463,
-        0.466825
-    ],
-    [
-        0.801257,
-        0.485186
-    ],
-    [
-        0.418136,
-        0.146517
-    ],
-    [
-        0.579889,
-        0.0368284
-    ],
-    [
-        0.79801,
-        0.140114
-    ],
-    [
-        -0.0413185,
-        0.371455
-    ],
-    [
-        -0.0529108,
-        0.627352
-    ],
-    [
-        0.0821375,
-        0.882071
-    ],
-    [
-        0.17308,
-        0.301207
-    ],
-    [
-        -0.120452,
-        0.867216
-    ],
-    [
-        0.371096,
-        0.916454
-    ],
-    [
-        -0.178381,
-        0.146101
-    ],
-    [
-        -0.276489,
-        0.550525
-    ],
-    [
-        0.12542,
-        0.126643
-    ],
-    [
-        -0.296654,
-        0.286879
-    ],
-    [
-        0.261744,
-        -604975e-8
-    ],
-    [
-        -0.213417,
-        0.715776
-    ],
-    [
-        0.425684,
-        -0.153211
-    ],
-    [
-        -0.480054,
-        0.321357
-    ],
-    [
-        -0.0717878,
-        -0.0250567
-    ],
-    [
-        -0.328775,
-        -0.169666
-    ],
-    [
-        -0.394923,
-        0.130802
-    ],
-    [
-        -0.553681,
-        -0.176777
-    ],
-    [
-        -0.722615,
-        0.120616
-    ],
-    [
-        -0.693065,
-        0.309017
-    ],
-    [
-        0.603193,
-        0.791471
-    ],
-    [
-        -0.0754941,
-        -0.297988
-    ],
-    [
-        0.109303,
-        -0.156472
-    ],
-    [
-        0.260605,
-        -0.280111
-    ],
-    [
-        0.129731,
-        -0.487954
-    ],
-    [
-        -0.537315,
-        0.520494
-    ],
-    [
-        -0.42758,
-        0.800607
-    ],
-    [
-        0.77309,
-        -0.0728102
-    ],
-    [
-        0.908777,
-        0.328356
-    ],
-    [
-        0.985341,
-        0.0759158
-    ],
-    [
-        0.947536,
-        -0.11837
-    ],
-    [
-        -0.103315,
-        -0.610747
-    ],
-    [
-        0.337171,
-        -0.584
-    ],
-    [
-        0.210919,
-        -0.720055
-    ],
-    [
-        0.41894,
-        -0.36769
-    ],
-    [
-        -0.254228,
-        -0.49368
-    ],
-    [
-        -0.428562,
-        -0.404037
-    ],
-    [
-        -0.831732,
-        -0.189615
-    ],
-    [
-        -0.922642,
-        0.0888026
-    ],
-    [
-        -0.865914,
-        0.427795
-    ],
-    [
-        0.706117,
-        -0.311662
-    ],
-    [
-        0.545465,
-        -0.520942
-    ],
-    [
-        -0.695738,
-        0.664492
-    ],
-    [
-        0.389421,
-        -0.899007
-    ],
-    [
-        0.48842,
-        -0.708054
-    ],
-    [
-        0.760298,
-        -0.62735
-    ],
-    [
-        -0.390788,
-        -0.707388
-    ],
-    [
-        -0.591046,
-        -0.686721
-    ],
-    [
-        -0.769903,
-        -0.413775
-    ],
-    [
-        -0.604457,
-        -0.502571
-    ],
-    [
-        -0.557234,
-        0.00451362
-    ],
-    [
-        0.147572,
-        -0.924353
-    ],
-    [
-        -0.0662488,
-        -0.892081
-    ],
-    [
-        0.863832,
-        -0.4072
-    ]
-];
 function getShadowMapTexelSize(scope) {
     return scope.$builder.div(1, ShaderHelper.getShadowCameraParams(scope).z);
 }
@@ -355,23 +56,8 @@ function getShadowMapSize(scope) {
     });
     return pb.getGlobalScope()[funcNameComputeReceiverPlaneDepthBias](texCoord);
 }
-function getRandomRotationMatrix(scope, fragCoord) {
-    const funcNameGetRandomRotationMatrix = 'lib_getRandomRotationMatrix';
-    const pb = scope.$builder;
-    pb.func(funcNameGetRandomRotationMatrix, [
-        pb.vec2('fragCoord')
-    ], function() {
-        this.$l.randomAngle = pb.mul(interleavedGradientNoise(this, fragCoord), 2 * Math.PI);
-        this.$l.randomBase = pb.vec2(pb.cos(this.randomAngle), pb.sin(this.randomAngle));
-        this.$return(pb.mat2(this.randomBase.x, this.randomBase.y, pb.neg(this.randomBase.y), this.randomBase.x));
-    });
-    return pb.getGlobalScope()[funcNameGetRandomRotationMatrix](fragCoord);
-}
-function getPoissonDiscSampleRadius(scope) {
-    return ShaderHelper.getDepthBiasValues(scope).z;
-}
 function sampleShadowMapPCF(scope, shadowMapFormat, pos, offset, depth, cascade) {
-    const funcName = cascade ? 'lib_sampleShadowMapCascadePCF' : 'lib_sampleShadowMapPCF';
+    const funcName = `${cascade ? 'lib_sampleShadowMapCascadePCF' : 'lib_sampleShadowMapPCF'}_${shadowMapFormat}`;
     const pb = scope.$builder;
     const nativeShadowMap = hasDepthChannel(shadowMapFormat);
     pb.func(funcName, [
@@ -398,57 +84,26 @@ function sampleShadowMapPCF(scope, shadowMapFormat, pos, offset, depth, cascade)
         cascade
     ] : []);
 }
-function sampleShadowMap(scope, lightType, shadowMapFormat, pos, depth, cascade) {
-    const funcNameSampleShadowMap = 'lib_sampleShadowMap';
-    const pb = scope.$builder;
-    const nativeShadowMap = hasDepthChannel(shadowMapFormat);
-    pb.func(funcNameSampleShadowMap, [
-        lightType === LIGHT_TYPE_POINT ? pb.vec3('coords') : pb.vec2('coords'),
-        pb.float('z'),
-        ...cascade ? [
-            pb.int('cascade')
-        ] : []
-    ], function() {
-        if (lightType === LIGHT_TYPE_POINT) {
-            if (nativeShadowMap) {
-                this.$return(pb.clamp(pb.textureSampleCompareLevel(ShaderHelper.getShadowMap(this), this.coords, this.z), 0, 1));
-            } else {
-                this.$l.shadowTex = pb.textureSampleLevel(ShaderHelper.getShadowMap(this), this.coords, 0);
-                if (shadowMapFormat === 'rgba8unorm') {
-                    this.shadowTex.x = decodeNormalizedFloatFromRGBA(this, this.shadowTex);
-                }
-                this.$return(pb.step(this.z, this.shadowTex.x));
-            }
-        } else {
-            if (nativeShadowMap) {
-                this.$return(cascade && getDevice().type !== 'webgl' ? pb.textureArraySampleCompareLevel(ShaderHelper.getShadowMap(this), this.coords, this.cascade, this.z) : pb.textureSampleCompareLevel(ShaderHelper.getShadowMap(this), this.coords, this.z));
-            } else {
-                this.$l.shadowTex = cascade && getDevice().type !== 'webgl' ? pb.textureArraySampleLevel(ShaderHelper.getShadowMap(this), this.coords, this.cascade, 0) : pb.textureSampleLevel(ShaderHelper.getShadowMap(this), this.coords, 0);
-                if (shadowMapFormat === 'rgba8unorm') {
-                    this.shadowTex.x = decodeNormalizedFloatFromRGBA(this, this.shadowTex);
-                }
-                this.$return(pb.step(this.z, this.shadowTex.x));
-            }
-        }
-    });
-    return cascade ? pb.getGlobalScope()[funcNameSampleShadowMap](pos, depth, cascade) : pb.getGlobalScope()[funcNameSampleShadowMap](pos, depth);
-}
 function chebyshevUpperBound(scope, distance, occluder) {
     const funcNameChebyshevUpperBound = 'lib_chebyshevUpperBound';
     const pb = scope.$builder;
     pb.func(funcNameChebyshevUpperBound, [
         pb.float('distance'),
-        pb.vec2('occluder')
+        pb.vec3('occluder')
     ], function() {
         this.$l.shadow = pb.float(1);
-        this.$l.test = pb.step(this.distance, this.occluder.x);
+        this.$l.coverage = this.occluder.z;
+        this.$l.invCoverage = pb.div(1, pb.max(this.coverage, 0.00001));
+        this.$l.moments = pb.mul(this.occluder.xy, this.invCoverage);
+        this.$l.test = pb.step(this.distance, this.moments.x);
         this.$if(pb.notEqual(this.test, 1), function() {
-            this.$l.d = pb.sub(this.distance, this.occluder.x);
-            this.$l.variance = pb.max(pb.mul(this.occluder.y, this.occluder.y), 0);
+            this.$l.d = pb.sub(this.distance, this.moments.x);
+            this.$l.variance = pb.max(pb.sub(this.moments.y, pb.mul(this.moments.x, this.moments.x)), 0.000002);
             const darkness = ShaderHelper.getDepthBiasValues(this).z;
             this.shadow = pb.div(this.variance, pb.add(this.variance, pb.mul(this.d, this.d)));
             this.shadow = pb.clamp(pb.div(pb.sub(this.shadow, darkness), pb.sub(1, darkness)), 0, 1);
         });
+        this.shadow = pb.mix(1, this.shadow, pb.clamp(this.coverage, 0, 1));
         this.$return(this.shadow);
     });
     return pb.getGlobalScope()[funcNameChebyshevUpperBound](distance, occluder);
@@ -464,27 +119,30 @@ function chebyshevUpperBound(scope, distance, occluder) {
     ], function() {
         if (lightType === LIGHT_TYPE_POINT) {
             this.$l.shadowTex = pb.textureSampleLevel(ShaderHelper.getShadowMap(this), this.texCoord.xyz, 0);
-            this.$return(chebyshevUpperBound(this, this.texCoord.w, shadowMapFormat === 'rgba8unorm' ? decode2HalfFromRGBA(this, this.shadowTex) : this.shadowTex.rg));
+            this.$return(chebyshevUpperBound(this, this.texCoord.w, shadowMapFormat === 'rgba8unorm' ? pb.vec3(decode2HalfFromRGBA(this, this.shadowTex), 1) : this.shadowTex.rgb));
         } else {
             if (getDevice().type !== 'webgl' && cascade) {
                 this.$l.shadowTex = pb.textureArraySampleLevel(ShaderHelper.getShadowMap(this), this.texCoord.xy, this.cascade, 0);
             } else {
                 this.$l.shadowTex = pb.textureSampleLevel(ShaderHelper.getShadowMap(this), this.texCoord.xy, 0);
             }
-            this.$return(chebyshevUpperBound(this, this.texCoord.z, shadowMapFormat === 'rgba8unorm' ? decode2HalfFromRGBA(this, this.shadowTex) : this.shadowTex.rg));
+            this.$return(chebyshevUpperBound(this, this.texCoord.z, shadowMapFormat === 'rgba8unorm' ? pb.vec3(decode2HalfFromRGBA(this, this.shadowTex), 1) : this.shadowTex.rgb));
         }
     });
     return pb.getGlobalScope()[funcNameFilterShadowVSM](texCoord, ...cascade ? [
         cascade
     ] : []);
 }
-/** @internal */ function filterShadowESM(scope, lightType, shadowMapFormat, shadowVertex, cascade) {
+/** @internal */ function filterShadowESM(scope, lightType, shadowMapFormat, logSpace, shadowVertex, cascade, depthBias) {
     const funcNameFilterShadowESM = 'lib_filterShadowESM';
     const pb = scope.$builder;
     pb.func(funcNameFilterShadowESM, [
         lightType === LIGHT_TYPE_POINT ? pb.vec3('shadowVertex') : pb.vec4('shadowVertex'),
         ...cascade ? [
             pb.int('cascade')
+        ] : [],
+        ...depthBias ? [
+            pb.float('depthBias')
         ] : []
     ], function() {
         if (lightType === LIGHT_TYPE_POINT) {
@@ -509,11 +167,20 @@ function chebyshevUpperBound(scope, distance, occluder) {
                 this.$l.depth = this.shadowVertex.z;
             }
         }
+        if (depthBias) {
+            this.depth = pb.max(0, pb.sub(this.depth, this.depthBias));
+        }
         const depthScale = ShaderHelper.getDepthBiasValues(this).z;
-        this.$return(pb.clamp(pb.exp(pb.min(87, pb.mul(depthScale, pb.sub(this.shadowTex.x, this.depth)))), 0, 1));
+        this.$l.shadow = logSpace ? pb.clamp(pb.exp(pb.min(87, pb.sub(this.shadowTex.x, pb.mul(depthScale, this.depth)))), 0, 1) : pb.clamp(pb.exp(pb.min(87, pb.mul(depthScale, pb.sub(this.shadowTex.x, this.depth)))), 0, 1);
+        if (shadowMapFormat !== 'rgba8unorm') {
+            this.shadow = pb.mix(1, this.shadow, pb.clamp(this.shadowTex.y, 0, 1));
+        }
+        this.$return(this.shadow);
     });
     return pb.getGlobalScope()[funcNameFilterShadowESM](shadowVertex, ...cascade ? [
         cascade
+    ] : [], ...depthBias ? [
+        depthBias
     ] : []);
 }
 /** @internal */ function filterShadowPCF(scope, lightType, shadowMapFormat, kernelSize, texCoord, receiverPlaneDepthBias, cascade) {
@@ -597,40 +264,6 @@ function chebyshevUpperBound(scope, distance, occluder) {
         cascade
     ] : []);
 }
-/** @internal */ function filterShadowPoissonDisc(scope, lightType, shadowMapFormat, tapCount, texCoord, receiverPlaneDepthBias, cascade) {
-    const funcNameFilterShadowPoissonDisc = 'lib_filterShadowPoissonDisc';
-    const pb = scope.$builder;
-    pb.func(funcNameFilterShadowPoissonDisc, [
-        pb.vec4('texCoord'),
-        ...receiverPlaneDepthBias ? [
-            pb.vec3('receiverPlaneDepthBias')
-        ] : [],
-        ...cascade ? [
-            pb.int('cascade')
-        ] : []
-    ], function() {
-        this.$l.lightDepth = this.texCoord.z;
-        if (receiverPlaneDepthBias) {
-            this.lightDepth = pb.sub(this.lightDepth, this.receiverPlaneDepthBias.z);
-        }
-        this.$l.duv = pb.vec2();
-        this.$l.filterRadius = pb.mul(getShadowMapTexelSize(this), getPoissonDiscSampleRadius(this));
-        this.$l.matrix = getRandomRotationMatrix(this, this.$builtins.fragCoord.xy);
-        this.$l.shadow = pb.float(0);
-        for(let i = 0; i < tapCount; i++){
-            this.duv = pb.mul(this.matrix, pb.mul(pb.vec2(PCF_POISSON_DISC[i][0], PCF_POISSON_DISC[i][1]), this.filterRadius));
-            const sampleDepth = receiverPlaneDepthBias ? pb.add(this.lightDepth, pb.dot(this.duv, this.receiverPlaneDepthBias.xy)) : this.lightDepth;
-            this.shadow = pb.add(this.shadow, sampleShadowMap(this, lightType, shadowMapFormat, pb.add(this.texCoord.xy, this.duv), sampleDepth, this.cascade));
-        }
-        this.shadow = pb.div(this.shadow, tapCount);
-        this.$return(this.shadow);
-    });
-    return pb.getGlobalScope()[funcNameFilterShadowPoissonDisc](texCoord, ...receiverPlaneDepthBias ? [
-        receiverPlaneDepthBias
-    ] : [], ...cascade ? [
-        cascade
-    ] : []);
-}
 
-export { computeReceiverPlaneDepthBias, computeShadowMapDepth, filterShadowESM, filterShadowPCF, filterShadowPoissonDisc, filterShadowVSM };
+export { computeReceiverPlaneDepthBias, computeShadowMapDepth, filterShadowESM, filterShadowPCF, filterShadowVSM };
 //# sourceMappingURL=shadow.js.map