NodeMaterialObserver: Add checking the lights (#1740)

* Update three.js

* Add src

* Update patch and delete src

* Update declarations

Author: Methuselah96

src-testing/changes.patch

@@ -1,20 +1,23 @@
 diff --git a/src-testing/src/materials/nodes/manager/NodeMaterialObserver.ts b/src-testing/src/materials/nodes/manager/NodeMaterialObserver.ts
-index f2030fde..061cabf3 100644
+index b18f9a94..6cb70a74 100644
 --- a/src-testing/src/materials/nodes/manager/NodeMaterialObserver.ts
 +++ b/src-testing/src/materials/nodes/manager/NodeMaterialObserver.ts
-@@ -1,3 +1,11 @@
+@@ -1,3 +1,14 @@
 +import NodeBuilder from '../../../nodes/core/NodeBuilder.js';
 +import RenderObject from '../../../renderers/common/RenderObject.js';
 +import { Matrix4 } from '../../../math/Matrix4.js';
 +import { Material } from '../../Material.js';
 +import NodeFrame from '../../../nodes/core/NodeFrame.js';
 +import { BufferAttribute } from '../../../core/BufferAttribute.js';
 +import Renderer from '../../../renderers/common/Renderer.js';
++import { Light } from '../../../lights/Light.js';
++import { SpotLight } from '../../../lights/SpotLight.js';
++import LightsNode from '../../../nodes/lighting/LightsNode.js';
 +
  const refreshUniforms = [
      'alphaMap',
      'alphaTest',
-@@ -53,7 +61,29 @@ const refreshUniforms = [
+@@ -53,7 +64,38 @@ const refreshUniforms = [
      'thickness',
      'transmission',
      'transmissionMap',
@@ -42,10 +45,28 @@ index f2030fde..061cabf3 100644
 +    worldMatrix: Matrix4;
 +    version?: number;
 +}
++
++interface LightData {
++    map: number;
++}
++
++interface LightsCacheData {
++    renderId: number;
++    lightsData: LightData[];
++}
+ 
+ /**
+  * A WeakMap to cache lights data for node materials.
+@@ -62,7 +104,7 @@ const refreshUniforms = [
+  * @private
+  * @type {WeakMap<LightsNode,Object>}
+  */
+-const _lightsCache = new WeakMap();
++const _lightsCache = new WeakMap<LightsNode, LightsCacheData>();
 
  /**
   * This class is used by {@link WebGPURenderer} as management component.
-@@ -61,12 +91,18 @@ const refreshUniforms = [
+@@ -70,12 +112,18 @@ const _lightsCache = new WeakMap();
   * refresh right before they are going to be rendered or not.
   */
  class NodeMaterialObserver {
@@ -65,7 +86,7 @@ index f2030fde..061cabf3 100644
          /**
           * A node material can be used by more than one render object so the
           * monitor must maintain a list of render objects.
-@@ -111,7 +147,7 @@ class NodeMaterialObserver {
+@@ -120,7 +168,7 @@ class NodeMaterialObserver {
       * @param {RenderObject} renderObject - The render object.
       * @return {boolean} Whether the given render object is verified for the first time of this observer.
       */
@@ -74,7 +95,7 @@ index f2030fde..061cabf3 100644
          const hasInitialized = this.renderObjects.has(renderObject);
 
          if (hasInitialized === false) {
-@@ -129,7 +165,7 @@ class NodeMaterialObserver {
+@@ -138,7 +186,7 @@ class NodeMaterialObserver {
       * @param {Renderer} renderer - The renderer.
       * @return {boolean} Whether the current rendering produces motion vectors or not.
       */
@@ -83,7 +104,7 @@ index f2030fde..061cabf3 100644
          const mrt = renderer.getMRT();
 
          return mrt !== null && mrt.has('velocity');
-@@ -141,7 +177,7 @@ class NodeMaterialObserver {
+@@ -150,7 +198,7 @@ class NodeMaterialObserver {
       * @param {RenderObject} renderObject - The render object.
       * @return {Object} The monitoring data.
       */
@@ -92,7 +113,7 @@ index f2030fde..061cabf3 100644
          let data = this.renderObjects.get(renderObject);
 
          if (data === undefined) {
-@@ -190,8 +226,8 @@ class NodeMaterialObserver {
+@@ -201,8 +249,8 @@ class NodeMaterialObserver {
       * @param {Object} attributes - The geometry attributes.
       * @return {Object} An object for monitoring the versions of attributes.
       */
@@ -103,7 +124,7 @@ index f2030fde..061cabf3 100644
 
          for (const name in attributes) {
              const attribute = attributes[name];
-@@ -211,7 +247,7 @@ class NodeMaterialObserver {
+@@ -222,7 +270,7 @@ class NodeMaterialObserver {
       * @param {NodeBuilder} builder - The current node builder.
       * @return {boolean} Whether the node builder's material uses node properties or not.
       */
@@ -112,7 +133,7 @@ index f2030fde..061cabf3 100644
          const material = builder.material;
 
          for (const property in material) {
-@@ -234,8 +270,8 @@ class NodeMaterialObserver {
+@@ -245,8 +293,8 @@ class NodeMaterialObserver {
       * @param {Material} material - The material.
       * @return {Object} An object for monitoring material properties.
       */
@@ -123,16 +144,47 @@ index f2030fde..061cabf3 100644
 
          for (const property of this.refreshUniforms) {
              const value = material[property];
-@@ -262,7 +298,7 @@ class NodeMaterialObserver {
-      * @param {RenderObject} renderObject - The render object.
+@@ -274,7 +322,7 @@ class NodeMaterialObserver {
+      * @param {Array<Light>} lightsData - The current material lights.
       * @return {boolean} Whether the given render object has changed its state or not.
       */
--    equals(renderObject) {
-+    equals(renderObject: RenderObject) {
+-    equals(renderObject, lightsData) {
++    equals(renderObject: RenderObject, lightsData: Light[]) {
          const { object, material, geometry } = renderObject;
 
          const renderObjectData = this.getRenderObjectData(renderObject);
-@@ -413,7 +449,7 @@ class NodeMaterialObserver {
+@@ -434,14 +482,14 @@ class NodeMaterialObserver {
+      * @param {Array<Light>} materialLights - The material lights.
+      * @return {Array<Object>} The lights data for the given material lights.
+      */
+-    getLightsData(materialLights) {
+-        const lights = [];
++    getLightsData(materialLights: Light[]) {
++        const lights: LightData[] = [];
+ 
+         for (const light of materialLights) {
+-            if (light.isSpotLight === true && light.map !== null) {
++            if ((light as SpotLight).isSpotLight === true && (light as SpotLight).map !== null) {
+                 // only add lights that have a map
+ 
+-                lights.push({ map: light.map.version });
++                lights.push({ map: (light as SpotLight).map!.version });
+             }
+         }
+ 
+@@ -455,9 +503,9 @@ class NodeMaterialObserver {
+      * @param {number} renderId - The render ID.
+      * @return {Array} The lights for the given lights node and render ID.
+      */
+-    getLights(lightsNode, renderId) {
++    getLights(lightsNode: LightsNode, renderId: number) {
+         if (_lightsCache.has(lightsNode)) {
+-            const cached = _lightsCache.get(lightsNode);
++            const cached = _lightsCache.get(lightsNode)!;
+ 
+             if (cached.renderId === renderId) {
+                 return cached.lightsData;
+@@ -478,7 +526,7 @@ class NodeMaterialObserver {
       * @param {NodeFrame} nodeFrame - The current node frame.
       * @return {boolean} Whether the given render object requires a refresh or not.
       */
@@ -10217,7 +10269,7 @@ index 37784a05..7b08961a 100644
 +
  export default StandardNodeLibrary;
 diff --git a/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts b/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
-index 40eff17c..e14f19f9 100644
+index d6666b28..78ad6547 100644
 --- a/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
 +++ b/src-testing/src/renderers/webgpu/nodes/WGSLNodeBuilder.ts
 @@ -10,7 +10,7 @@ import {

three.js

@@ -1,7 +1,9 @@
 import { BufferAttribute } from "../../../core/BufferAttribute.js";
+import { Light } from "../../../lights/Light.js";
 import { Matrix4 } from "../../../math/Matrix4.js";
 import NodeBuilder from "../../../nodes/core/NodeBuilder.js";
 import NodeFrame from "../../../nodes/core/NodeFrame.js";
+import LightsNode from "../../../nodes/lighting/LightsNode.js";
 import Renderer from "../../../renderers/common/Renderer.js";
 import RenderObject from "../../../renderers/common/RenderObject.js";
 import { Material } from "../../Material.js";
@@ -84,6 +86,9 @@ interface RenderObjectData {
     worldMatrix: Matrix4;
     version?: number;
 }
+interface LightData {
+    map: number;
+}
 /**
  * This class is used by {@link WebGPURenderer} as management component.
  * It's primary purpose is to determine whether render objects require a
@@ -150,9 +155,25 @@ declare class NodeMaterialObserver {
      * Returns `true` if the given render object has not changed its state.
      *
      * @param {RenderObject} renderObject - The render object.
+     * @param {Array<Light>} lightsData - The current material lights.
      * @return {boolean} Whether the given render object has changed its state or not.
      */
-    equals(renderObject: RenderObject): boolean;
+    equals(renderObject: RenderObject, lightsData: Light[]): boolean;
+    /**
+     * Returns the lights data for the given material lights.
+     *
+     * @param {Array<Light>} materialLights - The material lights.
+     * @return {Array<Object>} The lights data for the given material lights.
+     */
+    getLightsData(materialLights: Light[]): LightData[];
+    /**
+     * Returns the lights for the given lights node and render ID.
+     *
+     * @param {LightsNode} lightsNode - The lights node.
+     * @param {number} renderId - The render ID.
+     * @return {Array} The lights for the given lights node and render ID.
+     */
+    getLights(lightsNode: LightsNode, renderId: number): LightData[];
     /**
      * Checks if the given render object requires a refresh.
      *