diff --git a/types/three/examples/jsm/nodes/Nodes.d.ts b/types/three/examples/jsm/nodes/Nodes.d.ts index 01f952981..41c17b979 100644 --- a/types/three/examples/jsm/nodes/Nodes.d.ts +++ b/types/three/examples/jsm/nodes/Nodes.d.ts @@ -260,18 +260,9 @@ export { objectWorldMatrix, } from "./accessors/Object3DNode.js"; export { default as PointUVNode, pointUV } from "./accessors/PointUVNode.js"; -export { - default as PositionNode, - positionGeometry, - positionLocal, - PositionNodeScope, - positionView, - positionViewDirection, - positionWorld, - positionWorldDirection, -} from "./accessors/PositionNode.js"; +export * from "./accessors/PositionNode.js"; export { default as ReferenceNode, reference, referenceBuffer } from "./accessors/ReferenceNode.js"; -export { default as ReflectVectorNode, reflectVector } from "./accessors/ReflectVectorNode.js"; +export * from "./accessors/ReflectVectorNode.js"; export { default as RendererReferenceNode, rendererReference } from "./accessors/RendererReferenceNode.js"; export { default as SkinningNode, skinning } from "./accessors/SkinningNode.js"; export { default as StorageBufferNode, storage, storageObject } from "./accessors/StorageBufferNode.js"; diff --git a/types/three/examples/jsm/nodes/accessors/ModelViewProjectionNode.d.ts b/types/three/examples/jsm/nodes/accessors/ModelViewProjectionNode.d.ts index 75a36a3a7..dee451a19 100644 --- a/types/three/examples/jsm/nodes/accessors/ModelViewProjectionNode.d.ts +++ b/types/three/examples/jsm/nodes/accessors/ModelViewProjectionNode.d.ts @@ -1,9 +1,8 @@ import Node from "../core/Node.js"; import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js"; -import PositionNode from "./PositionNode.js"; export default class ModelViewProjectionNode extends Node { - constructor(positionNode?: PositionNode); + constructor(positionNode?: Node); } export const modelViewProjection: (position?: NodeRepresentation) => ShaderNodeObject; diff --git a/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts b/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts index 36f8f1cbc..ae7b31b21 100644 --- a/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts +++ b/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts @@ -1,29 +1,9 @@ import Node from "../core/Node.js"; import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; -export type PositionNodeScope = - | typeof PositionNode.GEOMETRY - | typeof PositionNode.LOCAL - | typeof PositionNode.WORLD - | typeof PositionNode.WORLD_DIRECTION - | typeof PositionNode.VIEW - | typeof PositionNode.VIEW_DIRECTION; - -export default class PositionNode extends Node { - static GEOMETRY: "geometry"; - static LOCAL: "local"; - static WORLD: "world"; - static WORLD_DIRECTION: "worldDirection"; - static VIEW: "view"; - static VIEW_DIRECTION: "viewDirection"; - scope: PositionNodeScope; - - constructor(scope?: PositionNodeScope); -} - -export const positionGeometry: ShaderNodeObject; -export const positionLocal: ShaderNodeObject; -export const positionWorld: ShaderNodeObject; -export const positionWorldDirection: ShaderNodeObject; -export const positionView: ShaderNodeObject; -export const positionViewDirection: ShaderNodeObject; +export const positionGeometry: ShaderNodeObject; +export const positionLocal: ShaderNodeObject; +export const positionWorld: ShaderNodeObject; +export const positionWorldDirection: ShaderNodeObject; +export const positionView: ShaderNodeObject; +export const positionViewDirection: ShaderNodeObject; diff --git a/types/three/examples/jsm/nodes/accessors/ReflectVectorNode.d.ts b/types/three/examples/jsm/nodes/accessors/ReflectVectorNode.d.ts index 38a0bf5f5..973082340 100644 --- a/types/three/examples/jsm/nodes/accessors/ReflectVectorNode.d.ts +++ b/types/three/examples/jsm/nodes/accessors/ReflectVectorNode.d.ts @@ -1,11 +1,6 @@ import Node from "../core/Node.js"; +import VarNode from "../core/VarNode.js"; import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; -export default class ReflectVectorNode extends Node { - constructor(); - - getHash(): "reflectVector"; - setup(): Node; -} - -export const reflectVector: ShaderNodeObject; +export const reflectView: ShaderNodeObject; +export const reflectVector: ShaderNodeObject; diff --git a/types/three/examples/jsm/nodes/utils/EquirectUVNode.d.ts b/types/three/examples/jsm/nodes/utils/EquirectUVNode.d.ts index 10f48b03b..9020033d1 100644 --- a/types/three/examples/jsm/nodes/utils/EquirectUVNode.d.ts +++ b/types/three/examples/jsm/nodes/utils/EquirectUVNode.d.ts @@ -1,8 +1,8 @@ -import { PositionNode, TempNode } from "../Nodes.js"; +import { Node, TempNode } from "../Nodes.js"; import { ShaderNodeObject } from "../shadernode/ShaderNode.js"; export default class EquirectUVNode extends TempNode { - constructor(dirNode?: ShaderNodeObject); + constructor(dirNode?: ShaderNodeObject); } export const equirectUV: ShaderNodeObject; diff --git a/types/three/examples/jsm/nodes/utils/TriplanarTexturesNode.d.ts b/types/three/examples/jsm/nodes/utils/TriplanarTexturesNode.d.ts index acb6ceb25..55af273e3 100644 --- a/types/three/examples/jsm/nodes/utils/TriplanarTexturesNode.d.ts +++ b/types/three/examples/jsm/nodes/utils/TriplanarTexturesNode.d.ts @@ -1,4 +1,3 @@ -import PositionNode from "../accessors/PositionNode.js"; import TextureNode from "../accessors/TextureNode.js"; import Node from "../core/Node.js"; import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js"; @@ -10,16 +9,16 @@ export default class TriplanarTexturesNode extends Node { scaleNode: ShaderNodeObject; - positionNode: ShaderNodeObject; - normalNode: ShaderNodeObject; + positionNode: ShaderNodeObject; + normalNode: ShaderNodeObject; constructor( textureXNode: Node, textureYNode?: TextureNode | null, textureZNode?: TextureNode | null, scaleNode?: ShaderNodeObject, - positionNode?: ShaderNodeObject, - normalNode?: ShaderNodeObject, + positionNode?: ShaderNodeObject, + normalNode?: ShaderNodeObject, ); }