diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index ec8773a1a..55db05dc6 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -14156,14 +14156,14 @@ index bd84aba0..f9d188c3 100644 } diff --git a/examples-testing/examples/webgpu_mesh_batch.ts b/examples-testing/examples/webgpu_mesh_batch.ts -index 1d8b2375..1b733151 100644 +index a619f430..46473e46 100644 --- a/examples-testing/examples/webgpu_mesh_batch.ts +++ b/examples-testing/examples/webgpu_mesh_batch.ts @@ -1,17 +1,17 @@ -import * as THREE from 'three'; +import * as THREE from 'three/webgpu'; - import Stats from 'stats-gl'; + import Stats from 'three/addons/libs/stats.module.js'; import { GUI } from 'three/addons/libs/lil-gui.module.min.js'; @@ -14211,16 +14211,7 @@ index 1d8b2375..1b733151 100644 if (mesh.dispose) { mesh.dispose(); -@@ -137,7 +137,7 @@ function init(forceWebGL = false) { - document.body.removeChild(renderer.domElement); - } - -- document.getElementById('backend').innerText = 'Active Backend: ' + (forceWebGL ? 'WebGL' : 'WebGPU'); -+ document.getElementById('backend')!.innerText = 'Active Backend: ' + (forceWebGL ? 'WebGL' : 'WebGPU'); - // camera - - const aspect = window.innerWidth / window.innerHeight; -@@ -256,18 +256,26 @@ function init(forceWebGL = false) { +@@ -250,18 +250,26 @@ function init(forceWebGL = false) { // diff --git a/examples-testing/index.js b/examples-testing/index.js index 5f5432b50..d3dc679f0 100644 --- a/examples-testing/index.js +++ b/examples-testing/index.js @@ -101,10 +101,12 @@ const exceptionList = [ 'webgpu_texturegrad', 'webgpu_textures_2d-array', 'webgpu_tsl_compute_attractors_particles', + 'webgpu_tsl_earth', 'webgpu_tsl_editor', 'webgpu_tsl_galaxy', 'webgpu_tsl_halftone', 'webgpu_tsl_interoperability', + 'webgpu_tsl_procedural_terrain', 'webgpu_tsl_raging_sea', 'webgpu_tsl_transpiler', 'webgpu_volume_cloud', diff --git a/examples-testing/package.json b/examples-testing/package.json index d8d36dca7..681707e27 100644 --- a/examples-testing/package.json +++ b/examples-testing/package.json @@ -16,8 +16,5 @@ "@types/three": "file:../types/three", "prettier": "^3.3.3", "typescript": "latest" - }, - "devDependencies": { - "stats-gl": "2.2.8" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9cefa5e32..80f2baccd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -59,10 +59,6 @@ importers: typescript: specifier: latest version: 5.5.4 - devDependencies: - stats-gl: - specifier: 2.2.8 - version: 2.2.8 src-testing: dependencies: @@ -407,9 +403,6 @@ packages: '@types/stats.js@0.17.3': resolution: {integrity: sha512-pXNfAD3KHOdif9EQXZ9deK82HVNaXP5ZIF5RP2QG6OQFNTaY2YIetfrE9t528vEreGQvEPRDDc8muaoYeK0SxQ==} - '@types/three@0.163.0': - resolution: {integrity: sha512-uIdDhsXRpQiBUkflBS/i1l3JX14fW6Ot9csed60nfbZNXHDTRsnV2xnTVwXcgbvTiboAR4IW+t+lTL5f1rqIqA==} - '@types/webxr@0.5.19': resolution: {integrity: sha512-4hxA+NwohSgImdTSlPXEqDqqFktNgmTXQ05ff1uWam05tNGroCMp4G+4XVl6qWm1p7GQ/9oD41kAYsSssF6Mzw==} @@ -1821,9 +1814,6 @@ packages: resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} engines: {node: '>= 8'} - stats-gl@2.2.8: - resolution: {integrity: sha512-94G5nZvduDmzxBS7K0lYnynYwreZpkknD8g5dZmU6mpwIhy3caCrjAm11Qm1cbyx7mqix7Fp00RkbsonzKWnoQ==} - streamx@2.18.0: resolution: {integrity: sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==} @@ -2517,14 +2507,6 @@ snapshots: '@types/stats.js@0.17.3': {} - '@types/three@0.163.0': - dependencies: - '@tweenjs/tween.js': 23.1.3 - '@types/stats.js': 0.17.3 - '@types/webxr': 0.5.19 - fflate: 0.8.2 - meshoptimizer: 0.18.1 - '@types/webxr@0.5.19': {} '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': @@ -4156,10 +4138,6 @@ snapshots: dependencies: minipass: 3.3.6 - stats-gl@2.2.8: - dependencies: - '@types/three': 0.163.0 - streamx@2.18.0: dependencies: fast-fifo: 1.3.2 diff --git a/src-testing/changes.patch b/src-testing/changes.patch index 23416476f..b89e18efc 100644 --- a/src-testing/changes.patch +++ b/src-testing/changes.patch @@ -4920,7 +4920,7 @@ index 0ec34b04..573cae2b 100644 this.vertexProgram = vertexProgram; diff --git a/src-testing/src/renderers/common/Renderer.ts b/src-testing/src/renderers/common/Renderer.ts -index 5beb82a6..0a9ee71b 100644 +index be803038..d09b36df 100644 --- a/src-testing/src/renderers/common/Renderer.ts +++ b/src-testing/src/renderers/common/Renderer.ts @@ -15,7 +15,7 @@ import ClippingContext from './ClippingContext.js'; @@ -5106,7 +5106,7 @@ index 5beb82a6..0a9ee71b 100644 + glFragmentShader: WebGLShader, + ) => void) + | null; -+ getRawShaderAsync: ( ++ getShaderAsync: ( + scene: Scene, + camera: Camera, + object: Object3D, @@ -5120,7 +5120,7 @@ index 5beb82a6..0a9ee71b 100644 // @@ -156,12 +325,12 @@ class Renderer { - getRawShaderAsync: async (scene, camera, object) => { + getShaderAsync: async (scene, camera, object) => { await this.compileAsync(scene, camera); - const renderList = this._renderLists.get(scene, camera); diff --git a/three.js b/three.js index d4b6c8f0a..5ce4fa614 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit d4b6c8f0a039478363c7cf63f6e2d84917ccc549 +Subproject commit 5ce4fa6149da08281e72be706df9c91f787418ec diff --git a/types/three/src/renderers/common/Renderer.d.ts b/types/three/src/renderers/common/Renderer.d.ts index 3dee99275..25dd5f0d2 100644 --- a/types/three/src/renderers/common/Renderer.d.ts +++ b/types/three/src/renderers/common/Renderer.d.ts @@ -142,7 +142,7 @@ declare class Renderer { glFragmentShader: WebGLShader, ) => void) | null; - getRawShaderAsync: (scene: Scene, camera: Camera, object: Object3D) => Promise<{ + getShaderAsync: (scene: Scene, camera: Camera, object: Object3D) => Promise<{ fragmentShader: string | null; vertexShader: string | null; }>;