From 5f299a3df744e9496db435a8407bd862f2f2bab1 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 20 Dec 2023 22:31:31 -0500 Subject: [PATCH 1/2] Use relative imports --- types/three/examples/jsm/nodes/shadernode/ShaderNode.d.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/types/three/examples/jsm/nodes/shadernode/ShaderNode.d.ts b/types/three/examples/jsm/nodes/shadernode/ShaderNode.d.ts index a6276e4b6..4f5798163 100644 --- a/types/three/examples/jsm/nodes/shadernode/ShaderNode.d.ts +++ b/types/three/examples/jsm/nodes/shadernode/ShaderNode.d.ts @@ -1,4 +1,7 @@ -import { ConstNode, Node, NodeBuilder, NodeTypeOption, SwizzleOption } from '../Nodes.js'; +import Node from '../core/Node.js'; +import { NodeTypeOption, SwizzleOption } from '../core/constants.js'; +import ConstNode from '../core/ConstNode.js'; +import NodeBuilder from '../core/NodeBuilder.js'; export type Swizzable = T & { [key in SwizzleOption | number]: Swizzable; From f0c0993085210a821f3a42ff51963bab5c22041e Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Wed, 20 Dec 2023 23:06:57 -0500 Subject: [PATCH 2/2] Fix imports --- types/three/examples/jsm/nodes/accessors/PositionNode.d.ts | 2 +- types/three/examples/jsm/nodes/code/CodeNode.d.ts | 2 +- types/three/examples/jsm/nodes/functions/BSDF/BRDF_GGX.d.ts | 2 +- types/three/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.d.ts | 2 +- types/three/examples/jsm/nodes/functions/BSDF/DFGApprox.d.ts | 2 +- types/three/examples/jsm/nodes/functions/BSDF/D_GGX.d.ts | 2 +- types/three/examples/jsm/nodes/functions/BSDF/F_Schlick.d.ts | 2 +- .../jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts | 2 +- .../examples/jsm/nodes/functions/PhysicalLightingModel.d.ts | 2 +- .../jsm/nodes/functions/material/getGeometryRoughness.d.ts | 2 +- .../examples/jsm/nodes/functions/material/getRoughness.d.ts | 2 +- types/three/examples/jsm/nodes/materialx/MaterialXNodes.d.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts b/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts index de11e6a17..0bcb8d4da 100644 --- a/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts +++ b/types/three/examples/jsm/nodes/accessors/PositionNode.d.ts @@ -1,5 +1,5 @@ import Node from '../core/Node.js'; -import { Swizzable } from '../shadernode/ShaderNode'; +import { Swizzable } from '../shadernode/ShaderNode.js'; export type PositionNodeScope = | typeof PositionNode.GEOMETRY diff --git a/types/three/examples/jsm/nodes/code/CodeNode.d.ts b/types/three/examples/jsm/nodes/code/CodeNode.d.ts index 6320021cc..29a070349 100644 --- a/types/three/examples/jsm/nodes/code/CodeNode.d.ts +++ b/types/three/examples/jsm/nodes/code/CodeNode.d.ts @@ -1,6 +1,6 @@ import Node from '../core/Node.js'; import NodeBuilder from '../core/NodeBuilder.js'; -import { NodeTypeOption } from '../core/constants'; +import { NodeTypeOption } from '../core/constants.js'; import { Swizzable } from '../shadernode/ShaderNode.js'; export interface CodeNodeInclude { diff --git a/types/three/examples/jsm/nodes/functions/BSDF/BRDF_GGX.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/BRDF_GGX.d.ts index 09f859bae..dbd14f8d8 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/BRDF_GGX.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/BRDF_GGX.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; declare const BRDF_GGX: ShaderNode<{ lightDirection: Node; f0: Node; f90: Node; roughness: Node }>; diff --git a/types/three/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.d.ts index b9269a908..4ccbcdbd1 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/BRDF_Lambert.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; declare const BRDF_Lambert: ShaderNode<{ diffuseColor: Node }>; diff --git a/types/three/examples/jsm/nodes/functions/BSDF/DFGApprox.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/DFGApprox.d.ts index 5a7da9f1d..6b839fcf5 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/DFGApprox.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/DFGApprox.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; // Analytical approximation of the DFG LUT, one half of the diff --git a/types/three/examples/jsm/nodes/functions/BSDF/D_GGX.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/D_GGX.d.ts index 1a2743710..2fc75a940 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/D_GGX.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/D_GGX.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; // Microfacet Models for Refraction through Rough Surfaces - equation (33) diff --git a/types/three/examples/jsm/nodes/functions/BSDF/F_Schlick.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/F_Schlick.d.ts index 354206bef..524bb87de 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/F_Schlick.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/F_Schlick.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; declare const F_Schlick: ShaderNode<{ f0: Node; f90: Node; dotVH: Node }>; diff --git a/types/three/examples/jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts b/types/three/examples/jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts index b53f4117c..0a158b8d8 100644 --- a/types/three/examples/jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts +++ b/types/three/examples/jsm/nodes/functions/BSDF/V_GGX_SmithCorrelated.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; declare const V_GGX_SmithCorrelated: ShaderNode<{ alpha: Node; dotNL: Node; dotNV: Node }>; diff --git a/types/three/examples/jsm/nodes/functions/PhysicalLightingModel.d.ts b/types/three/examples/jsm/nodes/functions/PhysicalLightingModel.d.ts index 07fe252a2..f5f140349 100644 --- a/types/three/examples/jsm/nodes/functions/PhysicalLightingModel.d.ts +++ b/types/three/examples/jsm/nodes/functions/PhysicalLightingModel.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../shadernode/ShaderNodeElements.js'; +import { ShaderNode } from '../shadernode/ShaderNode.js'; import Node from '../core/Node.js'; declare const PhysicalLightingModel: { diff --git a/types/three/examples/jsm/nodes/functions/material/getGeometryRoughness.d.ts b/types/three/examples/jsm/nodes/functions/material/getGeometryRoughness.d.ts index 29418711f..4d95f032a 100644 --- a/types/three/examples/jsm/nodes/functions/material/getGeometryRoughness.d.ts +++ b/types/three/examples/jsm/nodes/functions/material/getGeometryRoughness.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; declare const getGeometryRoughness: ShaderNode; diff --git a/types/three/examples/jsm/nodes/functions/material/getRoughness.d.ts b/types/three/examples/jsm/nodes/functions/material/getRoughness.d.ts index a5a3be8b7..8ec087a61 100644 --- a/types/three/examples/jsm/nodes/functions/material/getRoughness.d.ts +++ b/types/three/examples/jsm/nodes/functions/material/getRoughness.d.ts @@ -1,4 +1,4 @@ -import { ShaderNode } from '../../shadernode/ShaderNodeElements.js'; +import { ShaderNode } from '../../shadernode/ShaderNode.js'; import Node from '../../core/Node.js'; declare const getRoughness: ShaderNode<{ roughness: Node }>; diff --git a/types/three/examples/jsm/nodes/materialx/MaterialXNodes.d.ts b/types/three/examples/jsm/nodes/materialx/MaterialXNodes.d.ts index e849507be..9b3d07733 100644 --- a/types/three/examples/jsm/nodes/materialx/MaterialXNodes.d.ts +++ b/types/three/examples/jsm/nodes/materialx/MaterialXNodes.d.ts @@ -1,5 +1,5 @@ import { mx_hsvtorgb, mx_rgbtohsv } from './lib/mx_hsv.js'; -import { Swizzable } from '../shadernode/ShaderNodeElements.js'; +import { Swizzable } from '../shadernode/ShaderNode.js'; import { UVNode, MathNode } from '../Nodes.js'; import { NodeRepresentation } from '../shadernode/ShaderNode.js';