diff --git a/src-testing/changes.patch b/src-testing/changes.patch index e0b3b564a..68d39198f 100644 --- a/src-testing/changes.patch +++ b/src-testing/changes.patch @@ -5502,7 +5502,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 bfb2ca00..43523339 100644 +index 19153b35..b8930541 100644 --- a/src-testing/src/renderers/common/Renderer.ts +++ b/src-testing/src/renderers/common/Renderer.ts @@ -36,7 +36,34 @@ import { @@ -6587,7 +6587,7 @@ index bfb2ca00..43523339 100644 // -@@ -1508,33 +1776,41 @@ class Renderer { +@@ -1508,17 +1776,26 @@ class Renderer { this.backend.draw(renderObject, this.info); @@ -6595,7 +6595,7 @@ index bfb2ca00..43523339 100644 + if (needsRefresh) this._nodes!.updateAfter(renderObject); } -- _createObjectPipeline(object, material, scene, camera, lightsNode, clippingContext, passId) { +- _createObjectPipeline(object, material, scene, camera, lightsNode, group, clippingContext, passId) { - const renderObject = this._objects.get( + _createObjectPipeline( + object: Object3D, @@ -6603,6 +6603,7 @@ index bfb2ca00..43523339 100644 + scene: Scene, + camera: Camera, + lightsNode: LightsNode, ++ group: Group, + clippingContext: ClippingContext | null, + passId?: string, + ) { @@ -6617,6 +6618,7 @@ index bfb2ca00..43523339 100644 clippingContext, passId, ); +@@ -1527,16 +1804,16 @@ class Renderer { // @@ -8291,10 +8293,10 @@ 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 3864bb3a..ee443930 100644 +index 8c191373..b960fd6c 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 { +@@ -992,7 +992,7 @@ class WebGPUBackend extends Backend { this.textureUtils.destroyTexture(texture); } diff --git a/three.js b/three.js index 8d556641f..8ac75e926 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 8d556641f54b9902037c58d40860d2d000f53953 +Subproject commit 8ac75e92654f546e8f03824bb153a4b83b0b0489 diff --git a/types/three/src/renderers/common/Renderer.d.ts b/types/three/src/renderers/common/Renderer.d.ts index a400c0497..f7b82fe35 100644 --- a/types/three/src/renderers/common/Renderer.d.ts +++ b/types/three/src/renderers/common/Renderer.d.ts @@ -12,6 +12,7 @@ import { Vector4 } from "../../math/Vector4.js"; import MRTNode from "../../nodes/core/MRTNode.js"; import ComputeNode from "../../nodes/gpgpu/ComputeNode.js"; import LightsNode from "../../nodes/lighting/LightsNode.js"; +import { Group } from "../../objects/Group.js"; import { Scene } from "../../scenes/Scene.js"; import { FramebufferTexture } from "../../textures/FramebufferTexture.js"; import { Texture } from "../../textures/Texture.js"; @@ -325,6 +326,7 @@ declare class Renderer { scene: Scene, camera: Camera, lightsNode: LightsNode, + group: Group, clippingContext: ClippingContext | null, passId?: string, ): void;