support ortho camera + logdepth

N8python · Sep 17, 2024 · 8dbe33e · 8dbe33e
1 parent 0fd05e9
commit 8dbe33e
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 24 deletions.
diff --git a/dist/N8AO.js b/dist/N8AO.js
diff --git a/dist/N8AO.js.map b/dist/N8AO.js.map
diff --git a/example/N8AO.js b/example/N8AO.js
diff --git a/example/N8AO.js.map b/example/N8AO.js.map
diff --git a/example_postprocessing/N8AO.js b/example_postprocessing/N8AO.js
diff --git a/example_postprocessing/N8AO.js.map b/example_postprocessing/N8AO.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "n8ao",
-    "version": "1.9.1",
+    "version": "1.9.2",
     "description": "An efficient and visually pleasing implementation of SSAO with an emphasis on temporal stability and artist control.",
     "main": "dist/N8AO.js",
     "scripts": {

diff --git a/src/DepthDownSample.js b/src/DepthDownSample.js
@@ -9,6 +9,7 @@ const DepthDownSample = {
         'viewMatrixInv': { value: new THREE.Matrix4() },
         'projectionMatrixInv': { value: new THREE.Matrix4() },
         'logDepth': { value: false },
+        'ortho': { value: false }
     },
     depthWrite: false,
     depthTest: false,
@@ -25,6 +26,7 @@ const DepthDownSample = {
     uniform float near;
     uniform float far;
     uniform bool logDepth;
+    uniform bool ortho;
     uniform mat4 viewMatrixInv;
     uniform mat4 projectionMatrixInv;
     varying vec2 vUv;
@@ -43,7 +45,7 @@ const DepthDownSample = {
         return wpos.xyz / wpos.w;
       }
       vec3 getWorldPos(float depth, vec2 coord) {
-        if (logDepth) {
+        if (logDepth && !ortho) {
           return getWorldPosLog(vec3(coord, depth));
         }
         float z = depth * 2.0 - 1.0;

diff --git a/src/EffectCompositer.js b/src/EffectCompositer.js
@@ -114,7 +114,9 @@ const EffectCompositer = {
       vec3 getWorldPos(float depth, vec2 coord) {
        // if (logDepth) {
         #ifdef LOGDEPTH
-          return getWorldPosLog(vec3(coord, depth));
+          #ifndef ORTHO
+            return getWorldPosLog(vec3(coord, depth));
+          #endif
         #endif
       //  }
         float z = depth * 2.0 - 1.0;