diff --git a/types/three/examples/jsm/nodes/materials/MeshPhongNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/MeshPhongNodeMaterial.d.ts index 6698fe0a7..426d6f151 100644 --- a/types/three/examples/jsm/nodes/materials/MeshPhongNodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/MeshPhongNodeMaterial.d.ts @@ -1,6 +1,5 @@ import { Color, Combine, Euler, MeshPhongMaterialParameters, NormalMapTypes, Texture, Vector2 } from "three"; import Node from "../core/Node.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js"; export interface MeshPhongNodeMaterialParameters extends NodeMaterialParameters, MeshPhongMaterialParameters { @@ -9,8 +8,8 @@ export interface MeshPhongNodeMaterialParameters extends NodeMaterialParameters, export default class MeshPhongNodeMaterial extends NodeMaterial { readonly isMeshPhongNodeMaterial: true; - shininessNode: ShaderNodeObject | null; - specularNode: ShaderNodeObject | null; + shininessNode: Node | null; + specularNode: Node | null; // Properties from MeshPhongMaterial readonly isMeshPhongMaterial: true; diff --git a/types/three/examples/jsm/nodes/materials/MeshPhysicalNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/MeshPhysicalNodeMaterial.d.ts index 9101caea1..2349b46a1 100644 --- a/types/three/examples/jsm/nodes/materials/MeshPhysicalNodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/MeshPhysicalNodeMaterial.d.ts @@ -1,7 +1,6 @@ import { Color, MeshPhysicalMaterialParameters, Texture, Vector2 } from "three"; import Node from "../core/Node.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import MeshStandardNodeMaterial, { MeshStandardNodeMaterialParameters } from "./MeshStandardNodeMaterial.js"; export interface MeshPhysicalNodeMaterialParameters @@ -12,29 +11,29 @@ export interface MeshPhysicalNodeMaterialParameters export default class MeshPhysicalNodeMaterial extends MeshStandardNodeMaterial { readonly isMeshPhysicalNodeMaterial: true; - clearcoatNode: ShaderNodeObject | null; - clearcoatRoughnessNode: ShaderNodeObject | null; - clearcoatNormalNode: ShaderNodeObject | null; + clearcoatNode: Node | null; + clearcoatRoughnessNode: Node | null; + clearcoatNormalNode: Node | null; - sheenNode: ShaderNodeObject | null; - sheenRoughnessNode: ShaderNodeObject | null; + sheenNode: Node | null; + sheenRoughnessNode: Node | null; - iridescenceNode: ShaderNodeObject | null; - iridescenceIORNode: ShaderNodeObject | null; - iridescenceThicknessNode: ShaderNodeObject | null; + iridescenceNode: Node | null; + iridescenceIORNode: Node | null; + iridescenceThicknessNode: Node | null; - iorNode: ShaderNodeObject | null; + iorNode: Node | null; - specularIntensityNode: ShaderNodeObject | null; - specularColorNode: ShaderNodeObject | null; + specularIntensityNode: Node | null; + specularColorNode: Node | null; - transmissionNode: ShaderNodeObject | null; - thicknessNode: ShaderNodeObject | null; - attenuationDistanceNode: ShaderNodeObject | null; - attenuationColorNode: ShaderNodeObject | null; - dispersionNode: ShaderNodeObject | null; + transmissionNode: Node | null; + thicknessNode: Node | null; + attenuationDistanceNode: Node | null; + attenuationColorNode: Node | null; + dispersionNode: Node | null; - anisotropyNode: ShaderNodeObject | null; + anisotropyNode: Node | null; // Properties from MeshPhysicalMaterial readonly isMeshPhysicalMaterial: true; diff --git a/types/three/examples/jsm/nodes/materials/MeshSSSNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/MeshSSSNodeMaterial.d.ts index 00c594427..8506de76c 100644 --- a/types/three/examples/jsm/nodes/materials/MeshSSSNodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/MeshSSSNodeMaterial.d.ts @@ -1,15 +1,14 @@ import ConstNode from "../core/ConstNode.js"; import Node from "../core/Node.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import MeshPhysicalNodeMaterial, { MeshPhysicalNodeMaterialParameters } from "./MeshPhysicalNodeMaterial.js"; export default class MeshSSSNodeMaterial extends MeshPhysicalNodeMaterial { - thicknessColorNode: ShaderNodeObject | null; - thicknessDistortionNode: ShaderNodeObject>; - thicknessAmbientNode: ShaderNodeObject>; - thicknessAttenuationNode: ShaderNodeObject>; - thicknessPowerNode: ShaderNodeObject>; - thicknessScaleNode: ShaderNodeObject>; + thicknessColorNode: Node | null; + thicknessDistortionNode: ConstNode; + thicknessAmbientNode: ConstNode; + thicknessAttenuationNode: ConstNode; + thicknessPowerNode: ConstNode; + thicknessScaleNode: ConstNode; constructor(parameters?: MeshPhysicalNodeMaterialParameters); diff --git a/types/three/examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts index 3a13f7d5f..e109eae1d 100644 --- a/types/three/examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/MeshStandardNodeMaterial.d.ts @@ -1,6 +1,5 @@ import { Color, Euler, MeshStandardMaterialParameters, NormalMapTypes, Texture, Vector2 } from "three"; import Node from "../core/Node.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js"; export interface MeshStandardNodeMaterialParameters extends NodeMaterialParameters, MeshStandardMaterialParameters { @@ -9,10 +8,10 @@ export interface MeshStandardNodeMaterialParameters extends NodeMaterialParamete export default class MeshStandardNodeMaterial extends NodeMaterial { readonly isMeshStandardNodeMaterial: true; - emissiveNode: ShaderNodeObject | null; + emissiveNode: Node | null; - metalnessNode: ShaderNodeObject | null; - roughnessNode: ShaderNodeObject | null; + metalnessNode: Node | null; + roughnessNode: Node | null; // Properties from MeshStandardMaterial readonly isMeshStandardMaterial: true; diff --git a/types/three/examples/jsm/nodes/materials/NodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/NodeMaterial.d.ts index 23edeab88..fe757681a 100644 --- a/types/three/examples/jsm/nodes/materials/NodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/NodeMaterial.d.ts @@ -18,7 +18,6 @@ import LightingModel from "../core/LightingModel.js"; import Node from "../core/Node.js"; import NodeBuilder from "../core/NodeBuilder.js"; import LightsNode from "../lighting/LightsNode.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import LineBasicNodeMaterial from "./LineBasicNodeMaterial.js"; import MeshBasicNodeMaterial from "./MeshBasicNodeMaterial.js"; import MeshMatcapNodeMaterial from "./MeshMatcapNodeMaterial.js"; @@ -36,26 +35,26 @@ export interface NodeMaterialParameters extends MaterialParameters { colorSpaced?: boolean | undefined; - lightsNode?: ShaderNodeObject | null | undefined; - envNode?: ShaderNodeObject | null | undefined; - aoNode?: ShaderNodeObject | null | undefined; + lightsNode?: LightsNode | null | undefined; + envNode?: Node | null | undefined; + aoNode?: Node | null | undefined; - colorNode?: ShaderNodeObject | null | undefined; - normalNode?: ShaderNodeObject | null | undefined; - opacityNode?: ShaderNodeObject | null | undefined; - backdropNode?: ShaderNodeObject | null | undefined; - backdropAlphaNode?: ShaderNodeObject | null | undefined; - alphaTestNode?: ShaderNodeObject | 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?: ShaderNodeObject | null | undefined; + positionNode?: Node | null | undefined; - depthNode?: ShaderNodeObject | null | undefined; - shadowNode?: ShaderNodeObject | null | undefined; + depthNode?: Node | null | undefined; + shadowNode?: Node | null | undefined; - outputNode?: ShaderNodeObject | null | undefined; + outputNode?: Node | null | undefined; - fragmentNode?: ShaderNodeObject | null | undefined; - vertexNode?: ShaderNodeObject | null | undefined; + fragmentNode?: Node | null | undefined; + vertexNode?: Node | null | undefined; } export default class NodeMaterial extends Material { @@ -63,33 +62,33 @@ export default class NodeMaterial extends Material { normals: boolean; - lightsNode: ShaderNodeObject | null; - envNode: ShaderNodeObject | null; - aoNode: ShaderNodeObject | null; + lightsNode: LightsNode | null; + envNode: Node | null; + aoNode: Node | null; - colorNode: ShaderNodeObject | null; - normalNode: ShaderNodeObject | null; - opacityNode: ShaderNodeObject | null; - backdropNode: ShaderNodeObject | null; - backdropAlphaNode: ShaderNodeObject | null; - alphaTestNode: ShaderNodeObject | null; + colorNode: Node | null; + normalNode: Node | null; + opacityNode: Node | null; + backdropNode: Node | null; + backdropAlphaNode: Node | null; + alphaTestNode: Node | null; - positionNode: ShaderNodeObject | null; + positionNode: Node | null; - depthNode: ShaderNodeObject | null; - shadowNode: ShaderNodeObject | null; - shadowPositionNode: ShaderNodeObject | null; + depthNode: Node | null; + shadowNode: Node | null; + shadowPositionNode: Node | null; - outputNode: ShaderNodeObject | null; + outputNode: Node | null; - fragmentNode: ShaderNodeObject | null; - vertexNode: ShaderNodeObject | null; + fragmentNode: Node | null; + vertexNode: Node | null; constructor(); build(builder: NodeBuilder): void; setup(builder: NodeBuilder): void; - setupClipping(builder: NodeBuilder): ShaderNodeObject | null; + setupClipping(builder: NodeBuilder): ClippingNode | null; setupDepth(builder: NodeBuilder): void; setupPosition(builder: NodeBuilder): Node; setupDiffuseColor(builder: NodeBuilder): void; diff --git a/types/three/examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts b/types/three/examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts index d83587ffc..54b79f99c 100644 --- a/types/three/examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts +++ b/types/three/examples/jsm/nodes/materials/SpriteNodeMaterial.d.ts @@ -1,6 +1,5 @@ import { Color, SpriteMaterialParameters, Texture } from "three"; import Node from "../core/Node.js"; -import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; import NodeMaterial, { NodeMaterialParameters } from "./NodeMaterial.js"; export interface SpriteNodeMaterialParameters extends NodeMaterialParameters, SpriteMaterialParameters { @@ -9,8 +8,8 @@ export interface SpriteNodeMaterialParameters extends NodeMaterialParameters, Sp export default class SpriteNodeMaterial extends NodeMaterial { isSpriteNodeMaterial: true; - rotationNode: ShaderNodeObject | null; - scaleNode: ShaderNodeObject | null; + rotationNode: Node | null; + scaleNode: Node | null; // Properties from SpriteMaterial readonly isSpriteMaterial: true;