diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 960be909a..61acadea2 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -14624,12 +14624,12 @@ index 4c3a1d66..4337b2c8 100644 postProcessing.outputNode = combinedPass; diff --git a/examples-testing/examples/webgpu_postprocessing_ao.ts b/examples-testing/examples/webgpu_postprocessing_ao.ts -index c3af1121..7c941555 100644 +index 432d641a..1434cc30 100644 --- a/examples-testing/examples/webgpu_postprocessing_ao.ts +++ b/examples-testing/examples/webgpu_postprocessing_ao.ts -@@ -1,5 +1,16 @@ +@@ -1,5 +1,18 @@ -import * as THREE from 'three'; --import { pass, mrt, output, transformedNormalView, texture, ao } from 'three/tsl'; +-import { pass, mrt, output, transformedNormalView, texture, ao, denoise } from 'three/tsl'; +import * as THREE from 'three/webgpu'; +import { + pass, @@ -14638,21 +14638,23 @@ index c3af1121..7c941555 100644 + transformedNormalView, + texture, + ao, ++ denoise, + ShaderNodeObject, + GTAONode, ++ DenoiseNode, + OperatorNode, + Node, +} from 'three/tsl'; import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js'; -@@ -10,9 +21,19 @@ import { SimplexNoise } from 'three/addons/math/SimplexNoise.js'; +@@ -10,9 +23,20 @@ import { SimplexNoise } from 'three/addons/math/SimplexNoise.js'; import Stats from 'three/addons/libs/stats.module.js'; import { GUI } from 'three/addons/libs/lil-gui.module.min.js'; -let camera, scene, renderer, postProcessing, controls, clock, stats, mixer; - --let aoPass, blendPassAO, blendPassDenoise, scenePassColor; +-let aoPass, denoisePass, blendPassAO, blendPassDenoise, scenePassColor; +let camera: THREE.PerspectiveCamera, + scene: THREE.Scene, + renderer: THREE.WebGPURenderer, @@ -14663,6 +14665,7 @@ index c3af1121..7c941555 100644 + mixer: THREE.AnimationMixer; + +let aoPass: ShaderNodeObject, ++ denoisePass: ShaderNodeObject, + blendPassAO: ShaderNodeObject, + blendPassDenoise: ShaderNodeObject, + scenePassColor: ShaderNodeObject; @@ -15444,16 +15447,3 @@ index 2cd50ba4..b97f3eee 100644 isDepthSupplied = false; }); -diff --git a/types/three/src/nodes/display/GTAONode.d.ts b/types/three/src/nodes/display/GTAONode.d.ts -index 16e30199..5a6da521 100644 ---- a/types/three/src/nodes/display/GTAONode.d.ts -+++ b/types/three/src/nodes/display/GTAONode.d.ts -@@ -26,7 +26,7 @@ declare class GTAONode extends TempNode { - - constructor(depthNode: Node, normalNode: Node, camera: Camera); - -- getTextureNode(): TextureNode; -+ getTextureNode(): ShaderNodeObject; - - setSize(width: number, height: number): void; - } diff --git a/three.js b/three.js index 8a102ea21..0bc430b29 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 8a102ea21d19adfd8214e20a347d80f49e098d8c +Subproject commit 0bc430b291cac82b69ea06e64ff24b4cfe7a5dfa