@react-three/postprocessing 2.14.9 → 2.14.11

package/dist/index.js

@@ -912,7 +912,7 @@ void main() {
     #define SAMPLES 16
     #define FSAMPLES 16.0
 uniform sampler2D sceneDiffuse;
-uniform sampler2D sceneNormal;
+uniform highp sampler2D sceneNormal;
 uniform highp sampler2D sceneDepth;
 uniform mat4 projectionMatrixInv;
 uniform mat4 viewMatrixInv;
@@ -962,7 +962,7 @@ uniform sampler2D bluenoise;
       float b = farZ * nearZ / (nearZ - farZ);
       float linDepth = a + b / depth;
       vec4 clipVec = vec4(uv, linDepth, 1.0) * 2.0 - 1.0;
-      vec4 wpos = viewMatrixInv * projectionMatrixInv * clipVec;
+      vec4 wpos = projectionMatrixInv * clipVec;
       return wpos.xyz / wpos.w;
     }
     vec3 getWorldPos(float depth, vec2 coord) {
@@ -973,7 +973,7 @@ uniform sampler2D bluenoise;
       vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);
       vec4 viewSpacePosition = projectionMatrixInv * clipSpacePosition;
       // Perspective division
-     vec4 worldSpacePosition = viewMatrixInv * viewSpacePosition;
+     vec4 worldSpacePosition = viewSpacePosition;
      worldSpacePosition.xyz /= worldSpacePosition.w;
       return worldSpacePosition.xyz;
   }
@@ -1052,7 +1052,7 @@ void main() {
         ;
         float moveAmt = samplesR[int(mod(i + noise.a * FSAMPLES, FSAMPLES))];
         vec3 samplePos = worldPos + radiusToUse * moveAmt * sampleDirection;
-        vec4 offset = projViewMat * vec4(samplePos, 1.0);
+        vec4 offset = projMat * vec4(samplePos, 1.0);
         offset.xyz /= offset.w;
         offset.xyz = offset.xyz * 0.5 + 0.5;
         float sampleDepth = textureLod(sceneDepth, offset.xy, 0.0).x;
@@ -1155,6 +1155,24 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
     },
     "distanceFalloff": {
       value: 1
+    },
+    "fog": {
+      value: false
+    },
+    "fogExp": {
+      value: false
+    },
+    "fogDensity": {
+      value: 0
+    },
+    "fogNear": {
+      value: Infinity
+    },
+    "fogFar": {
+      value: Infinity
+    },
+    "colorMultiply": {
+      value: true
     }
   },
   vertexShader: (
@@ -1170,8 +1188,8 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
     /* glsl */
     `
 		uniform sampler2D sceneDiffuse;
-    uniform sampler2D sceneDepth;
-    uniform sampler2D downsampledDepth;
+    uniform highp sampler2D sceneDepth;
+    uniform highp sampler2D downsampledDepth;
     uniform sampler2D tDiffuse;
     uniform sampler2D blueNoise;
     uniform vec2 resolution;
@@ -1186,8 +1204,15 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
     uniform bool logDepth;
     uniform bool ortho;
     uniform bool screenSpaceRadius;
+    uniform bool fog;
+    uniform bool fogExp;
+    uniform bool colorMultiply;
+    uniform float fogDensity;
+    uniform float fogNear;
+    uniform float fogFar;
     uniform float radius;
     uniform float distanceFalloff;
+    uniform vec3 cameraPos;
     varying vec2 vUv;
     highp float linearize_depth(highp float d, highp float zNear,highp float zFar)
     {
@@ -1217,7 +1242,7 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
         float b = farZ * nearZ / (nearZ - farZ);
         float linDepth = a + b / depth;
         vec4 clipVec = vec4(uv, linDepth, 1.0) * 2.0 - 1.0;
-        vec4 wpos = viewMatrixInv * projectionMatrixInv * clipVec;
+        vec4 wpos = projectionMatrixInv * clipVec;
         return wpos.xyz / wpos.w;
       }
       vec3 getWorldPos(float depth, vec2 coord) {
@@ -1230,7 +1255,7 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
         vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);
         vec4 viewSpacePosition = projectionMatrixInv * clipSpacePosition;
         // Perspective division
-       vec4 worldSpacePosition = viewMatrixInv * viewSpacePosition;
+       vec4 worldSpacePosition = viewSpacePosition;
        worldSpacePosition.xyz /= worldSpacePosition.w;
         return worldSpacePosition.xyz;
     }
@@ -1267,12 +1292,11 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
     void main() {
         //vec4 texel = texture2D(tDiffuse, vUv);//vec3(0.0);
         vec4 sceneTexel = texture2D(sceneDiffuse, vUv);
-
-        #ifdef HALFRES 
         float depth = texture2D(
             sceneDepth,
             vUv
         ).x;
+        #ifdef HALFRES 
         vec4 texel;
         if (depth == 1.0) {
             texel = vec4(0.0, 0.0, 0.0, 1.0);
@@ -1320,10 +1344,24 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
 
      
         float finalAo = pow(texel.a, intensity);
+        float fogFactor;
+        float fogDepth = distance(
+            cameraPos,
+            getWorldPos(depth, vUv)
+        );
+        if (fog) {
+            if (fogExp) {
+                fogFactor = 1.0 - exp( - fogDensity * fogDensity * fogDepth * fogDepth );
+            } else {
+                fogFactor = smoothstep( fogNear, fogFar, fogDepth );
+            }
+        }
+        finalAo = mix(finalAo, 1.0, fogFactor);
+        vec3 aoApplied = color * mix(vec3(1.0), sceneTexel.rgb, float(colorMultiply));
         if (renderMode == 0.0) {
-            gl_FragColor = vec4( mix(sceneTexel.rgb, color * sceneTexel.rgb, 1.0 - finalAo), sceneTexel.a);
+            gl_FragColor = vec4( mix(sceneTexel.rgb, aoApplied, 1.0 - finalAo), sceneTexel.a);
         } else if (renderMode == 1.0) {
-            gl_FragColor = vec4( mix(vec3(1.0), color * sceneTexel.rgb, 1.0 - finalAo), sceneTexel.a);
+            gl_FragColor = vec4( mix(vec3(1.0), aoApplied, 1.0 - finalAo), sceneTexel.a);
         } else if (renderMode == 2.0) {
             gl_FragColor = vec4( sceneTexel.rgb, sceneTexel.a);
         } else if (renderMode == 3.0) {
@@ -1332,7 +1370,7 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
             } else if (abs(vUv.x - 0.5) < 1.0 / resolution.x) {
                 gl_FragColor = vec4(1.0);
             } else {
-                gl_FragColor = vec4( mix(sceneTexel.rgb, color * sceneTexel.rgb, 1.0 - finalAo), sceneTexel.a);
+                gl_FragColor = vec4( mix(sceneTexel.rgb, aoApplied, 1.0 - finalAo), sceneTexel.a);
             }
         } else if (renderMode == 4.0) {
             if (vUv.x < 0.5) {
@@ -1340,7 +1378,7 @@ const $12b21d24d1192a04$export$a815acccbd2c9a49 = {
             } else if (abs(vUv.x - 0.5) < 1.0 / resolution.x) {
                 gl_FragColor = vec4(1.0);
             } else {
-                gl_FragColor = vec4( mix(vec3(1.0), color * sceneTexel.rgb, 1.0 - finalAo), sceneTexel.a);
+                gl_FragColor = vec4( mix(vec3(1.0), aoApplied, 1.0 - finalAo), sceneTexel.a);
             }
         }
         #include <dithering_fragment>
@@ -1472,7 +1510,7 @@ const $e52378cd0f5a973d$export$57856b59f317262e = {
      float b = farZ * nearZ / (nearZ - farZ);
      float linDepth = a + b / depth;
      vec4 clipVec = vec4(uv, linDepth, 1.0) * 2.0 - 1.0;
-     vec4 wpos = viewMatrixInv * projectionMatrixInv * clipVec;
+     vec4 wpos = projectionMatrixInv * clipVec;
      return wpos.xyz / wpos.w;
    }
     vec3 getWorldPos(float depth, vec2 coord) {
@@ -1484,7 +1522,7 @@ const $e52378cd0f5a973d$export$57856b59f317262e = {
         vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);
         vec4 viewSpacePosition = projectionMatrixInv * clipSpacePosition;
         // Perspective division
-       vec4 worldSpacePosition = viewMatrixInv * viewSpacePosition;
+       vec4 worldSpacePosition = viewSpacePosition;
        worldSpacePosition.xyz /= worldSpacePosition.w;
         return worldSpacePosition.xyz;
     }
@@ -1501,6 +1539,10 @@ const $e52378cd0f5a973d$export$57856b59f317262e = {
         vec3 normal = data.rgb * 2.0 - 1.0;
         float count = 1.0;
         float d = texture2D(sceneDepth, vUv).x;
+        if (d == 1.0) {
+          gl_FragColor = data;
+          return;
+        }
         vec3 worldPos = getWorldPos(d, vUv);
         float size = radius;
         float angle;
@@ -1533,7 +1575,7 @@ const $e52378cd0f5a973d$export$57856b59f317262e = {
             float dSample = texture2D(sceneDepth, uv + offset).x;
             vec3 worldPosSample = getWorldPos(dSample, uv + offset);
             float tangentPlaneDist = abs(dot(worldPos - worldPosSample, normal));
-            float rangeCheck = exp(-1.0 * tangentPlaneDist * (1.0 / distanceFalloffToUse)) * max(dot(normal, normalSample), 0.0) * (1.0 - abs(occSample - baseOcc));
+            float rangeCheck = dSample == 1.0 ? 0.0 :exp(-1.0 * tangentPlaneDist * (1.0 / distanceFalloffToUse)) * max(dot(normal, normalSample), 0.0) * (1.0 - abs(occSample - baseOcc));
             occlusion += occSample * rangeCheck;
             count += rangeCheck;
         }
@@ -1579,7 +1621,7 @@ const $26aca173e0984d99$export$1efdf491687cd442 = {
   fragmentShader: (
     /* glsl */
     `
-    uniform sampler2D sceneDepth;
+    uniform highp sampler2D sceneDepth;
     uniform vec2 resolution;
     uniform float near;
     uniform float far;
@@ -1598,7 +1640,7 @@ const $26aca173e0984d99$export$1efdf491687cd442 = {
         float b = farZ * nearZ / (nearZ - farZ);
         float linDepth = a + b / depth;
         vec4 clipVec = vec4(uv, linDepth, 1.0) * 2.0 - 1.0;
-        vec4 wpos = viewMatrixInv * projectionMatrixInv * clipVec;
+        vec4 wpos = projectionMatrixInv * clipVec;
         return wpos.xyz / wpos.w;
       }
       vec3 getWorldPos(float depth, vec2 coord) {
@@ -1609,7 +1651,7 @@ const $26aca173e0984d99$export$1efdf491687cd442 = {
         vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);
         vec4 viewSpacePosition = projectionMatrixInv * clipSpacePosition;
         // Perspective division
-       vec4 worldSpacePosition = viewMatrixInv * viewSpacePosition;
+       vec4 worldSpacePosition = viewSpacePosition;
        worldSpacePosition.xyz /= worldSpacePosition.w;
         return worldSpacePosition.xyz;
     }
@@ -1764,7 +1806,8 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
       logarithmicDepthBuffer: false,
       screenSpaceRadius: false,
       halfRes: false,
-      depthAwareUpsampling: true
+      depthAwareUpsampling: true,
+      colorMultiply: true
     }, {
       set: (target, propName, value) => {
         const oldProp = target[propName];
@@ -1798,6 +1841,7 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
           value: null
         }
       },
+      depthWrite: false,
       vertexShader: `
             varying vec2 vUv;
             void main() {
@@ -1823,6 +1867,11 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
       magFilter: LinearFilter,
       depthBuffer: false
     });
+    this.outputTargetInternal = new WebGLRenderTarget(this.width, this.height, {
+      minFilter: LinearFilter,
+      magFilter: LinearFilter,
+      depthBuffer: false
+    });
     this.bluenoise = new DataTexture($87431ee93b037844$var$bluenoiseBits, 128, 128);
     this.bluenoise.colorSpace = NoColorSpace;
     this.bluenoise.wrapS = RepeatWrapping;
@@ -1832,6 +1881,7 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
     this.bluenoise.needsUpdate = true;
     this.lastTime = 0;
     this.needsDepthTexture = true;
+    this.needsSwap = true;
     this._r = new Vector2();
     this._c = new Color();
   }
@@ -1972,6 +2022,7 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
     this.readTargetInternal.setSize(width * c, height * c);
     if (this.configuration.halfRes)
       this.depthDownsampleTarget.setSize(width * c, height * c);
+    this.outputTargetInternal.setSize(width, height);
   }
   setDepthTexture(depthTexture) {
     this.depthTexture = depthTexture;
@@ -1985,6 +2036,10 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
       this.configureDenoisePass(this.configuration.logarithmicDepthBuffer);
       this.configureEffectCompositer(this.configuration.logarithmicDepthBuffer);
     }
+    if (inputBuffer.texture.type !== this.outputTargetInternal.texture.type) {
+      this.outputTargetInternal.texture.type = inputBuffer.texture.type;
+      this.outputTargetInternal.texture.needsUpdate = true;
+    }
     let gl;
     let ext;
     let timerQuery;
@@ -2024,7 +2079,7 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
     this.effectShaderQuad.material.uniforms["projViewMat"].value = this.camera.projectionMatrix.clone().multiply(this.camera.matrixWorldInverse.clone());
     this.effectShaderQuad.material.uniforms["projectionMatrixInv"].value = this.camera.projectionMatrixInverse;
     this.effectShaderQuad.material.uniforms["viewMatrixInv"].value = this.camera.matrixWorld;
-    this.effectShaderQuad.material.uniforms["cameraPos"].value = this.camera.position;
+    this.effectShaderQuad.material.uniforms["cameraPos"].value = this.camera.getWorldPosition(new Vector3());
     this.effectShaderQuad.material.uniforms["resolution"].value = this.configuration.halfRes ? this._r.clone().multiplyScalar(0.5).floor() : this._r;
     this.effectShaderQuad.material.uniforms["time"].value = performance.now() / 1e3;
     this.effectShaderQuad.material.uniforms["samples"].value = this.samples;
@@ -2050,7 +2105,7 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
       this.poissonBlurQuad.material.uniforms["viewMat"].value = this.camera.matrixWorldInverse;
       this.poissonBlurQuad.material.uniforms["projectionMatrixInv"].value = this.camera.projectionMatrixInverse;
       this.poissonBlurQuad.material.uniforms["viewMatrixInv"].value = this.camera.matrixWorld;
-      this.poissonBlurQuad.material.uniforms["cameraPos"].value = this.camera.position;
+      this.poissonBlurQuad.material.uniforms["cameraPos"].value = this.camera.getWorldPosition(new Vector3());
       this.poissonBlurQuad.material.uniforms["resolution"].value = this.configuration.halfRes ? this._r.clone().multiplyScalar(0.5).floor() : this._r;
       this.poissonBlurQuad.material.uniforms["time"].value = performance.now() / 1e3;
       this.poissonBlurQuad.material.uniforms["blueNoise"].value = this.bluenoise;
@@ -2085,8 +2140,29 @@ class $87431ee93b037844$export$2489f9981ab0fa82 extends Pass {
     this.effectCompositerQuad.material.uniforms["gammaCorrection"].value = this.autosetGamma ? this.renderToScreen : this.configuration.gammaCorrection;
     this.effectCompositerQuad.material.uniforms["tDiffuse"].value = this.writeTargetInternal.texture;
     this.effectCompositerQuad.material.uniforms["color"].value = this._c.copy(this.configuration.color).convertSRGBToLinear();
-    renderer.setRenderTarget(this.renderToScreen ? null : outputBuffer);
+    this.effectCompositerQuad.material.uniforms["colorMultiply"].value = this.configuration.colorMultiply;
+    this.effectCompositerQuad.material.uniforms["cameraPos"].value = this.camera.getWorldPosition(new Vector3());
+    this.effectCompositerQuad.material.uniforms["fog"].value = !!this.scene.fog;
+    if (this.scene.fog) {
+      if (this.scene.fog.isFog) {
+        this.effectCompositerQuad.material.uniforms["fogExp"].value = false;
+        this.effectCompositerQuad.material.uniforms["fogNear"].value = this.scene.fog.near;
+        this.effectCompositerQuad.material.uniforms["fogFar"].value = this.scene.fog.far;
+      } else if (this.scene.fog.isFogExp2) {
+        this.effectCompositerQuad.material.uniforms["fogExp"].value = true;
+        this.effectCompositerQuad.material.uniforms["fogDensity"].value = this.scene.fog.density;
+      } else
+        console.error(`Unsupported fog type ${this.scene.fog.constructor.name} in SSAOPass.`);
+    }
+    renderer.setRenderTarget(
+      /* this.renderToScreen ? null :
+      outputBuffer*/
+      this.outputTargetInternal
+    );
     this.effectCompositerQuad.render(renderer);
+    renderer.setRenderTarget(this.renderToScreen ? null : outputBuffer);
+    this.copyQuad.material.uniforms["tDiffuse"].value = this.outputTargetInternal.texture;
+    this.copyQuad.render(renderer);
     if (this.debugMode) {
       gl.endQuery(ext.TIME_ELAPSED_EXT);
       $87431ee93b037844$var$checkTimerQuery(timerQuery, gl, this);