Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WebGPURenderer: Rename .getRawShaderAsync() to .getShaderAsync() #1158

Merged
merged 8 commits into from
Aug 21, 2024
Merged

WebGPURenderer: Rename .getRawShaderAsync() to .getShaderAsync() #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
489ef02
Update three.js
Methuselah96 Aug 21, 2024
a0898c2
Add src
Methuselah96 Aug 21, 2024
96586cc
Update patch and delete src
Methuselah96 Aug 21, 2024
297ca9e
Update declarations
Methuselah96 Aug 21, 2024
dc97f06
Add examples
Methuselah96 Aug 21, 2024
b439282
stats-gl no longer used
Methuselah96 Aug 21, 2024
2314cd4
Update
Methuselah96 Aug 21, 2024
3754503
Update patch and delete examples
Methuselah96 Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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) {

//

Expand Down
2 changes: 2 additions & 0 deletions examples-testing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions examples-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@
"@types/three": "file:../types/three",
"prettier": "^3.3.3",
"typescript": "latest"
},
"devDependencies": {
"stats-gl": "2.2.8"
}
}
22 changes: 0 additions & 22 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -5106,7 +5106,7 @@ index 5beb82a6..0a9ee71b 100644
+ glFragmentShader: WebGLShader,
+ ) => void)
+ | null;
+ getRawShaderAsync: (
+ getShaderAsync: (
+ scene: Scene,
+ camera: Camera,
+ object: Object3D,
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 14 files
+3 −3 .github/workflows/codeql-code-scanning.yml
+2 −0 examples/files.json
+ − examples/screenshots/webgpu_tsl_earth.jpg
+ − examples/screenshots/webgpu_tsl_procedural_terrain.jpg
+ − examples/textures/planets/earth_bump_roughness_clouds_4096.jpg
+ − examples/textures/planets/earth_day_4096.jpg
+ − examples/textures/planets/earth_night_4096.jpg
+4 −15 examples/webgpu_mesh_batch.html
+203 −0 examples/webgpu_tsl_earth.html
+2 −2 examples/webgpu_tsl_editor.html
+358 −0 examples/webgpu_tsl_procedural_terrain.html
+93 −92 package-lock.json
+1 −1 src/renderers/common/Renderer.js
+2 −0 test/e2e/puppeteer.js
2 changes: 1 addition & 1 deletion types/three/src/renderers/common/Renderer.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}>;
Expand Down
Loading