Browse Source

Change alias 'three-nodes' → 'three/nodes' (#24413)

* Change alias 'three-nodes' → 'three/nodes'

* Clean up

* update new examples

Co-authored-by: sunag <[email protected]>
Don McCurdy 2 years ago
parent
commit
9cfb9790ca
65 changed files with 121 additions and 119 deletions
  1. 1 1
      examples/jsm/node-editor/accessors/MatcapUVEditor.js
  2. 1 1
      examples/jsm/node-editor/accessors/NormalEditor.js
  3. 1 1
      examples/jsm/node-editor/accessors/PositionEditor.js
  4. 1 1
      examples/jsm/node-editor/accessors/UVEditor.js
  5. 1 1
      examples/jsm/node-editor/display/BlendEditor.js
  6. 1 1
      examples/jsm/node-editor/display/NormalMapEditor.js
  7. 1 1
      examples/jsm/node-editor/inputs/ColorEditor.js
  8. 1 1
      examples/jsm/node-editor/inputs/FloatEditor.js
  9. 1 1
      examples/jsm/node-editor/inputs/SliderEditor.js
  10. 1 1
      examples/jsm/node-editor/inputs/TextureEditor.js
  11. 1 1
      examples/jsm/node-editor/inputs/Vector2Editor.js
  12. 1 1
      examples/jsm/node-editor/inputs/Vector3Editor.js
  13. 1 1
      examples/jsm/node-editor/inputs/Vector4Editor.js
  14. 1 1
      examples/jsm/node-editor/materials/BasicMaterialEditor.js
  15. 1 1
      examples/jsm/node-editor/materials/PointsMaterialEditor.js
  16. 1 1
      examples/jsm/node-editor/materials/StandardMaterialEditor.js
  17. 1 1
      examples/jsm/node-editor/math/AngleEditor.js
  18. 1 1
      examples/jsm/node-editor/math/DotEditor.js
  19. 1 1
      examples/jsm/node-editor/math/InvertEditor.js
  20. 1 1
      examples/jsm/node-editor/math/LimiterEditor.js
  21. 1 1
      examples/jsm/node-editor/math/NormalizeEditor.js
  22. 1 1
      examples/jsm/node-editor/math/OperatorEditor.js
  23. 1 1
      examples/jsm/node-editor/math/PowerEditor.js
  24. 1 1
      examples/jsm/node-editor/math/TrigonometryEditor.js
  25. 1 1
      examples/jsm/node-editor/procedural/CheckerEditor.js
  26. 1 1
      examples/jsm/node-editor/utils/JoinEditor.js
  27. 1 1
      examples/jsm/node-editor/utils/OscillatorEditor.js
  28. 3 3
      examples/jsm/node-editor/utils/PreviewEditor.js
  29. 1 1
      examples/jsm/node-editor/utils/SplitEditor.js
  30. 1 1
      examples/jsm/node-editor/utils/TimerEditor.js
  31. 17 2
      examples/jsm/nodes/Nodes.js
  32. 1 1
      examples/jsm/renderers/webgl/nodes/SlotNode.js
  33. 1 5
      examples/jsm/renderers/webgl/nodes/WebGLNodeBuilder.js
  34. 1 1
      examples/jsm/renderers/webgl/nodes/WebGLNodes.js
  35. 1 2
      examples/jsm/renderers/webgpu/WebGPUBackground.js
  36. 1 1
      examples/jsm/renderers/webgpu/WebGPURenderStates.js
  37. 1 6
      examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js
  38. 1 1
      examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js
  39. 2 2
      examples/webgl_nodes_loader_gltf_iridescence.html
  40. 2 2
      examples/webgl_nodes_loader_gltf_sheen.html
  41. 2 2
      examples/webgl_nodes_loader_gltf_transmission.html
  42. 2 3
      examples/webgl_nodes_materials_instance_uniform.html
  43. 3 3
      examples/webgl_nodes_materials_physical_clearcoat.html
  44. 2 2
      examples/webgl_nodes_materials_standard.html
  45. 3 3
      examples/webgl_nodes_materialx_noise.html
  46. 2 3
      examples/webgl_nodes_playground.html
  47. 1 1
      examples/webgl_nodes_points.html
  48. 3 3
      examples/webgpu_compute.html
  49. 3 3
      examples/webgpu_cubemap_adjustments.html
  50. 3 3
      examples/webgpu_cubemap_mix.html
  51. 3 3
      examples/webgpu_depth_texture.html
  52. 2 2
      examples/webgpu_instance_mesh.html
  53. 3 3
      examples/webgpu_instance_uniform.html
  54. 2 2
      examples/webgpu_lights_custom.html
  55. 3 3
      examples/webgpu_lights_selective.html
  56. 2 2
      examples/webgpu_loader_gltf.html
  57. 3 3
      examples/webgpu_materials.html
  58. 2 3
      examples/webgpu_nodes_playground.html
  59. 3 3
      examples/webgpu_particles.html
  60. 2 2
      examples/webgpu_rtt.html
  61. 2 2
      examples/webgpu_sandbox.html
  62. 2 2
      examples/webgpu_skinning.html
  63. 3 3
      examples/webgpu_skinning_instancing.html
  64. 2 2
      examples/webgpu_skinning_points.html
  65. 3 3
      examples/webgpu_sprites.html

+ 1 - 1
examples/jsm/node-editor/accessors/MatcapUVEditor.js

@@ -1,5 +1,5 @@
 import { BaseNode } from '../core/BaseNode.js';
-import { MatcapUVNode } from 'three-nodes/Nodes.js';
+import { MatcapUVNode } from 'three/nodes';
 
 export class MatcapUVEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/accessors/NormalEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { NormalNode } from 'three-nodes/Nodes.js';
+import { NormalNode } from 'three/nodes';
 
 export class NormalEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/accessors/PositionEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { PositionNode } from 'three-nodes/Nodes.js';
+import { PositionNode } from 'three/nodes';
 
 export class PositionEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/accessors/UVEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { UVNode } from 'three-nodes/Nodes.js';
+import { UVNode } from 'three/nodes';
 
 export class UVEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/display/BlendEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const NULL_VALUE = new UniformNode( 0 );
 const ONE_VALUE = new UniformNode( 1 );

+ 1 - 1
examples/jsm/node-editor/display/NormalMapEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, Element, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { NormalMapNode, ConstNode } from 'three-nodes/Nodes.js';
+import { NormalMapNode, ConstNode } from 'three/nodes';
 import { TangentSpaceNormalMap, ObjectSpaceNormalMap } from 'three';
 
 const nullValue = new ConstNode( 0 );

+ 1 - 1
examples/jsm/node-editor/inputs/ColorEditor.js

@@ -1,7 +1,7 @@
 import { ColorInput, StringInput, NumberInput, LabelElement, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Color } from 'three';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class ColorEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/inputs/FloatEditor.js

@@ -1,6 +1,6 @@
 import { NumberInput, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class FloatEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/inputs/SliderEditor.js

@@ -1,6 +1,6 @@
 import { ButtonInput, SliderInput, NumberInput, LabelElement, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class SliderEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/inputs/TextureEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement, ToggleInput, SelectInput } from '../../libs/flow.module.js';
 import { BaseNode, onNodeValidElement } from '../core/BaseNode.js';
-import { TextureNode, UVNode } from 'three-nodes/Nodes.js';
+import { TextureNode, UVNode } from 'three/nodes';
 import { Texture, TextureLoader, RepeatWrapping, ClampToEdgeWrapping, MirroredRepeatWrapping } from 'three';
 
 const fileTexture = new WeakMap();

+ 1 - 1
examples/jsm/node-editor/inputs/Vector2Editor.js

@@ -1,7 +1,7 @@
 import { NumberInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector2 } from 'three';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class Vector2Editor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/inputs/Vector3Editor.js

@@ -1,7 +1,7 @@
 import { NumberInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector3 } from 'three';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class Vector3Editor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/inputs/Vector4Editor.js

@@ -1,7 +1,7 @@
 import { NumberInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector4 } from 'three';
-import { UniformNode } from 'three-nodes/Nodes.js';
+import { UniformNode } from 'three/nodes';
 
 export class Vector4Editor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/materials/BasicMaterialEditor.js

@@ -1,6 +1,6 @@
 import { ColorInput, SliderInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MeshBasicNodeMaterial } from 'three-nodes/Nodes.js';
+import { MeshBasicNodeMaterial } from 'three/nodes';
 import { MathUtils } from 'three';
 
 export class BasicMaterialEditor extends BaseNode {

+ 1 - 1
examples/jsm/node-editor/materials/PointsMaterialEditor.js

@@ -1,6 +1,6 @@
 import { ColorInput, ToggleInput, SliderInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { PointsNodeMaterial } from 'three-nodes/Nodes.js';
+import { PointsNodeMaterial } from 'three/nodes';
 import * as THREE from 'three';
 
 export class PointsMaterialEditor extends BaseNode {

+ 1 - 1
examples/jsm/node-editor/materials/StandardMaterialEditor.js

@@ -1,6 +1,6 @@
 import { ColorInput, SliderInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MeshStandardNodeMaterial } from 'three-nodes/Nodes.js';
+import { MeshStandardNodeMaterial } from 'three/nodes';
 import * as THREE from 'three';
 
 export class StandardMaterialEditor extends BaseNode {

+ 1 - 1
examples/jsm/node-editor/math/AngleEditor.js

@@ -1,7 +1,7 @@
 import { SelectInput, Element, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector3 } from 'three';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const DEFAULT_VALUE = new UniformNode( new Vector3() );
 

+ 1 - 1
examples/jsm/node-editor/math/DotEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const NULL_VALUE = new UniformNode( 0 );
 

+ 1 - 1
examples/jsm/node-editor/math/InvertEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const DEFAULT_VALUE = new UniformNode( 0 );
 

+ 1 - 1
examples/jsm/node-editor/math/LimiterEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, LabelElement, Element, NumberInput } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 export class LimiterEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/math/NormalizeEditor.js

@@ -1,7 +1,7 @@
 import { LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector3 } from 'three';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const DEFAULT_VALUE = new UniformNode( new Vector3() );
 

+ 1 - 1
examples/jsm/node-editor/math/OperatorEditor.js

@@ -1,5 +1,5 @@
 import { Element, LabelElement, NumberInput, SelectInput } from '../../libs/flow.module.js';
-import { UniformNode, OperatorNode } from 'three-nodes/Nodes.js';
+import { UniformNode, OperatorNode } from 'three/nodes';
 import { BaseNode } from '../core/BaseNode.js';
 
 export class OperatorEditor extends BaseNode {

+ 1 - 1
examples/jsm/node-editor/math/PowerEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement, NumberInput } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 export class PowerEditor extends BaseNode {
 

+ 1 - 1
examples/jsm/node-editor/math/TrigonometryEditor.js

@@ -1,7 +1,7 @@
 import { SelectInput, Element, LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
 import { Vector3 } from 'three';
-import { MathNode, UniformNode } from 'three-nodes/Nodes.js';
+import { MathNode, UniformNode } from 'three/nodes';
 
 const DEFAULT_VALUE = new UniformNode( new Vector3() );
 

+ 1 - 1
examples/jsm/node-editor/procedural/CheckerEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { CheckerNode, UVNode } from 'three-nodes/Nodes.js';
+import { CheckerNode, UVNode } from 'three/nodes';
 
 const defaultUV = new UVNode();
 

+ 1 - 1
examples/jsm/node-editor/utils/JoinEditor.js

@@ -1,6 +1,6 @@
 import { LabelElement } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { JoinNode, UniformNode } from 'three-nodes/Nodes.js';
+import { JoinNode, UniformNode } from 'three/nodes';
 
 const NULL_VALUE = new UniformNode( 0 );
 

+ 1 - 1
examples/jsm/node-editor/utils/OscillatorEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, LabelElement, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { OscNode, UniformNode } from 'three-nodes/Nodes.js';
+import { OscNode, UniformNode } from 'three/nodes';
 
 const NULL_VALUE = new UniformNode( 0 );
 

+ 3 - 3
examples/jsm/node-editor/utils/PreviewEditor.js

@@ -1,8 +1,8 @@
-import { OrbitControls } from 'three-addons/controls/OrbitControls.js';
-import { ViewHelper } from 'three-addons/helpers/ViewHelper.js';
+import { OrbitControls } from '../../controls/OrbitControls.js';
+import { ViewHelper } from '../../helpers/ViewHelper.js';
 import { Element, LabelElement, SelectInput } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { MeshBasicNodeMaterial, ConstNode } from 'three-nodes/Nodes.js';
+import { MeshBasicNodeMaterial, ConstNode } from 'three/nodes';
 import { WebGLRenderer, PerspectiveCamera, Scene, Mesh, DoubleSide, SphereGeometry, BoxGeometry, PlaneGeometry, TorusKnotGeometry } from 'three';
 
 const nullValue = new ConstNode( 0 );

+ 1 - 1
examples/jsm/node-editor/utils/SplitEditor.js

@@ -1,6 +1,6 @@
 import { SelectInput, Element } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { SplitNode, UniformNode } from 'three-nodes/Nodes.js';
+import { SplitNode, UniformNode } from 'three/nodes';
 
 const NULL_VALUE = new UniformNode( 0 );
 

+ 1 - 1
examples/jsm/node-editor/utils/TimerEditor.js

@@ -1,6 +1,6 @@
 import { NumberInput, LabelElement, Element, ButtonInput } from '../../libs/flow.module.js';
 import { BaseNode } from '../core/BaseNode.js';
-import { TimerNode } from 'three-nodes/Nodes.js';
+import { TimerNode } from 'three/nodes';
 
 export class TimerEditor extends BaseNode {
 

+ 17 - 2
examples/jsm/nodes/Nodes.js

@@ -90,6 +90,10 @@ import NodeLoader from './loaders/NodeLoader.js';
 import NodeObjectLoader from './loaders/NodeObjectLoader.js';
 import NodeMaterialLoader from './loaders/NodeMaterialLoader.js';
 
+// parsers
+import WGSLNodeParser from './parsers/WGSLNodeParser.js';
+import GLSLNodeParser from './parsers/GLSLNodeParser.js';
+
 // procedural
 import CheckerNode from './procedural/CheckerNode.js';
 
@@ -106,6 +110,9 @@ export * from './materials/Materials.js';
 // shader node
 export * from './shadernode/ShaderNodeElements.js';
 
+// shader stages
+export { defaultShaderStages }  from './core/NodeBuilder.js';
+
 const nodeLib = {
 	// core
 	ArrayUniformNode,
@@ -204,7 +211,11 @@ const nodeLib = {
 	// loaders
 	NodeLoader,
 	NodeObjectLoader,
-	NodeMaterialLoader
+	NodeMaterialLoader,
+
+	// parsers
+	WGSLNodeParser,
+	GLSLNodeParser,
 
 };
 
@@ -312,5 +323,9 @@ export {
 	// loaders
 	NodeLoader,
 	NodeObjectLoader,
-	NodeMaterialLoader
+	NodeMaterialLoader,
+
+	// parsers
+	WGSLNodeParser,
+	GLSLNodeParser,
 };

+ 1 - 1
examples/jsm/renderers/webgl/nodes/SlotNode.js

@@ -1,4 +1,4 @@
-import Node from 'three-nodes/core/Node.js';
+import { Node } from 'three/nodes';
 
 class SlotNode extends Node {
 

+ 1 - 5
examples/jsm/renderers/webgl/nodes/WebGLNodeBuilder.js

@@ -1,11 +1,7 @@
-import NodeBuilder, { defaultShaderStages } from 'three-nodes/core/NodeBuilder.js';
-import NodeFrame from 'three-nodes/core/NodeFrame.js';
+import { defaultShaderStages, NodeFrame, MathNode, GLSLNodeParser, NodeBuilder } from 'three/nodes';
 import SlotNode from './SlotNode.js';
-import GLSLNodeParser from 'three-nodes/parsers/GLSLNodeParser.js';
-
 import { PerspectiveCamera, ShaderChunk, ShaderLib, UniformsUtils, UniformsLib,
 	LinearEncoding, RGBAFormat, UnsignedByteType, sRGBEncoding } from 'three';
-import MathNode from '../../../nodes/math/MathNode.js';
 
 const nodeFrame = new NodeFrame();
 nodeFrame.camera = new PerspectiveCamera();

+ 1 - 1
examples/jsm/renderers/webgl/nodes/WebGLNodes.js

@@ -1,5 +1,5 @@
 import { WebGLNodeBuilder } from './WebGLNodeBuilder.js';
-import NodeFrame from 'three-nodes/core/NodeFrame.js';
+import { NodeFrame } from 'three/nodes';
 
 import { Material } from 'three';
 

+ 1 - 2
examples/jsm/renderers/webgpu/WebGPUBackground.js

@@ -1,7 +1,6 @@
 import { GPULoadOp, GPUStoreOp } from './constants.js';
 import { Color, Mesh, BoxGeometry, BackSide } from 'three';
-import { context, transformDirection, positionWorld, modelWorldMatrix } from 'three-nodes/Nodes.js';
-import MeshBasicNodeMaterial from 'three-nodes/materials/MeshBasicNodeMaterial.js';
+import { context, transformDirection, positionWorld, modelWorldMatrix, MeshBasicNodeMaterial } from 'three/nodes';
 
 let _clearAlpha;
 const _clearColor = new Color();

+ 1 - 1
examples/jsm/renderers/webgpu/WebGPURenderStates.js

@@ -1,4 +1,4 @@
-import LightsNode from 'three-nodes/lighting/LightsNode.js';
+import { LightsNode } from 'three/nodes';
 
 class WebGPURenderState {
 

+ 1 - 6
examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js

@@ -10,12 +10,7 @@ import WebGPUUniformBuffer from '../WebGPUUniformBuffer.js';
 import WebGPUStorageBuffer from '../WebGPUStorageBuffer.js';
 import { getVectorLength, getStrideLength } from '../WebGPUBufferUtils.js';
 
-import NodeBuilder from 'three-nodes/core/NodeBuilder.js';
-import WGSLNodeParser from 'three-nodes/parsers/WGSLNodeParser.js';
-
-import CodeNode from 'three-nodes/core/CodeNode.js';
-
-import { NodeMaterial } from 'three-nodes/materials/Materials.js';
+import { NodeBuilder, WGSLNodeParser, CodeNode, NodeMaterial } from 'three/nodes';
 
 const gpuShaderStageLib = {
 	'vertex': GPUShaderStage.VERTEX,

+ 1 - 1
examples/jsm/renderers/webgpu/nodes/WebGPUNodes.js

@@ -1,5 +1,5 @@
 import WebGPUNodeBuilder from './WebGPUNodeBuilder.js';
-import NodeFrame from 'three-nodes/core/NodeFrame.js';
+import { NodeFrame } from 'three/nodes';
 
 class WebGPUNodes {
 

+ 2 - 2
examples/webgl_nodes_loader_gltf_iridescence.html

@@ -22,7 +22,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -31,7 +31,7 @@
 
 			import * as THREE from 'three';
 
-			import { NodeMaterial, uv, add, mul, vec2, checker, float, timerLocal } from 'three-nodes/Nodes.js';
+			import { NodeMaterial, uv, add, mul, vec2, checker, float, timerLocal } from 'three/nodes';
 
 			import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 2 - 2
examples/webgl_nodes_loader_gltf_sheen.html

@@ -26,7 +26,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -35,7 +35,7 @@
 
 			import * as THREE from 'three';
 
-			import { NodeMaterial, color, uv, mix, mul, checker } from 'three-nodes/Nodes.js';
+			import { NodeMaterial, color, uv, mix, mul, checker } from 'three/nodes';
 
 			import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 2 - 2
examples/webgl_nodes_loader_gltf_transmission.html

@@ -22,7 +22,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -31,7 +31,7 @@
 
 			import * as THREE from 'three';
 
-			import { NodeMaterial, float, texture, mul } from 'three-nodes/Nodes.js';
+			import { NodeMaterial, float, texture, mul } from 'three/nodes';
 
 			import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 2 - 3
examples/webgl_nodes_materials_instance_uniform.html

@@ -19,7 +19,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -27,8 +27,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-
-			import { MeshStandardNodeMaterial, Node, NodeUpdateType, uniform, cubeTexture, add, mul } from 'three-nodes/Nodes.js';
+			import { MeshStandardNodeMaterial, Node, NodeUpdateType, uniform, cubeTexture, add, mul } from 'three/nodes';
 
 			import Stats from './jsm/libs/stats.module.js';
 

+ 3 - 3
examples/webgl_nodes_materials_physical_clearcoat.html

@@ -19,7 +19,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -27,9 +27,9 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
-			import { color, float, vec2, texture, normalMap, uv, mul } from 'three-nodes/Nodes.js';
+			import { color, float, vec2, texture, normalMap, uv, mul } from 'three/nodes';
 
 			import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 2 - 2
examples/webgl_nodes_materials_standard.html

@@ -21,7 +21,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -29,7 +29,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import Stats from './jsm/libs/stats.module.js';
 

+ 3 - 3
examples/webgl_nodes_materialx_noise.html

@@ -19,7 +19,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -27,14 +27,14 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import { MeshPhysicalNodeMaterial, add, mul, normalWorld, saturate, timerLocal } from 'three-nodes/Nodes.js';
+			import { MeshPhysicalNodeMaterial, add, mul, normalWorld, saturate, timerLocal } from 'three/nodes';
 
 			import {
 				mx_perlin_noise_float,
 				mx_cell_noise_float,
 				mx_worley_noise_float,
 				mx_fractal_noise_float
-			} from 'three-nodes/materialx/functions/lib/mx_noise.js';
+			} from './jsm/nodes/materialx/functions/lib/mx_noise.js';
 
 			import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 2 - 3
examples/webgl_nodes_playground.html

@@ -43,8 +43,7 @@
 		{
 			"imports": {
 				"three": "../build/three.module.js",
-				"three-addons/": "./jsm/",
-				"three-nodes/": "./jsm/nodes/"
+				"three/nodes": "./jsm/nodes/Nodes.js"
 			}
 		}
 	</script>
@@ -52,7 +51,7 @@
 	<script type="module">
 
 		import * as THREE from 'three';
-		import * as Nodes from 'three-nodes/Nodes.js';
+		import * as Nodes from 'three/nodes';
 
 		import { nodeFrame } from './jsm/renderers/webgl/nodes/WebGLNodes.js';
 

+ 1 - 1
examples/webgl_nodes_points.html

@@ -20,7 +20,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>

+ 3 - 3
examples/webgpu_compute.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,14 +25,14 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import {
 				ShaderNode, compute,
 				uniform, element, storage, attribute, mul, sin, cos,
 				temp, assign, add, sub, cond, abs, negate, max, min, length, float, vec2, vec3, color,
 				greaterThanEqual, lessThanEqual, instanceIndex
-			} from 'three-nodes/Nodes.js';
+			} from 'three/nodes';
 
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
 

+ 3 - 3
examples/webgpu_cubemap_adjustments.html

@@ -22,7 +22,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -30,9 +30,9 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
-			import { uniform, mix, cubeTexture, mul, reference, add, positionWorld, normalWorld, modelWorldMatrix, transformDirection, saturate, saturation, hue, reflectVector, context } from 'three-nodes/Nodes.js';
+			import { uniform, mix, cubeTexture, mul, reference, add, positionWorld, normalWorld, modelWorldMatrix, transformDirection, saturate, saturation, hue, reflectVector, context } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_cubemap_mix.html

@@ -22,7 +22,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -30,9 +30,9 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
-			import { mix, oscSine, timerLocal, cubeTexture, context, float } from 'three-nodes/Nodes.js';
+			import { mix, oscSine, timerLocal, cubeTexture, context, float } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_depth_texture.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,13 +25,13 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
 			import WebGPUTextureRenderer from './jsm/renderers/webgpu/WebGPUTextureRenderer.js';
 
-			import { smoothstep, negate, positionView, invert } from 'three-nodes/Nodes.js';
+			import { smoothstep, negate, positionView, invert } from 'three/nodes';
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 

+ 2 - 2
examples/webgpu_instance_mesh.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -30,7 +30,7 @@
 			import Stats from './jsm/libs/stats.module.js';
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
 
-			import { mix, range, normalWorld, oscSine, timerLocal } from 'three-nodes/Nodes.js';
+			import { mix, range, normalWorld, oscSine, timerLocal } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_instance_uniform.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -26,8 +26,8 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
-			import { add, mul } from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
+			import { add, mul } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 2 - 2
examples/webgpu_lights_custom.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,7 +25,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_lights_selective.html

@@ -19,7 +19,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -27,7 +27,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import Stats from './jsm/libs/stats.module.js';
 
@@ -39,7 +39,7 @@
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
 
-			import { color, float } from 'three-nodes/Nodes.js';
+			import { color, float } from 'three/nodes';
 
 			let camera, scene, renderer,
 				light1, light2, light3, light4,

+ 2 - 2
examples/webgpu_loader_gltf.html

@@ -23,7 +23,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -31,7 +31,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_materials.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -26,14 +26,14 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';
 
 			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 
-			import { ShaderNode, vec3, dot } from 'three-nodes/Nodes.js';
+			import { ShaderNode, vec3, dot } from 'three/nodes';
 
 			import Stats from './jsm/libs/stats.module.js';
 

+ 2 - 3
examples/webgpu_nodes_playground.html

@@ -43,8 +43,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-addons/": "./jsm/",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -52,7 +51,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 3 - 3
examples/webgpu_particles.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,11 +25,11 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
 
-			import { range, texture, mix, uv, mul, mod, rotateUV, color, max, min, div, saturate, positionWorld, invert, timerLocal } from 'three-nodes/Nodes.js';
+			import { range, texture, mix, uv, mul, mod, rotateUV, color, max, min, div, saturate, positionWorld, invert, timerLocal } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 2 - 2
examples/webgpu_rtt.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,7 +25,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';

+ 2 - 2
examples/webgpu_sandbox.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,7 +25,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import { DDSLoader } from './jsm/loaders/DDSLoader.js';
 

+ 2 - 2
examples/webgpu_skinning.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -26,7 +26,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import { FBXLoader } from './jsm/loaders/FBXLoader.js';
 

+ 3 - 3
examples/webgpu_skinning_instancing.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -26,9 +26,9 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
-			import { mix, range, color, oscSine, timerLocal } from 'three-nodes/Nodes.js';
+			import { mix, range, color, oscSine, timerLocal } from 'three/nodes';
 
 			import { FBXLoader } from './jsm/loaders/FBXLoader.js';
 

+ 2 - 2
examples/webgpu_skinning_points.html

@@ -18,7 +18,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -26,7 +26,7 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
 			import { FBXLoader } from './jsm/loaders/FBXLoader.js';
 

+ 3 - 3
examples/webgpu_sprites.html

@@ -17,7 +17,7 @@
 			{
 				"imports": {
 					"three": "../build/three.module.js",
-					"three-nodes/": "./jsm/nodes/"
+					"three/nodes": "./jsm/nodes/Nodes.js"
 				}
 			}
 		</script>
@@ -25,9 +25,9 @@
 		<script type="module">
 
 			import * as THREE from 'three';
-			import * as Nodes from 'three-nodes/Nodes.js';
+			import * as Nodes from 'three/nodes';
 
-			import { texture, uv, mul, float, color, userData } from 'three-nodes/Nodes.js';
+			import { texture, uv, mul, float, color, userData } from 'three/nodes';
 
 			import WebGPU from './jsm/capabilities/WebGPU.js';
 			import WebGPURenderer from './jsm/renderers/webgpu/WebGPURenderer.js';