@types/three 0.167.2 → 0.168.0

three/src/nodes/display/StereoPassNode.d.ts

@@ -0,0 +1,17 @@
+import { Camera } from "../../cameras/Camera.js";
+import { StereoCamera } from "../../cameras/StereoCamera.js";
+import { Scene } from "../../scenes/Scene.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
+import PassNode from "./PassNode.js";
+
+declare class StereoPassNode extends PassNode {
+    readonly isStereoPassNode: true;
+
+    stereo: StereoCamera;
+
+    constructor(scene: Scene, camera: Camera);
+}
+
+export default StereoPassNode;
+
+export const stereoPass: (scene: Scene, camera: Camera) => ShaderNodeObject<StereoPassNode>;

three/src/nodes/display/ToneMappingFunctions.d.ts

@@ -0,0 +1,14 @@
+import Node from "../core/Node.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
+
+export const LinearToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;
+
+export const ReinhardToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;
+
+export const CineonToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;
+
+export const ACESFilmicToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;
+
+export const AgXToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;
+
+export const NeutralToneMapping: (color: NodeRepresentation, exposure: NodeRepresentation) => ShaderNodeObject<Node>;

three/src/nodes/display/ToneMappingNode.d.ts

@@ -2,12 +2,9 @@ import { ToneMapping } from "../../constants.js";
 import RendererReferenceNode from "../accessors/RendererReferenceNode.js";
 import Node from "../core/Node.js";
 import TempNode from "../core/TempNode.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 
-// exposure only
-export const LinearToneMappingNode: Node;
-
-export default class ToneMappingNode extends TempNode {
+declare class ToneMappingNode extends TempNode {
     toneMapping: ToneMapping;
     exposureNode: Node;
     colorNode: Node | null;
@@ -15,6 +12,8 @@ export default class ToneMappingNode extends TempNode {
     constructor(toneMapping: ToneMapping, exposureNode?: Node, colorNode?: Node | null);
 }
 
+export default ToneMappingNode;
+
 export const toneMapping: (
     mapping: ToneMapping,
     exposure: NodeRepresentation,
@@ -22,7 +21,7 @@ export const toneMapping: (
 ) => ShaderNodeObject<ToneMappingNode>;
 export const toneMappingExposure: ShaderNodeObject<RendererReferenceNode>;
 
-declare module "../shadernode/ShaderNode.js" {
+declare module "../tsl/TSLCore.js" {
     interface NodeElements {
         toneMapping: (
             color: NodeRepresentation,

three/src/nodes/display/TransitionNode.d.ts

@@ -2,7 +2,7 @@ import TextureNode from "../accessors/TextureNode.js";
 import Node from "../core/Node.js";
 import TempNode from "../core/TempNode.js";
 import UniformNode from "../core/UniformNode.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 
 declare class TransitionNode extends TempNode {
     textureNodeA: TextureNode;
@@ -23,6 +23,8 @@ declare class TransitionNode extends TempNode {
     );
 }
 
+export default TransitionNode;
+
 export const transition: (
     node: NodeRepresentation,
     nodeB: NodeRepresentation,
@@ -31,11 +33,3 @@ export const transition: (
     threshold: UniformNode<number>,
     useTexture: UniformNode<number>,
 ) => ShaderNodeObject<TransitionNode>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        transition: typeof transition;
-    }
-}
-
-export default TransitionNode;

three/src/nodes/display/ViewportDepthNode.d.ts

@@ -1,7 +1,7 @@
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
-export default class ViewportDepthNode extends Node {
+declare class ViewportDepthNode extends Node {
     scope: ViewportDepthNodeScope;
     valueNode: Node;
 
@@ -9,14 +9,18 @@ export default class ViewportDepthNode extends Node {
 
     constructor(scope: ViewportDepthNodeScope, valueNode?: Node | null);
 
+    static DEPTH_BASE: "depthBase";
     static DEPTH: "depth";
     static LINEAR_DEPTH: "linearDepth";
 }
 
 export type ViewportDepthNodeScope =
+    | typeof ViewportDepthNode.DEPTH_BASE
     | typeof ViewportDepthNode.DEPTH
     | typeof ViewportDepthNode.LINEAR_DEPTH;
 
+export default ViewportDepthNode;
+
 export const viewZToOrthographicDepth: (viewZ: Node, near: Node, far: Node) => Node;
 
 export const orthographicDepthToViewZ: (depth: Node, near: Node, far: Node) => Node;

three/src/nodes/display/ViewportDepthTextureNode.d.ts

@@ -1,11 +1,13 @@
 import Node from "../core/Node.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 import ViewportTextureNode from "./ViewportTextureNode.js";
 
-export default class ViewportDepthTextureNode extends ViewportTextureNode {
+declare class ViewportDepthTextureNode extends ViewportTextureNode {
     constructor(uvNode?: Node, levelNode?: Node | null);
 }
 
+export default ViewportDepthTextureNode;
+
 export const viewportDepthTexture: (
     uvNode?: NodeRepresentation,
     levelNode?: NodeRepresentation,

three/src/nodes/display/ViewportNode.d.ts

@@ -1,31 +1,38 @@
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export type ViewportNodeScope =
     | typeof ViewportNode.COORDINATE
     | typeof ViewportNode.RESOLUTION
-    | typeof ViewportNode.TOP_LEFT
-    | typeof ViewportNode.BOTTOM_LEFT
-    | typeof ViewportNode.TOP_RIGHT
-    | typeof ViewportNode.BOTTOM_RIGHT;
-
-export default class ViewportNode extends Node {
-    static COORDINATE: "coordinate";
-    static RESOLUTION: "resolution";
-    static TOP_LEFT: "topLeft";
-    static BOTTOM_LEFT: "bottomLeft";
-    static TOP_RIGHT: "topRight";
-    static BOTTOM_RIGHT: "bottomRight";
+    | typeof ViewportNode.VIEWPORT
+    | typeof ViewportNode.UV;
 
+declare class ViewportNode extends Node {
     scope: ViewportNodeScope;
-    isViewportNode: true;
+
+    readonly isViewportNode: true;
 
     constructor(scope: ViewportNodeScope);
+
+    static COORDINATE: "coordinate";
+    static RESOLUTION: "resolution";
+    static VIEWPORT: "viewport";
+    static UV: "uv";
 }
 
+export default ViewportNode;
+
 export const viewportCoordinate: ShaderNodeObject<ViewportNode>;
 export const viewportResolution: ShaderNodeObject<ViewportNode>;
+export const viewport: ShaderNodeObject<ViewportNode>;
+export const viewportUV: ShaderNodeObject<ViewportNode>;
+
+/**
+ * @deprecated "viewportTopLeft" is deprecated. Use "viewportUV" instead.
+ */
 export const viewportTopLeft: ShaderNodeObject<ViewportNode>;
+
+/**
+ * @deprecated "viewportBottomLeft" is deprecated. Use "viewportUV.flipY()" instead.
+ */
 export const viewportBottomLeft: ShaderNodeObject<ViewportNode>;
-export const viewportTopRight: ShaderNodeObject<ViewportNode>;
-export const viewportBottomRight: ShaderNodeObject<ViewportNode>;

three/src/nodes/display/ViewportSharedTextureNode.d.ts

@@ -1,18 +1,14 @@
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 import ViewportTextureNode from "./ViewportTextureNode.js";
 
-export default class ViewportSharedTextureNode extends ViewportTextureNode {
+declare class ViewportSharedTextureNode extends ViewportTextureNode {
     constructor(uvNode?: Node, levelNode?: Node | null);
 }
 
+export default ViewportSharedTextureNode;
+
 export const viewportSharedTexture: (
     uvNode?: Node,
     levelNode?: Node | null,
 ) => ShaderNodeObject<ViewportSharedTextureNode>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        viewportSharedTexture: typeof viewportSharedTexture;
-    }
-}

three/src/nodes/display/ViewportTextureNode.d.ts

@@ -2,9 +2,9 @@ import { FramebufferTexture } from "../../textures/FramebufferTexture.js";
 import TextureNode from "../accessors/TextureNode.js";
 import { NodeUpdateType } from "../core/constants.js";
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
-export default class ViewportTextureNode extends TextureNode {
+declare class ViewportTextureNode extends TextureNode {
     generateMipmaps: boolean;
 
     readonly isOutputTextureNode: true;
@@ -14,6 +14,8 @@ export default class ViewportTextureNode extends TextureNode {
     constructor(uvNode?: Node, levelNode?: Node | null, framebufferTexture?: FramebufferTexture | null);
 }
 
+export default ViewportTextureNode;
+
 export const viewportTexture: (
     uvNode?: Node,
     levelNode?: Node | null,
@@ -24,10 +26,3 @@ export const viewportMipTexture: (
     levelNode?: Node | null,
     framebufferTexture?: FramebufferTexture | null,
 ) => ShaderNodeObject<Node>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        viewportTexture: typeof viewportTexture;
-        viewportMipTexture: typeof viewportMipTexture;
-    }
-}

three/src/nodes/fog/FogExp2Node.d.ts

@@ -1,18 +1,14 @@
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 import FogNode from "./FogNode.js";
 
-export default class FogExp2Node extends FogNode {
+declare class FogExp2Node extends FogNode {
     isFogExp2Node: true;
     densityNode: Node;
 
     constructor(colorNode: Node, densityNode: Node);
 }
 
-export const densityFog: (colorNode: Node, densityNode: Node) => ShaderNodeObject<FogExp2Node>;
+export default FogExp2Node;
 
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        densityFog: typeof densityFog;
-    }
-}
+export const densityFog: (colorNode: Node, densityNode: Node) => ShaderNodeObject<FogExp2Node>;

three/src/nodes/fog/FogNode.d.ts

@@ -1,8 +1,8 @@
 import Node from "../core/Node.js";
 import NodeBuilder from "../core/NodeBuilder.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 
-export default class FogNode extends Node {
+declare class FogNode extends Node {
     isFogNode: true;
     colorNode: Node | null;
     factorNode: Node | null;
@@ -12,13 +12,9 @@ export default class FogNode extends Node {
     getViewZNode(builder: NodeBuilder): Node;
 }
 
+export default FogNode;
+
 export const fog: (
     colorNode: NodeRepresentation | null,
     factorNode: NodeRepresentation | null,
 ) => ShaderNodeObject<FogNode>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        fog: typeof fog;
-    }
-}

three/src/nodes/fog/FogRangeNode.d.ts

@@ -1,8 +1,8 @@
 import Node from "../core/Node.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 import FogNode from "./FogNode.js";
 
-export default class FogRangeNode extends FogNode {
+declare class FogRangeNode extends FogNode {
     isFogRangeNode: true;
     nearNode: Node | null;
     farNode: Node | null;
@@ -10,14 +10,10 @@ export default class FogRangeNode extends FogNode {
     constructor(colorNode: Node | null, nearNode: Node | null, farNode: Node | null);
 }
 
+export default FogRangeNode;
+
 export const rangeFog: (
     colorNode: NodeRepresentation | null,
     nearNode: NodeRepresentation | null,
     farNode: NodeRepresentation | null,
 ) => ShaderNodeObject<FogRangeNode>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        rangeFog: typeof rangeFog;
-    }
-}

three/src/nodes/functions/BSDF/BRDF_GGX.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const BRDF_GGX: (args: {
     lightDirection: Node;

three/src/nodes/functions/BSDF/BRDF_Lambert.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const BRDF_Lambert: (args: { diffuseColor: Node }) => ShaderNodeObject<OperatorNode>;
 

three/src/nodes/functions/BSDF/BRDF_Sheen.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const BRDF_Sheen: (args: { lightDirection: Node }) => ShaderNodeObject<OperatorNode>;
 

three/src/nodes/functions/BSDF/DFGApprox.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 // Analytical approximation of the DFG LUT, one half of the
 // split-sum approximation used in indirect specular lighting.

three/src/nodes/functions/BSDF/D_GGX.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 // Microfacet Models for Refraction through Rough Surfaces - equation (33)
 // http://graphicrants.blogspot.com/2013/08/specular-brdf-reference.html

three/src/nodes/functions/BSDF/D_GGX_Anisotropic.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 // https://google.github.io/filament/Filament.md.html#materialsystem/anisotropicmodel/anisotropicspecularbrdf
 declare const D_GGX_Anisotropic: (

three/src/nodes/functions/BSDF/F_Schlick.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const F_Schlick: (args: { f0: Node; f90: Node; dotVH: Node }) => ShaderNodeObject<OperatorNode>;
 

three/src/nodes/functions/BSDF/Schlick_to_F0.d.ts

@@ -0,0 +1,10 @@
+import Node from "../../core/Node.js";
+import { NodeRepresentation, ShaderNodeObject } from "../../tsl/TSLCore.js";
+
+declare const Schlick_to_F0: (
+    f: NodeRepresentation,
+    f90: NodeRepresentation,
+    dotVH: NodeRepresentation,
+) => ShaderNodeObject<Node>;
+
+export default Schlick_to_F0;

three/src/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import OperatorNode from "../../math/OperatorNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const V_GGX_SmithCorrelated: (inputs: {
     alpha: Node;

three/src/nodes/functions/BSDF/V_GGX_SmithCorrelated_Anisotropic.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import MathNode from "../../math/MathNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const V_GGX_SmithCorrelated: (inputs: {
     alphaT: Node;

three/src/nodes/functions/ShadowMaskModel.d.ts

@@ -1,6 +1,6 @@
 import LightingModel from "../core/LightingModel.js";
 import VarNode from "../core/VarNode.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export default class ShadowMaskModel extends LightingModel {
     shadowNode: ShaderNodeObject<VarNode>;

three/src/nodes/functions/material/getGeometryRoughness.d.ts

@@ -1,5 +1,5 @@
 import MathNode from "../../math/MathNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const getGeometryRoughness: () => ShaderNodeObject<MathNode>;
 

three/src/nodes/functions/material/getRoughness.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import MathNode from "../../math/MathNode.js";
-import { ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 declare const getRoughness: (args: { roughness: Node }) => ShaderNodeObject<MathNode>;
 

three/src/nodes/geometry/RangeNode.d.ts

@@ -4,7 +4,7 @@ import { Vector3 } from "../../math/Vector3.js";
 import { Vector4 } from "../../math/Vector4.js";
 import Node from "../core/Node.js";
 import NodeBuilder from "../core/NodeBuilder.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export type RangeModeBound = number | Color | Vector2 | Vector3 | Vector4;
 

three/src/nodes/gpgpu/ComputeNode.d.ts

@@ -1,5 +1,5 @@
 import Node from "../core/Node.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export default class ComputeNode extends Node {
     isComputeNode: true;
@@ -17,7 +17,7 @@ export const compute: (
     workgroupSize: number[],
 ) => ShaderNodeObject<ComputeNode>;
 
-declare module "../shadernode/ShaderNode.js" {
+declare module "../tsl/TSLCore.js" {
     interface NodeElements {
         compute: typeof compute;
     }

three/src/nodes/lighting/AmbientLightNode.d.ts

@@ -0,0 +1,8 @@
+import { AmbientLight } from "../../lights/AmbientLight.js";
+import AnalyticLightNode from "./AnalyticLightNode.js";
+
+declare class AmbientLightNode extends AnalyticLightNode<AmbientLight> {
+    constructor(light?: AmbientLight | null);
+}
+
+export default AmbientLightNode;

three/src/nodes/lighting/DirectionalLightNode.d.ts

@@ -0,0 +1,8 @@
+import { DirectionalLight } from "../../lights/DirectionalLight.js";
+import AnalyticLightNode from "./AnalyticLightNode.js";
+
+declare class DirectionalLightNode extends AnalyticLightNode<DirectionalLight> {
+    constructor(light?: DirectionalLight | null);
+}
+
+export default DirectionalLightNode;

three/src/nodes/lighting/IESSpotLightNode.d.ts

@@ -0,0 +1,5 @@
+import SpotLightNode from "./SpotLightNode.js";
+
+declare class IESSpotLightNode extends SpotLightNode {}
+
+export default IESSpotLightNode;

three/src/nodes/lighting/LightNode.d.ts

@@ -0,0 +1,18 @@
+import { Light } from "../../lights/Light.js";
+import Node from "../core/Node.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
+
+export type LightNodeScope = typeof LightNode.TARGET_DIRECTION;
+
+declare class LightNode extends Node {
+    scope: LightNodeScope;
+    light: Light;
+
+    constructor(scope?: LightNodeScope, light?: Light | null);
+
+    static TARGET_DIRECTION: "targetDirection";
+}
+
+export default LightNode;
+
+export const lightTargetDirection: (light?: Light | null) => ShaderNodeObject<LightNode>;

three/src/nodes/lighting/LightProbeNode.d.ts

@@ -0,0 +1,11 @@
+import { LightProbe } from "../../lights/LightProbe.js";
+import UniformArrayNode from "../accessors/UniformArrayNode.js";
+import AnalyticLightNode from "./AnalyticLightNode.js";
+
+declare class LightProbeNode extends AnalyticLightNode<LightProbe> {
+    lightProbe: UniformArrayNode;
+
+    constructor(light?: LightProbe | null);
+}
+
+export default LightProbeNode;

three/src/nodes/lighting/LightUtils.d.ts

@@ -1,9 +1,9 @@
 import Node from "../core/Node.js";
-import CondNode from "../math/CondNode.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import ConditionalNode from "../math/ConditionalNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export const getDistanceAttenuation: (args: {
     lightDistance: Node;
     cutoffDistance: Node;
     decayExponent: Node;
-}) => ShaderNodeObject<CondNode>;
+}) => ShaderNodeObject<ConditionalNode>;

three/src/nodes/lighting/LightingContextNode.d.ts

@@ -1,7 +1,7 @@
 import ContextNode from "../core/ContextNode.js";
 import LightingModel, { LightingModelIndirectInput } from "../core/LightingModel.js";
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
 export default class LightingContextNode extends ContextNode {
     lightingModelNode: LightingModel | null;
@@ -19,9 +19,3 @@ export default class LightingContextNode extends ContextNode {
 }
 
 export const lightingContext: (node: Node, lightingModelNode?: LightingModel) => ShaderNodeObject<LightingContextNode>;
-
-declare module "../shadernode/ShaderNode.js" {
-    interface NodeElements {
-        lightingContext: typeof lightingContext;
-    }
-}

three/src/nodes/lighting/LightsNode.d.ts

@@ -1,22 +1,18 @@
 import { Light } from "../../lights/Light.js";
 import Node from "../core/Node.js";
-import { ShaderNodeObject } from "../shadernode/ShaderNode.js";
-import LightingNode from "./LightingNode.js";
+import { NodeBuilder } from "../Nodes.js";
+import { ShaderNodeObject } from "../tsl/TSLCore.js";
 
-export default class LightsNode extends Node {
-    lightNodes: LightingNode[];
+declare class LightsNode extends Node {
+    constructor(lights?: Light[]);
 
-    constructor(lightNodes?: LightingNode[]);
+    setupLightsNode(builder: NodeBuilder): void;
 
-    get hasLight(): boolean;
-    getLightNodeByHash(hash: string): LightingNode | null;
+    setLights(lights: Light[]): this;
 
-    fromLights(lights: Light[]): this;
-
-    static setReference<T extends Light>(
-        lightClass: { new(): T },
-        lightNodeClass: { new(light: T): LightingNode },
-    ): void;
+    getLights(): Light[];
 }
 
+export default LightsNode;
+
 export const lights: (lights: Light[]) => ShaderNodeObject<LightsNode>;

three/src/nodes/materialx/MaterialXNodes.d.ts

@@ -1,6 +1,6 @@
 import Node from "../core/Node.js";
 import MathNode from "../math/MathNode.js";
-import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../tsl/TSLCore.js";
 import { mx_hsvtorgb, mx_rgbtohsv } from "./lib/mx_hsv.js";
 import { mx_srgb_texture_to_lin_rec709 } from "./lib/mx_transform_color.js";
 

three/src/nodes/materialx/lib/mx_hsv.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
-import { NodeRepresentation, ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../../tsl/TSLCore.js";
 
-export const mx_hsvtorgb: (hsv_immutable: NodeRepresentation) => ShaderNodeObject<Node>;
+export const mx_hsvtorgb: (hsv: NodeRepresentation) => ShaderNodeObject<Node>;
 
 export const mx_rgbtohsv: (c_immutable: NodeRepresentation) => ShaderNodeObject<Node>;

three/src/nodes/materialx/lib/mx_noise.d.ts

@@ -1,6 +1,6 @@
 import Node from "../../core/Node.js";
 import VarNode from "../../core/VarNode.js";
-import { NodeRepresentation, ShaderNodeObject } from "../../shadernode/ShaderNode.js";
+import { NodeRepresentation, ShaderNodeObject } from "../../tsl/TSLCore.js";
 
 export const mx_select: (
     b_immutable: NodeRepresentation,