Examples: GTAOPass - distance dependent horizon search (#710)

* Examples: GTAOPass - distance dependent horizon search * Update three.js * Add examples * Update changes.patch * Delete examples
three-types · Dec 15, 2023 · 9b3a42d · 9b3a42d
1 parent 9b9e9d1
commit 9b3a42d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch
@@ -10938,7 +10938,7 @@ index 47e89f6..4329bfe 100644
          renderer.setRenderTarget(null);
          renderer.clear();
 diff --git a/examples-testing/examples/webgl_postprocessing_gtao.ts b/examples-testing/examples/webgl_postprocessing_gtao.ts
-index 8993081..67c578c 100644
+index e004cea..d4483b3 100644
 --- a/examples-testing/examples/webgl_postprocessing_gtao.ts
 +++ b/examples-testing/examples/webgl_postprocessing_gtao.ts
 @@ -10,7 +10,14 @@ import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
@@ -12205,10 +12205,10 @@ index 122fa84..e539bef 100644
          if (morph.position.x > 2000) {
              morph.position.x = -1000 - Math.random() * 500;
 diff --git a/examples-testing/examples/webgl_shadowmap_csm.ts b/examples-testing/examples/webgl_shadowmap_csm.ts
-index f9df4ab..d2646fa 100644
+index bdcd49f..0fc8a64 100644
 --- a/examples-testing/examples/webgl_shadowmap_csm.ts
 +++ b/examples-testing/examples/webgl_shadowmap_csm.ts
-@@ -2,12 +2,31 @@ import * as THREE from 'three';
+@@ -2,12 +2,32 @@ import * as THREE from 'three';
 
  import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
  import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
@@ -12230,6 +12230,7 @@ index f9df4ab..d2646fa 100644
 +const params: {
 +    orthographic: boolean;
 +    fade: boolean;
++    shadows: boolean;
 +    far: number;
 +    mode: CSMMode;
 +    lightX: number;
@@ -12243,7 +12244,18 @@ index f9df4ab..d2646fa 100644
 +} = {
      orthographic: false,
      fade: false,
-     far: 1000,
+     shadows: true,
+@@ -133,8 +153,8 @@ function init() {
+         renderer.shadowMap.enabled = value;
+
+         scene.traverse(function (child) {
+-            if (child.material) {
+-                child.material.needsUpdate = true;
++            if ((child as THREE.Mesh<THREE.BufferGeometry, THREE.Material>).material) {
++                (child as THREE.Mesh<THREE.BufferGeometry, THREE.Material>).material.needsUpdate = true;
+             }
+         });
+     });
 diff --git a/examples-testing/examples/webgl_shadowmap_pcss.ts b/examples-testing/examples/webgl_shadowmap_pcss.ts
 index 91ba360..230059a 100644
 --- a/examples-testing/examples/webgl_shadowmap_pcss.ts

diff --git a/examples-testing/index.js b/examples-testing/index.js
@@ -345,8 +345,10 @@ const files = {
         'webgpu_loader_gltf_compressed',
         'webgpu_loader_gltf_iridescence',
         'webgpu_loader_gltf_sheen',
+        // 'webgpu_loader_materialx',
         // 'webgpu_materials',
         'webgpu_materials_video',
+        // 'webgpu_materialx_noise',
         // 'webgpu_multiple_rendertargets',
         'webgpu_morphtargets',
         'webgpu_morphtargets_face',

diff --git a/three.js b/three.js
diff --git a/types/three/examples/jsm/postprocessing/GTAOPass.d.ts b/types/three/examples/jsm/postprocessing/GTAOPass.d.ts
@@ -69,6 +69,7 @@ export class GTAOPass extends Pass {
         radius?: number | undefined;
         distanceExponent?: number | undefined;
         thickness?: number | undefined;
+        distanceFallOff?: number | undefined;
         scale?: number | undefined;
         samples?: number | undefined;
         screenSpaceRadius?: boolean | undefined;

diff --git a/types/three/examples/jsm/shaders/GTAOShader.d.ts b/types/three/examples/jsm/shaders/GTAOShader.d.ts
@@ -22,6 +22,8 @@ export const GTAOShader: {
         cameraProjectionMatrixInverse: IUniform<Matrix4>;
         radius: IUniform<number>;
         distanceExponent: IUniform<number>;
+        thickness: IUniform<number>;
+        distanceFallOff: IUniform<number>;
         scale: IUniform<number>;
         sceneBoxMin: IUniform<Vector3>;
         sceneBoxMax: IUniform<Vector3>;
+3 −3		.github/workflows/codeql-code-scanning.yml
+1 −1		docs/examples/en/utils/SceneUtils.html
+1 −1		docs/examples/zh/utils/SceneUtils.html
+52 −47		examples/jsm/csm/CSMShader.js
+16 −33		examples/jsm/lines/LineMaterial.js
+19 −0		examples/jsm/loaders/MaterialXLoader.js
+6 −1		examples/jsm/nodes/core/Node.js
+7 −1		examples/jsm/nodes/lighting/LightsNode.js
+6 −1		examples/jsm/nodes/materials/NodeMaterial.js
+7 −1		examples/jsm/nodes/shadernode/ShaderNode.js
+7 −0		examples/jsm/postprocessing/GTAOPass.js
+6 −0		examples/jsm/renderers/webgl/WebGLBackend.js
+32 −0		examples/jsm/renderers/webgl/utils/WebGLAttributeUtils.js
+2 −42		examples/jsm/renderers/webgl/utils/WebGLTextureUtils.js
+42 −0		examples/jsm/renderers/webgl/utils/WebGLUtils.js
+5 −3		examples/jsm/shaders/GTAOShader.js
+14 −0		examples/jsm/webxr/ARButton.js
+23 −8		examples/jsm/webxr/VRButton.js
+25 −11		examples/jsm/webxr/XRButton.js
+ −		examples/screenshots/webgl_lines_fat_raycasting.jpg
+ −		examples/screenshots/webgl_postprocessing_gtao.jpg
+2 −4		examples/webgl_postprocessing_gtao.html
+18 −1		examples/webgl_shadowmap_csm.html
+87 −70		package-lock.json
+1 −1		package.json
+5 −4		src/math/Quaternion.js
+0 −5		src/renderers/shaders/ShaderChunk/cube_uv_reflection_fragment.glsl.js
+15 −40		src/renderers/webgl/WebGLUniformsGroups.js