diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index e7c7195af..f98454d95 100644 --- 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).material) { ++ (child as THREE.Mesh).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 index 3d405bddb..edf8c7eae 100644 --- 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 index 65db18a9e..64467c016 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 65db18a9e8c97247bcb26ee98325c7543d1fbb0b +Subproject commit 64467c0166e3a7a36f513052882519c15a3ece95 diff --git a/types/three/examples/jsm/postprocessing/GTAOPass.d.ts b/types/three/examples/jsm/postprocessing/GTAOPass.d.ts index 42520705e..e2128ae0b 100644 --- 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 index a9038aec2..d1d1d635a 100644 --- 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; radius: IUniform; distanceExponent: IUniform; + thickness: IUniform; + distanceFallOff: IUniform; scale: IUniform; sceneBoxMin: IUniform; sceneBoxMax: IUniform;