Nodes: Introduce static type (#1234)

* Nodes: Introduce static type

* Update three.js

* Add src

* Update patch and delete src

* Update declarations

types/three/src/loaders/MaterialLoader.d.ts

@@ -15,5 +15,7 @@ export class MaterialLoader extends Loader<Material> {
 
     setTextures(textures: { [key: string]: Texture }): this;
 
+    createMaterialFromType(type: string): Material;
+
     static createMaterialFromType(type: string): Material;
 }

types/three/src/loaders/nodes/NodeLoader.d.ts

@@ -8,9 +8,14 @@ export interface NodeLoaderResult {
 }
 
 export default class NodeLoader extends Loader<NodeLoaderResult> {
+    textures: { [key: string]: Texture };
+    nodes: { [type: string]: Node };
+
     constructor(manager?: LoadingManager);
 
     parseNodes(json: unknown): NodeLoaderResult;
     parse(json: unknown): Node;
     setTextures(textures: { [key: string]: Texture }): this;
+    setNodes(value: { [type: string]: Node }): this;
+    createNodeFromType(type: string): Node;
 }

types/three/src/loaders/nodes/NodeMaterialLoader.d.ts

@@ -1,8 +1,11 @@
+import NodeMaterial from "../../materials/nodes/NodeMaterial.js";
 import { MaterialLoader } from "../MaterialLoader.js";
 import { NodeLoaderResult } from "./NodeLoader.js";
 
 export default class NodeMaterialLoader extends MaterialLoader {
     nodes: NodeLoaderResult;
+    nodeMaterials: { [type: string]: NodeMaterial };
 
     setNodes(value: NodeLoaderResult): this;
+    setNodeMaterials(value: { [type: string]: NodeMaterial }): this;
 }

types/three/src/loaders/nodes/NodeObjectLoader.d.ts

@@ -1,9 +1,21 @@
 import { Material } from "../../materials/Material.js";
+import NodeMaterial from "../../materials/nodes/NodeMaterial.js";
+import { Node } from "../../nodes/Nodes.js";
 import { Texture } from "../../textures/Texture.js";
+import { LoadingManager } from "../LoadingManager.js";
 import { ObjectLoader } from "../ObjectLoader.js";
 import { NodeLoaderResult } from "./NodeLoader.js";
 
 export default class NodeObjectLoader extends ObjectLoader {
+    nodes: { [type: string]: Node };
+    nodeMaterials: { [type: string]: NodeMaterial };
+
+    constructor(manager?: LoadingManager);
+
+    setNodes(value: { [type: string]: Node }): this;
+
+    setNodeMaterials(value: { [type: string]: NodeMaterial }): this;
+
     parseNodes(json: unknown, textures: { [key: string]: Texture }): NodeLoaderResult;
 
     parseMaterials(json: unknown, textures: { [key: string]: Texture }): { [key: string]: Material };

types/three/src/materials/nodes/NodeMaterial.d.ts

@@ -35,6 +35,8 @@ export interface NodeMaterialParameters extends MaterialParameters {
 }
 
 declare class NodeMaterial extends Material {
+    static get type(): string;
+
     readonly isNodeMaterial: true;
 
     fog: boolean;
@@ -85,7 +87,3 @@ declare class NodeMaterial extends Material {
 }
 
 export default NodeMaterial;
-
-export function registerNodeMaterial(type: string, nodeMaterialClass: { new(): NodeMaterial }): string;
-
-export function createNodeMaterialFromType(type: string): NodeMaterial;

types/three/src/nodes/Nodes.d.ts

@@ -17,7 +17,7 @@ export {
     LightingModelReflectedLight,
 } from "./core/LightingModel.js";
 export { default as MRTNode } from "./core/MRTNode.js";
-export { default as Node, NodeJSONInputData, NodeJSONIntermediateOutputData, registerNode } from "./core/Node.js";
+export { default as Node, NodeJSONInputData, NodeJSONIntermediateOutputData } from "./core/Node.js";
 export { default as NodeAttribute } from "./core/NodeAttribute.js";
 export {
     BuildStageOption,

types/three/src/nodes/accessors/BufferAttributeNode.d.ts

@@ -5,6 +5,7 @@ import { InterleavedBufferAttribute } from "../../core/InterleavedBufferAttribut
 import InputNode from "../core/InputNode.js";
 import NodeBuilder from "../core/NodeBuilder.js";
 declare class BufferAttributeNode extends InputNode<TypedArray | InterleavedBuffer | BufferAttribute> {
+    static get type(): string;
     readonly isBufferNode: true;
     bufferType: string | null;
     bufferStride: number;

types/three/src/nodes/core/Node.d.ts

@@ -60,6 +60,7 @@ interface NodeJSONOutputData {
 declare class Node extends EventDispatcher<{
     dispose: {};
 }> {
+    static get type(): string;
     nodeType: string | null;
     updateType: NodeUpdateType;
     updateBeforeType: NodeUpdateType;
@@ -108,13 +109,3 @@ declare class Node extends EventDispatcher<{
     toJSON(meta?: NodeJSONMeta | string): NodeJSONOutputData;
 }
 export default Node;
-export declare function registerNode(type: string, nodeClass: {
-    new(...args: any[]): Node;
-}): string | undefined;
-export declare function createNodeFromType(type: string): Node | undefined;
-/**
- * @deprecated Function addNodeClass() is deprecated. Use registerNodeClass() instead.
- */
-export declare function addNodeClass(type: string, nodeClass: {
-    new(...args: any[]): Node;
-}): void;

types/three/src/nodes/core/StructTypeNode.d.ts

@@ -1,5 +1,6 @@
 import Node from "./Node.js";
 declare class StructTypeNode extends Node {
+    static get type(): string;
     types: string[];
     readonly isStructTypeNode: true;
     constructor(types: string[]);

types/three/src/nodes/core/UniformNode.d.ts

@@ -5,6 +5,7 @@ import NodeBuilder from "./NodeBuilder.js";
 import NodeFrame from "./NodeFrame.js";
 import UniformGroupNode from "./UniformGroupNode.js";
 declare class UniformNode<TValue> extends InputNode<TValue> {
+    static get type(): string;
     readonly isUniformNode: true;
     name: string;
     groupNode: UniformGroupNode;