Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions examples-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13761,6 +13761,47 @@ index 5638c902..a274a953 100644
meshKnot.rotation.y = time / 1000;

renderer.render(scene, camera);
diff --git a/examples-testing/examples/webgpu_lights_spotlight.ts b/examples-testing/examples/webgpu_lights_spotlight.ts
index 6beae580..5e9c56e5 100644
--- a/examples-testing/examples/webgpu_lights_spotlight.ts
+++ b/examples-testing/examples/webgpu_lights_spotlight.ts
@@ -1,13 +1,13 @@
-import * as THREE from 'three';
+import * as THREE from 'three/webgpu';

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

import { PLYLoader } from 'three/addons/loaders/PLYLoader.js';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';

-let renderer, scene, camera;
+let renderer: THREE.WebGPURenderer, scene: THREE.Scene, camera: THREE.PerspectiveCamera;

-let spotLight, lightHelper;
+let spotLight: THREE.SpotLight, lightHelper: THREE.SpotLightHelper;

init();

@@ -42,7 +42,7 @@ function init() {
const loader = new THREE.TextureLoader().setPath('textures/');
const filenames = ['disturb.jpg', 'colors.png', 'uv_grid_opengl.jpg'];

- const textures = { none: null };
+ const textures: { [filename: string]: THREE.Texture | null } = { none: null };

for (let i = 0; i < filenames.length; i++) {
const filename = filenames[i];
@@ -157,8 +157,8 @@ function init() {
renderer.shadowMap.enabled = val;

scene.traverse(function (child) {
- if (child.material) {
- child.material.needsUpdate = true;
+ if ((child as THREE.Mesh<THREE.BufferGeometry, THREE.Material>).material) {
+ (child as THREE.Mesh<THREE.BufferGeometry, THREE.Material>).material.needsUpdate = true;
}
});
});
diff --git a/examples-testing/examples/webgpu_lights_tiled.ts b/examples-testing/examples/webgpu_lights_tiled.ts
index ed195757..84114277 100644
--- a/examples-testing/examples/webgpu_lights_tiled.ts
Expand Down
12 changes: 6 additions & 6 deletions src-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5166,7 +5166,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 e905bd44..e971fe96 100644
index cfd0f3b4..3578343e 100644
--- a/src-testing/src/renderers/common/Renderer.ts
+++ b/src-testing/src/renderers/common/Renderer.ts
@@ -36,7 +36,35 @@ import {
Expand Down Expand Up @@ -6200,9 +6200,9 @@ index e905bd44..e971fe96 100644
+ passId: string | null = null,
+ ) {
let overridePositionNode;
let overrideFragmentNode;
let overrideColorNode;
let overrideDepthNode;
@@ -1463,14 +1725,23 @@ class Renderer {
@@ -1466,14 +1728,23 @@ class Renderer {
object.onAfterRender(this, scene, camera, geometry, material, group);
}

Expand All @@ -6229,7 +6229,7 @@ index e905bd44..e971fe96 100644
clippingContext,
passId,
);
@@ -1479,18 +1750,18 @@ class Renderer {
@@ -1482,18 +1753,18 @@ class Renderer {

//

Expand All @@ -6254,7 +6254,7 @@ index e905bd44..e971fe96 100644

//

@@ -1504,33 +1775,41 @@ class Renderer {
@@ -1507,33 +1778,41 @@ class Renderer {

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

Expand Down Expand Up @@ -7958,7 +7958,7 @@ index 9de87c2f..77fb975a 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 5d45dac4..3367d544 100644
index 254eeefb..62228080 100644
--- a/src-testing/src/renderers/webgpu/WebGPUBackend.ts
+++ b/src-testing/src/renderers/webgpu/WebGPUBackend.ts
@@ -984,7 +984,7 @@ class WebGPUBackend extends Backend {
Expand Down
1 change: 1 addition & 0 deletions types/three/src/Three.TSL.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const Loop: typeof TSL.Loop;
export const NodeShaderStage: typeof TSL.NodeShaderStage;
export const NodeType: typeof TSL.NodeType;
export const NodeUpdateType: typeof TSL.NodeUpdateType;
export const NodeAccess: typeof TSL.NodeAccess;
export const PCFShadowFilter: typeof TSL.PCFShadowFilter;
export const PCFSoftShadowFilter: typeof TSL.PCFSoftShadowFilter;
export const PI: typeof TSL.PI;
Expand Down