diff --git a/types/three/src/nodes/Nodes.d.ts b/types/three/src/nodes/Nodes.d.ts index 73e4a1b6f..11a9a44e3 100644 --- a/types/three/src/nodes/Nodes.d.ts +++ b/types/three/src/nodes/Nodes.d.ts @@ -300,17 +300,9 @@ export { default as VertexColorNode, vertexColor } from "./accessors/VertexColor export { afterImage, default as AfterImageNode } from "./display/AfterImageNode.js"; export { anamorphic, default as AnamorphicNode } from "./display/AnamorphicNode.js"; export { bleach } from "./display/BleachBypassNode.js"; -export { BlendMode, burn, default as BlendModeNode, dodge, overlay, screen } from "./display/BlendModeNode.js"; +export * from "./display/BlendModeNode.js"; export { bloom, default as BloomNode } from "./display/BloomNode.js"; -export { - ColorAdjustmentMethod, - default as ColorAdjustmentNode, - hue, - luminance, - saturation, - threshold, - vibrance, -} from "./display/ColorAdjustmentNode.js"; +export * from "./display/ColorAdjustmentNode.js"; export { ColorSpaceNodeMethod, colorSpaceToLinear, diff --git a/types/three/src/nodes/display/BlendModeNode.d.ts b/types/three/src/nodes/display/BlendModeNode.d.ts index c335f8295..4104fbbfb 100644 --- a/types/three/src/nodes/display/BlendModeNode.d.ts +++ b/types/three/src/nodes/display/BlendModeNode.d.ts @@ -3,39 +3,13 @@ import TempNode from "../core/TempNode.js"; import { JoinNode } from "../Nodes.js"; import { NodeRepresentation, ShaderNode, ShaderNodeObject } from "../shadernode/ShaderNode.js"; -export const BurnNode: (args: { base: Node; blend: Node }) => ShaderNodeObject; +export const burn: (base: NodeRepresentation, blend: NodeRepresentation) => ShaderNodeObject; -export const DodgeNode: (args: { base: Node; blend: Node }) => ShaderNodeObject; +export const dodge: (base: NodeRepresentation, blend: NodeRepresentation) => ShaderNodeObject; -export const ScreenNode: (args: { base: Node; blend: Node }) => ShaderNodeObject; +export const screen: (base: NodeRepresentation, blend: NodeRepresentation) => ShaderNodeObject; -export const OverlayNode: (args: { base: Node; blend: Node }) => ShaderNodeObject; - -export type BlendMode = - | typeof BlendModeNode.BURN - | typeof BlendModeNode.DODGE - | typeof BlendModeNode.SCREEN - | typeof BlendModeNode.OVERLAY; - -export default class BlendModeNode extends TempNode { - static BURN: "burn"; - static DODGE: "dodge"; - static SCREEN: "screen"; - static OVERLAY: "overlay"; - - baseNode: Node; - blendMode: BlendMode; - blendNode: Node; - - constructor(blendMode: BlendMode, baseNode: Node, blendNode: Node); - - setup(): Node; -} - -export const burn: (baseNode: NodeRepresentation, blendNode?: NodeRepresentation) => ShaderNodeObject; -export const dodge: (baseNode: NodeRepresentation, blendNode?: NodeRepresentation) => ShaderNodeObject; -export const overlay: (baseNode: NodeRepresentation, blendNode?: NodeRepresentation) => ShaderNodeObject; -export const screen: (baseNode: NodeRepresentation, blendNode?: NodeRepresentation) => ShaderNodeObject; +export const overlay: (base: NodeRepresentation, blend: NodeRepresentation) => ShaderNodeObject; declare module "../shadernode/ShaderNode.js" { interface NodeElements { diff --git a/types/three/src/nodes/display/ColorAdjustmentNode.d.ts b/types/three/src/nodes/display/ColorAdjustmentNode.d.ts index 517407fce..4e2400439 100644 --- a/types/three/src/nodes/display/ColorAdjustmentNode.d.ts +++ b/types/three/src/nodes/display/ColorAdjustmentNode.d.ts @@ -1,39 +1,26 @@ -import TempNode from "../core/TempNode.js"; +import Node from "../core/Node.js"; import MathNode from "../math/MathNode.js"; import { NodeRepresentation, ShaderNodeObject } from "../shadernode/ShaderNode.js"; -export type ColorAdjustmentMethod = - | typeof ColorAdjustmentNode.SATURATION - | typeof ColorAdjustmentNode.VIBRANCE - | typeof ColorAdjustmentNode.HUE; - -export default class ColorAdjustmentNode extends TempNode { - static SATURATION: "saturation"; - static VIBRANCE: "vibrance"; - static HUE: "hue"; - - method: ColorAdjustmentMethod; - - colorNode: Node; - adjustmentNode: Node; - - constructor(method: ColorAdjustmentMethod, colorNode: Node, adjustmentNode?: Node); -} - export const saturation: ( - colorNode: NodeRepresentation, - adjustmentNode?: NodeRepresentation, -) => ShaderNodeObject; + color: NodeRepresentation, + adjustment?: NodeRepresentation, +) => ShaderNodeObject; + export const vibrance: ( - colorNode: NodeRepresentation, - adjustmentNode?: NodeRepresentation, -) => ShaderNodeObject; -export const hue: ( - colorNode: NodeRepresentation, - adjustmentNode?: NodeRepresentation, -) => ShaderNodeObject; + color: NodeRepresentation, + adjustment?: NodeRepresentation, +) => ShaderNodeObject; -export const luminance: (a: NodeRepresentation, b?: NodeRepresentation) => ShaderNodeObject; +export const hue: ( + color: NodeRepresentation, + adjustment?: NodeRepresentation, +) => ShaderNodeObject; + +export const luminance: ( + color: NodeRepresentation, + luminanceCoefficients?: NodeRepresentation, +) => ShaderNodeObject; export const threshold: (color: NodeRepresentation, thershold: NodeRepresentation) => ShaderNodeObject;