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

WebGPURenderer: Fix Material Arrays and Geometry Groups #1232

Merged
merged 5 commits into from
Sep 22, 2024
+40 −10
Merged

WebGPURenderer: Fix Material Arrays and Geometry Groups #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
609d4d0
Update three.js
Methuselah96 Sep 22, 2024
d8fac6b
Add examples
Methuselah96 Sep 22, 2024
23fad90
Update patch and delete examples
Methuselah96 Sep 22, 2024
9ccbe6d
Add src
Methuselah96 Sep 22, 2024
db868ef
Update patch and delete src
Methuselah96 Sep 22, 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
29 changes: 29 additions & 0 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13830,6 +13830,35 @@ index 04023326..05ee79b0 100644

init();

diff --git a/examples-testing/examples/webgpu_materials_arrays.ts b/examples-testing/examples/webgpu_materials_arrays.ts
index 8db371e6..b893f2c0 100644
--- a/examples-testing/examples/webgpu_materials_arrays.ts
+++ b/examples-testing/examples/webgpu_materials_arrays.ts
@@ -1,11 +1,11 @@
-import * as THREE from 'three';
+import * as THREE from 'three/webgpu';

import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

-let renderer, scene, camera, controls;
-let planeMesh, boxMesh, boxMeshWireframe, planeMeshWireframe;
-let materials;
+let renderer: THREE.WebGPURenderer, scene: THREE.Scene, camera: THREE.PerspectiveCamera, controls: OrbitControls;
+let planeMesh: THREE.Mesh, boxMesh: THREE.Mesh, boxMeshWireframe: THREE.Mesh, planeMeshWireframe: THREE.Mesh;
+let materials: THREE.MeshBasicMaterial[];

const api = {
webgpu: true,
@@ -21,7 +21,7 @@ function init(forceWebGL = false) {
}

// renderer
- renderer = new THREE.WebGLRenderer({
+ renderer = new THREE.WebGPURenderer({
forceWebGL,
antialias: true,
});
diff --git a/examples-testing/examples/webgpu_materials_basic.ts b/examples-testing/examples/webgpu_materials_basic.ts
index 0161a9c7..590f668d 100644
--- a/examples-testing/examples/webgpu_materials_basic.ts
Expand Down
19 changes: 10 additions & 9 deletions src-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4871,7 +4871,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 d077a225..ff34bd8e 100644
index b1af9168..89229eeb 100644
--- a/src-testing/src/renderers/common/Renderer.ts
+++ b/src-testing/src/renderers/common/Renderer.ts
@@ -35,7 +35,36 @@ import {
Expand Down Expand Up @@ -5793,7 +5793,7 @@ index d077a225..ff34bd8e 100644
let overridePositionNode;
let overrideFragmentNode;
let overrideDepthNode;
@@ -1324,21 +1538,29 @@ class Renderer {
@@ -1324,14 +1538,22 @@ class Renderer {
object.onAfterRender(this, scene, camera, geometry, material, group);
}

Expand All @@ -5818,7 +5818,8 @@ index d077a225..ff34bd8e 100644
+ this._currentRenderContext!,
passId,
);
renderObject.drawRange = group || object.geometry.drawRange;
renderObject.drawRange = object.geometry.drawRange;
@@ -1339,7 +1561,7 @@ class Renderer {

//

Expand All @@ -5827,7 +5828,7 @@ index d077a225..ff34bd8e 100644

//

@@ -1347,10 +1569,10 @@ class Renderer {
@@ -1348,10 +1570,10 @@ class Renderer {

//

Expand All @@ -5842,7 +5843,7 @@ index d077a225..ff34bd8e 100644

//

@@ -1362,33 +1584,40 @@ class Renderer {
@@ -1363,33 +1585,40 @@ class Renderer {

this.backend.draw(renderObject, this.info);

Expand Down Expand Up @@ -7087,7 +7088,7 @@ index 7fb333a4..e64d6c57 100644
const nodeBuilder = renderObject.getNodeBuilderState();

diff --git a/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts b/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
index 08b6964b..5fa92ab7 100644
index 361b2da4..a3777b22 100644
--- a/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
+++ b/src-testing/src/renderers/webgl-fallback/WebGLBackend.ts
@@ -13,6 +13,7 @@ import { WebGLBufferRenderer } from './WebGLBufferRenderer.js';
Expand All @@ -7098,7 +7099,7 @@ index 08b6964b..5fa92ab7 100644

//

@@ -652,7 +653,7 @@ class WebGLBackend extends Backend {
@@ -672,7 +673,7 @@ class WebGLBackend extends Backend {
this.textureUtils.destroyTexture(texture);
}

Expand Down Expand Up @@ -7504,10 +7505,10 @@ index 480df056..7509b1d7 100644
const nodeData = this.getDataFromNode(node, shaderStage, this.globalCache);

diff --git a/src-testing/src/renderers/webgpu/WebGPUBackend.ts b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
index 1fe379d0..2477f45a 100644
index 32192efc..799aa092 100644
--- a/src-testing/src/renderers/webgpu/WebGPUBackend.ts
+++ b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
@@ -940,7 +940,7 @@ class WebGPUBackend extends Backend {
@@ -973,7 +973,7 @@ class WebGPUBackend extends Backend {
this.textureUtils.destroyTexture(texture);
}

Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 7 files
+1 −0 examples/files.json
+ − examples/screenshots/webgpu_materials_arrays.jpg
+1 −0 examples/tags.json
+173 −0 examples/webgpu_materials_arrays.html
+2 −1 src/renderers/common/Renderer.js
+31 −6 src/renderers/webgl-fallback/WebGLBackend.js
+39 −6 src/renderers/webgpu/WebGPUBackend.js
Loading