@types/three 0.167.1 → 0.168.0

three/src/{nodes/materials → materials/nodes}/MeshPhongNodeMaterial.d.ts

@@ -1,10 +1,10 @@
 import { Combine, NormalMapTypes } from "../../constants.js";
-import { MeshPhongMaterialParameters } from "../../materials/MeshPhongMaterial.js";
 import { Color } from "../../math/Color.js";
 import { Euler } from "../../math/Euler.js";
 import { Vector2 } from "../../math/Vector2.js";
+import Node from "../../nodes/core/Node.js";
 import { Texture } from "../../textures/Texture.js";
-import Node from "../core/Node.js";
+import { MeshPhongMaterialParameters } from "../MeshPhongMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface MeshPhongNodeMaterialParameters extends NodeMaterialParameters, MeshPhongMaterialParameters {

three/src/{nodes/materials → materials/nodes}/MeshPhysicalNodeMaterial.d.ts

@@ -1,8 +1,9 @@
-import { MeshPhysicalMaterialParameters } from "../../materials/MeshPhysicalMaterial.js";
 import { Color } from "../../math/Color.js";
 import { Vector2 } from "../../math/Vector2.js";
+import Node from "../../nodes/core/Node.js";
+import { ShaderNodeObject } from "../../nodes/tsl/TSLCore.js";
 import { Texture } from "../../textures/Texture.js";
-import Node from "../core/Node.js";
+import { MeshPhysicalMaterialParameters } from "../MeshPhysicalMaterial.js";
 import MeshStandardNodeMaterial, { MeshStandardNodeMaterialParameters } from "./MeshStandardNodeMaterial.js";
 
 export interface MeshPhysicalNodeMaterialParameters
@@ -87,4 +88,6 @@ export default class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial {
     get useAnisotropy(): boolean;
     get useTransmission(): boolean;
     get useDispersion(): boolean;
+
+    setupClearcoatNormal(): ShaderNodeObject<Node>;
 }

three/src/{nodes/materials → materials/nodes}/MeshSSSNodeMaterial.d.ts

@@ -1,5 +1,5 @@
-import ConstNode from "../core/ConstNode.js";
-import Node from "../core/Node.js";
+import ConstNode from "../../nodes/core/ConstNode.js";
+import Node from "../../nodes/core/Node.js";
 import MeshPhysicalNodeMaterial, { MeshPhysicalNodeMaterialParameters } from "./MeshPhysicalNodeMaterial.js";
 
 export default class MeshSSSNodeMaterial extends MeshPhysicalNodeMaterial {

three/src/{nodes/materials → materials/nodes}/MeshStandardNodeMaterial.d.ts

@@ -1,10 +1,10 @@
 import { NormalMapTypes } from "../../constants.js";
-import { MeshStandardMaterialParameters } from "../../materials/MeshStandardMaterial.js";
 import { Color } from "../../math/Color.js";
 import { Euler } from "../../math/Euler.js";
 import { Vector2 } from "../../math/Vector2.js";
+import Node from "../../nodes/core/Node.js";
 import { Texture } from "../../textures/Texture.js";
-import Node from "../core/Node.js";
+import { MeshStandardMaterialParameters } from "../MeshStandardMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface MeshStandardNodeMaterialParameters extends NodeMaterialParameters, MeshStandardMaterialParameters {
@@ -52,5 +52,5 @@ export default class MeshStandardNodeMaterial extends NodeMaterial {
     flatShading: boolean;
     fog: boolean;
 
-    constructor(paramters?: MeshStandardNodeMaterialParameters);
+    constructor(parameters?: MeshStandardNodeMaterialParameters);
 }

three/src/{nodes/materials → materials/nodes}/MeshToonNodeMaterial.d.ts

@@ -1,8 +1,8 @@
 import { NormalMapTypes } from "../../constants.js";
-import { MeshToonMaterialParameters } from "../../materials/MeshToonMaterial.js";
 import { Color } from "../../math/Color.js";
 import { Vector2 } from "../../math/Vector2.js";
 import { Texture } from "../../textures/Texture.js";
+import { MeshToonMaterialParameters } from "../MeshToonMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface MeshToonNodeMaterialParameters extends NodeMaterialParameters, MeshToonMaterialParameters {
@@ -38,5 +38,5 @@ export default class MeshToonNodeMaterial extends NodeMaterial {
     wireframeLinejoin: string;
     fog: boolean;
 
-    constructor(paramters: MeshToonNodeMaterialParameters);
+    constructor(parameters?: MeshToonNodeMaterialParameters);
 }

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

@@ -0,0 +1,91 @@
+import ClippingNode from "../../nodes/accessors/ClippingNode.js";
+import LightingModel from "../../nodes/core/LightingModel.js";
+import MRTNode from "../../nodes/core/MRTNode.js";
+import Node from "../../nodes/core/Node.js";
+import NodeBuilder from "../../nodes/core/NodeBuilder.js";
+import LightsNode from "../../nodes/lighting/LightsNode.js";
+import { ShaderNodeObject } from "../../nodes/tsl/TSLCore.js";
+import { Material, MaterialParameters } from "../Material.js";
+
+export interface NodeMaterialParameters extends MaterialParameters {
+    normals?: boolean | undefined;
+
+    colorSpaced?: boolean | undefined;
+
+    lightsNode?: LightsNode | null | undefined;
+    envNode?: Node | null | undefined;
+    aoNode?: Node | null | undefined;
+
+    colorNode?: Node | null | undefined;
+    normalNode?: Node | null | undefined;
+    opacityNode?: Node | null | undefined;
+    backdropNode?: Node | null | undefined;
+    backdropAlphaNode?: Node | null | undefined;
+    alphaTestNode?: Node | null | undefined;
+
+    positionNode?: Node | null | undefined;
+
+    depthNode?: Node | null | undefined;
+    shadowNode?: Node | null | undefined;
+
+    outputNode?: Node | null | undefined;
+
+    fragmentNode?: Node | null | undefined;
+    vertexNode?: Node | null | undefined;
+}
+
+declare class NodeMaterial extends Material {
+    readonly isNodeMaterial: true;
+
+    fog: boolean;
+    lights: boolean;
+
+    lightsNode: LightsNode | null;
+    envNode: Node | null;
+    aoNode: Node | null;
+
+    colorNode: Node | null;
+    normalNode: Node | null;
+    opacityNode: Node | null;
+    backdropNode: Node | null;
+    backdropAlphaNode: Node | null;
+    alphaTestNode: Node | null;
+
+    positionNode: Node | null;
+
+    depthNode: Node | null;
+    shadowNode: Node | null;
+    shadowPositionNode: Node | null;
+
+    outputNode: Node | null;
+    mrtNode: MRTNode | null;
+
+    fragmentNode: Node | null;
+    vertexNode: Node | null;
+
+    constructor();
+
+    build(builder: NodeBuilder): void;
+    setup(builder: NodeBuilder): void;
+    setupClipping(builder: NodeBuilder): ClippingNode | null;
+    setupDepth(builder: NodeBuilder): void;
+    setupPosition(builder: NodeBuilder): Node;
+    setupDiffuseColor(builder: NodeBuilder): void;
+    setupVariants(builder: NodeBuilder): void;
+    setupNormal(builder: NodeBuilder): ShaderNodeObject<Node>;
+    setupEnvironment(builder: NodeBuilder): Node | null;
+    setupLightMap(builder: NodeBuilder): Node | null;
+    setupLights(builder: NodeBuilder): LightsNode;
+    setupOutgoingLight(): Node;
+    setupLightingModel(builder: NodeBuilder): LightingModel;
+    setupLighting(builder: NodeBuilder): Node;
+    setupOutput(builder: NodeBuilder, outputNode: Node): Node;
+
+    setDefaultValues(material: Material): void;
+}
+
+export default NodeMaterial;
+
+export function registerNodeMaterial(type: string, nodeMaterialClass: { new(): NodeMaterial }): string;
+
+export function createNodeMaterialFromType(type: string): NodeMaterial;

three/src/{nodes/materials/Materials.d.ts → materials/nodes/NodeMaterials.d.ts}

@@ -1,14 +1,17 @@
+export { default as InstancedPointsNodeMaterial } from "./InstancedPointsNodeMaterial.js";
 export { default as Line2NodeMaterial } from "./Line2NodeMaterial.js";
 export { default as LineBasicNodeMaterial } from "./LineBasicNodeMaterial.js";
+export { default as LineDashedNodeMaterial } from "./LineDashedNodeMaterial.js";
 export { default as MeshBasicNodeMaterial } from "./MeshBasicNodeMaterial.js";
+export { default as MeshLambertNodeMaterial } from "./MeshLambertNodeMaterial.js";
 export { default as MeshMatcapNodeMaterial } from "./MeshMatcapNodeMaterial.js";
 export { default as MeshNormalNodeMaterial } from "./MeshNormalNodeMaterial.js";
 export { default as MeshPhongNodeMaterial } from "./MeshPhongNodeMaterial.js";
 export { default as MeshPhysicalNodeMaterial } from "./MeshPhysicalNodeMaterial.js";
-export { default as MeshSSSPhysicalNodeMaterial } from "./MeshSSSNodeMaterial.js";
+export { default as MeshSSSNodeMaterial } from "./MeshSSSNodeMaterial.js";
 export { default as MeshStandardNodeMaterial } from "./MeshStandardNodeMaterial.js";
 export { default as MeshToonNodeMaterial } from "./MeshToonNodeMaterial.js";
-export { addNodeMaterial, createNodeMaterialFromType, default as NodeMaterial } from "./NodeMaterial.js";
+export { default as NodeMaterial } from "./NodeMaterial.js";
 export { default as PointsNodeMaterial } from "./PointsNodeMaterial.js";
 export { default as ShadowNodeMaterial } from "./ShadowNodeMaterial.js";
 export { default as SpriteNodeMaterial } from "./SpriteNodeMaterial.js";

three/src/{nodes/materials → materials/nodes}/PointsNodeMaterial.d.ts

@@ -1,6 +1,6 @@
-import { PointsMaterialParameters } from "../../materials/PointsMaterial.js";
 import { Color } from "../../math/Color.js";
 import { Texture } from "../../textures/Texture.js";
+import { PointsMaterialParameters } from "../PointsMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface PointsNodeMaterialParameters extends NodeMaterialParameters, PointsMaterialParameters {
@@ -16,7 +16,6 @@ export default class PointsNodeMaterial extends NodeMaterial {
     alphaMap: Texture | null;
     size: number;
     sizeAttenuation: boolean;
-    fog: boolean;
 
     constructor(parameters?: PointsNodeMaterialParameters);
 }

three/src/{nodes/materials → materials/nodes}/ShadowNodeMaterial.d.ts

@@ -1,5 +1,5 @@
-import { ShadowMaterialParameters } from "../../materials/ShadowMaterial.js";
 import { Color } from "../../math/Color.js";
+import { ShadowMaterialParameters } from "../ShadowMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface ShadowNodeMaterialParameters extends NodeMaterialParameters, ShadowMaterialParameters {

three/src/{nodes/materials → materials/nodes}/SpriteNodeMaterial.d.ts

@@ -1,7 +1,7 @@
-import { SpriteMaterialParameters } from "../../materials/SpriteMaterial.js";
 import { Color } from "../../math/Color.js";
+import Node from "../../nodes/core/Node.js";
 import { Texture } from "../../textures/Texture.js";
-import Node from "../core/Node.js";
+import { SpriteMaterialParameters } from "../SpriteMaterial.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export interface SpriteNodeMaterialParameters extends NodeMaterialParameters, SpriteMaterialParameters {

three/src/{nodes/materials → materials/nodes}/VolumeNodeMaterial.d.ts

@@ -1,4 +1,4 @@
-import Node from "../core/Node.js";
+import Node from "../../nodes/core/Node.js";
 import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js";
 
 export default class VolumeNodeMaterial extends NodeMaterial {