diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 165717539..e7c7195af 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -2118,7 +2118,7 @@ index e296fdc..527b9a7 100644 child.rotation.y += delta * 0.3; } diff --git a/examples-testing/examples/webgl2_ubo_arrays.ts b/examples-testing/examples/webgl2_ubo_arrays.ts -index 74d9a62..ca43ef5 100644 +index 7f1b3c8..ca43ef5 100644 --- a/examples-testing/examples/webgl2_ubo_arrays.ts +++ b/examples-testing/examples/webgl2_ubo_arrays.ts @@ -5,11 +5,15 @@ import Stats from 'three/addons/libs/stats.module.js'; @@ -2151,15 +2151,6 @@ index 74d9a62..ca43ef5 100644 glslVersion: THREE.GLSL3, }); -@@ -123,7 +127,7 @@ function init() { - // controls - - const controls = new OrbitControls(camera, renderer.domElement); -- controls.enabledPan = false; -+ controls.enablePan = false; - - // stats - @@ -135,7 +139,7 @@ function init() { gui.add(api, 'count', 1, pointLightsMax) .step(1) @@ -10947,21 +10938,25 @@ 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 6148f63..437f902 100644 +index 8993081..67c578c 100644 --- a/examples-testing/examples/webgl_postprocessing_gtao.ts +++ b/examples-testing/examples/webgl_postprocessing_gtao.ts -@@ -17,9 +17,9 @@ const loader = new GLTFLoader(); - loader.setDRACOLoader(dracoLoader); - loader.setPath('models/gltf/'); +@@ -10,7 +10,14 @@ import { RenderPass } from 'three/addons/postprocessing/RenderPass.js'; + import { GTAOPass } from 'three/addons/postprocessing/GTAOPass.js'; + import { OutputPass } from 'three/addons/postprocessing/OutputPass.js'; --let mixer; -+let mixer: THREE.AnimationMixer; +-let camera, scene, renderer, composer, controls, clock, stats, mixer; ++let camera: THREE.PerspectiveCamera, ++ scene: THREE.Scene, ++ renderer: THREE.WebGLRenderer, ++ composer: EffectComposer, ++ controls: OrbitControls, ++ clock: THREE.Clock, ++ stats: Stats, ++ mixer: THREE.AnimationMixer; --const generateLittlestTokyoScene = scene => { -+const generateLittlestTokyoScene = (scene: THREE.Scene) => { - loader.load( - 'LittlestTokyo.glb', - gltf => { + init(); + animate(); diff --git a/examples-testing/examples/webgl_postprocessing_masking.ts b/examples-testing/examples/webgl_postprocessing_masking.ts index 3650bfe..88a3d81 100644 --- a/examples-testing/examples/webgl_postprocessing_masking.ts diff --git a/three.js b/three.js index 5538dd114..65db18a9e 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 5538dd11442b7c7ddfe10bbc6b52b461a21cdbf6 +Subproject commit 65db18a9e8c97247bcb26ee98325c7543d1fbb0b diff --git a/types/three/examples/jsm/postprocessing/GTAOPass.d.ts b/types/three/examples/jsm/postprocessing/GTAOPass.d.ts index f30b2ea15..42520705e 100644 --- a/types/three/examples/jsm/postprocessing/GTAOPass.d.ts +++ b/types/three/examples/jsm/postprocessing/GTAOPass.d.ts @@ -69,7 +69,6 @@ export class GTAOPass extends Pass { radius?: number | undefined; distanceExponent?: number | undefined; thickness?: number | undefined; - bias?: 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 c3537e1fd..a9038aec2 100644 --- a/types/three/examples/jsm/shaders/GTAOShader.d.ts +++ b/types/three/examples/jsm/shaders/GTAOShader.d.ts @@ -22,7 +22,6 @@ export const GTAOShader: { cameraProjectionMatrixInverse: IUniform; radius: IUniform; distanceExponent: IUniform; - bias: IUniform; scale: IUniform; sceneBoxMin: IUniform; sceneBoxMax: IUniform;