super-three 0.141.0 → 0.144.0

package/examples/jsm/nodes/Nodes.js

@@ -18,12 +18,12 @@ import NodeFunctionInput from './core/NodeFunctionInput.js';
 import NodeKeywords from './core/NodeKeywords.js';
 import NodeUniform from './core/NodeUniform.js';
 import NodeVar from './core/NodeVar.js';
-import NodeVary from './core/NodeVary.js';
+import NodeVarying from './core/NodeVarying.js';
 import PropertyNode from './core/PropertyNode.js';
 import TempNode from './core/TempNode.js';
 import UniformNode from './core/UniformNode.js';
 import VarNode from './core/VarNode.js';
-import VaryNode from './core/VaryNode.js';
+import VaryingNode from './core/VaryingNode.js';
 
 // accessors
 import BufferNode from './accessors/BufferNode.js';
@@ -39,16 +39,20 @@ import Object3DNode from './accessors/Object3DNode.js';
 import PointUVNode from './accessors/PointUVNode.js';
 import PositionNode from './accessors/PositionNode.js';
 import ReferenceNode from './accessors/ReferenceNode.js';
-import ReflectNode from './accessors/ReflectNode.js';
+import ReflectVectorNode from './accessors/ReflectVectorNode.js';
 import SkinningNode from './accessors/SkinningNode.js';
 import TextureNode from './accessors/TextureNode.js';
 import UVNode from './accessors/UVNode.js';
 import UserDataNode from './accessors/UserDataNode.js';
 
+// geometry
+import RangeNode from './geometry/RangeNode.js';
+
 // gpgpu
 import ComputeNode from './gpgpu/ComputeNode.js';
 
 // display
+import ColorAdjustmentNode from './display/ColorAdjustmentNode.js';
 import ColorSpaceNode from './display/ColorSpaceNode.js';
 import FrontFacingNode from './display/FrontFacingNode.js';
 import NormalMapNode from './display/NormalMapNode.js';
@@ -76,6 +80,7 @@ import JoinNode from './utils/JoinNode.js';
 import MatcapUVNode from './utils/MatcapUVNode.js';
 import MaxMipLevelNode from './utils/MaxMipLevelNode.js';
 import OscNode from './utils/OscNode.js';
+import RotateUVNode from './utils/RotateUVNode.js';
 import SplitNode from './utils/SplitNode.js';
 import SpriteSheetUVNode from './utils/SpriteSheetUVNode.js';
 import TimerNode from './utils/TimerNode.js';
@@ -85,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';
 
@@ -101,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,
@@ -122,14 +134,17 @@ const nodeLib = {
 	NodeKeywords,
 	NodeUniform,
 	NodeVar,
-	NodeVary,
+	NodeVarying,
 	PropertyNode,
 	TempNode,
 	UniformNode,
 	VarNode,
-	VaryNode,
+	VaryingNode,
+
+	// geometry
+	RangeNode,
 
-	// compute
+	// gpgpu
 	ComputeNode,
 
 	// accessors
@@ -146,13 +161,14 @@ const nodeLib = {
 	PointUVNode,
 	PositionNode,
 	ReferenceNode,
-	ReflectNode,
+	ReflectVectorNode,
 	SkinningNode,
 	TextureNode,
 	UVNode,
 	UserDataNode,
 
 	// display
+	ColorAdjustmentNode,
 	ColorSpaceNode,
 	FrontFacingNode,
 	NormalMapNode,
@@ -180,6 +196,7 @@ const nodeLib = {
 	MatcapUVNode,
 	MaxMipLevelNode,
 	OscNode,
+	RotateUVNode,
 	SplitNode,
 	SpriteSheetUVNode,
 	TimerNode,
@@ -194,7 +211,11 @@ const nodeLib = {
 	// loaders
 	NodeLoader,
 	NodeObjectLoader,
-	NodeMaterialLoader
+	NodeMaterialLoader,
+
+	// parsers
+	WGSLNodeParser,
+	GLSLNodeParser,
 
 };
 
@@ -225,14 +246,17 @@ export {
 	NodeKeywords,
 	NodeUniform,
 	NodeVar,
-	NodeVary,
+	NodeVarying,
 	PropertyNode,
 	TempNode,
 	UniformNode,
 	VarNode,
-	VaryNode,
+	VaryingNode,
+
+	// geometry
+	RangeNode,
 
-	// compute
+	// gpgpu
 	ComputeNode,
 
 	// accessors
@@ -249,13 +273,14 @@ export {
 	PointUVNode,
 	PositionNode,
 	ReferenceNode,
-	ReflectNode,
+	ReflectVectorNode,
 	SkinningNode,
 	TextureNode,
 	UVNode,
 	UserDataNode,
 
 	// display
+	ColorAdjustmentNode,
 	ColorSpaceNode,
 	FrontFacingNode,
 	NormalMapNode,
@@ -283,6 +308,7 @@ export {
 	MatcapUVNode,
 	MaxMipLevelNode,
 	OscNode,
+	RotateUVNode,
 	SplitNode,
 	SpriteSheetUVNode,
 	TimerNode,
@@ -297,5 +323,9 @@ export {
 	// loaders
 	NodeLoader,
 	NodeObjectLoader,
-	NodeMaterialLoader
+	NodeMaterialLoader,
+
+	// parsers
+	WGSLNodeParser,
+	GLSLNodeParser,
 };

package/examples/jsm/nodes/accessors/CubeTextureNode.js

@@ -1,6 +1,8 @@
 import TextureNode from './TextureNode.js';
 import UniformNode from '../core/UniformNode.js';
-import ReflectNode from './ReflectNode.js';
+import ReflectVectorNode from './ReflectVectorNode.js';
+
+import { negate, vec3, nodeObject } from '../shadernode/ShaderNodeBaseElements.js';
 
 class CubeTextureNode extends TextureNode {
 
@@ -20,7 +22,7 @@ class CubeTextureNode extends TextureNode {
 
 	getConstructHash( builder ) {
 
-		return `${ this.uuid }-${ builder.context.environmentContext?.uuid || '' }`;
+		return `${ this.uuid } / ${ builder.context.environmentContext?.uuid || '' }`;
 
 	}
 
@@ -28,7 +30,7 @@ class CubeTextureNode extends TextureNode {
 
 		const properties = builder.getNodeProperties( this );
 
-		const uvNode = this.uvNode || builder.context.uvNode || new ReflectNode();
+		const uvNode = this.uvNode || builder.context.uvNode || new ReflectVectorNode();
 		let levelNode = this.levelNode || builder.context.levelNode;
 
 		if ( levelNode?.isNode === true ) {
@@ -72,9 +74,11 @@ class CubeTextureNode extends TextureNode {
 
 			let snippet = nodeData.snippet;
 
-			if ( builder.context.tempRead === false || snippet === undefined ) {
+			if ( snippet === undefined || builder.context.tempRead === false ) {
 
-				const uvSnippet = uvNode.build( builder, 'vec3' );
+				const uvNodeObject = nodeObject( uvNode );
+				const cubeUV = vec3( negate( uvNodeObject.x ), uvNodeObject.yz );
+				const uvSnippet = cubeUV.build( builder, 'vec3' );
 
 				if ( levelNode ) {
 

package/examples/jsm/nodes/accessors/NormalNode.js

@@ -1,6 +1,6 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import VaryNode from '../core/VaryNode.js';
+import VaryingNode from '../core/VaryingNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import CameraNode from '../accessors/CameraNode.js';
 import OperatorNode from '../math/OperatorNode.js';
@@ -39,18 +39,18 @@ class NormalNode extends Node {
 
 		} else if ( scope === NormalNode.LOCAL ) {
 
-			outputNode = new VaryNode( new NormalNode( NormalNode.GEOMETRY ) );
+			outputNode = new VaryingNode( new NormalNode( NormalNode.GEOMETRY ) );
 
 		} else if ( scope === NormalNode.VIEW ) {
 
 			const vertexNormalNode = new OperatorNode( '*', new ModelNode( ModelNode.NORMAL_MATRIX ), new NormalNode( NormalNode.LOCAL ) );
-			outputNode = new MathNode( MathNode.NORMALIZE, new VaryNode( vertexNormalNode ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexNormalNode ) );
 
 		} else if ( scope === NormalNode.WORLD ) {
 
 			// To use INVERSE_TRANSFORM_DIRECTION only inverse the param order like this: MathNode( ..., Vector, Matrix );
 			const vertexNormalNode = new MathNode( MathNode.TRANSFORM_DIRECTION, new NormalNode( NormalNode.VIEW ), new CameraNode( CameraNode.VIEW_MATRIX ) );
-			outputNode = new MathNode( MathNode.NORMALIZE, new VaryNode( vertexNormalNode ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexNormalNode ) );
 
 		}
 

package/examples/jsm/nodes/accessors/PositionNode.js

@@ -1,6 +1,6 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import VaryNode from '../core/VaryNode.js';
+import VaryingNode from '../core/VaryingNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import MathNode from '../math/MathNode.js';
 import OperatorNode from '../math/OperatorNode.js';
@@ -39,22 +39,22 @@ class PositionNode extends Node {
 
 		} else if ( scope === PositionNode.LOCAL ) {
 
-			outputNode = new VaryNode( new PositionNode( PositionNode.GEOMETRY ) );
+			outputNode = new VaryingNode( new PositionNode( PositionNode.GEOMETRY ) );
 
 		} else if ( scope === PositionNode.WORLD ) {
 
 			const vertexPositionNode = new MathNode( MathNode.TRANSFORM_DIRECTION, new ModelNode( ModelNode.WORLD_MATRIX ), new PositionNode( PositionNode.LOCAL ) );
-			outputNode = new VaryNode( vertexPositionNode );
+			outputNode = new VaryingNode( vertexPositionNode );
 
 		} else if ( scope === PositionNode.VIEW ) {
 
 			const vertexPositionNode = new OperatorNode( '*', new ModelNode( ModelNode.VIEW_MATRIX ), new PositionNode( PositionNode.LOCAL ) );
-			outputNode = new VaryNode( vertexPositionNode );
+			outputNode = new VaryingNode( vertexPositionNode );
 
 		} else if ( scope === PositionNode.VIEW_DIRECTION ) {
 
 			const vertexPositionNode = new MathNode( MathNode.NEGATE, new PositionNode( PositionNode.VIEW ) );
-			outputNode = new MathNode( MathNode.NORMALIZE, new VaryNode( vertexPositionNode ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexPositionNode ) );
 
 		}
 

package/examples/jsm/nodes/accessors/ReflectVectorNode.js

@@ -0,0 +1,31 @@
+import Node from '../core/Node.js';
+import {
+	transformedNormalView, positionViewDirection,
+	transformDirection, negate, reflect, cameraViewMatrix
+} from '../shadernode/ShaderNodeBaseElements.js';
+
+class ReflectVectorNode extends Node {
+
+	constructor() {
+
+		super( 'vec3' );
+
+	}
+
+	getHash( /*builder*/ ) {
+
+		return 'reflectVector';
+
+	}
+
+	construct() {
+
+		const reflectView = reflect( negate( positionViewDirection ), transformedNormalView );
+
+		return transformDirection( reflectView, cameraViewMatrix );
+
+	}
+
+}
+
+export default ReflectVectorNode;

package/examples/jsm/nodes/core/AttributeNode.js

@@ -1,5 +1,5 @@
 import Node from './Node.js';
-import VaryNode from './VaryNode.js';
+import VaryingNode from './VaryingNode.js';
 
 class AttributeNode extends Node {
 
@@ -58,9 +58,9 @@ class AttributeNode extends Node {
 
 		} else {
 
-			const nodeVary = new VaryNode( this );
+			const nodeVarying = new VaryingNode( this );
 
-			return nodeVary.build( builder, attribute.type );
+			return nodeVarying.build( builder, attribute.type );
 
 		}
 

package/examples/jsm/nodes/core/CodeNode.js

@@ -2,15 +2,15 @@ import Node from './Node.js';
 
 class CodeNode extends Node {
 
-	constructor( code = '', nodeType = 'code' ) {
+	constructor( code = '', includes = [] ) {
 
-		super( nodeType );
+		super( 'code' );
 
 		this.isCodeNode = true;
 
 		this.code = code;
 
-		this._includes = [];
+		this._includes = includes;
 
 	}
 

package/examples/jsm/nodes/core/FunctionCallNode.js

@@ -40,17 +40,32 @@ class FunctionCallNode extends TempNode {
 		const inputs = functionNode.getInputs( builder );
 		const parameters = this.parameters;
 
-		for ( const inputNode of inputs ) {
+		if ( Array.isArray( parameters ) ) {
 
-			const node = parameters[ inputNode.name ];
+			for ( let i = 0; i < parameters.length; i ++ ) {
 
-			if ( node !== undefined ) {
+				const inputNode = inputs[ i ];
+				const node = parameters[ i ];
 
 				params.push( node.build( builder, inputNode.type ) );
 
-			} else {
+			}
+
+		} else {
+
+			for ( const inputNode of inputs ) {
+
+				const node = parameters[ inputNode.name ];
+
+				if ( node !== undefined ) {
+
+					params.push( node.build( builder, inputNode.type ) );
+
+				} else {
+
+					throw new Error( `FunctionCallNode: Input '${inputNode.name}' not found in FunctionNode.` );
 
-				throw new Error( `FunctionCallNode: Input '${inputNode.name}' not found in FunctionNode.` );
+				}
 
 			}
 

package/examples/jsm/nodes/core/FunctionNode.js

@@ -3,9 +3,9 @@ import FunctionCallNode from './FunctionCallNode.js';
 
 class FunctionNode extends CodeNode {
 
-	constructor( code = '' ) {
+	constructor( code = '', includes = [] ) {
 
-		super( code );
+		super( code, includes );
 
 		this.keywords = {};
 

package/examples/jsm/nodes/core/Node.js

@@ -1,5 +1,5 @@
 import { NodeUpdateType } from './constants.js';
-import { getNodesKeys } from './NodeUtils.js';
+import { getNodesKeys, getCacheKey } from './NodeUtils.js';
 import { MathUtils } from 'three';
 
 let _nodeId = 0;
@@ -58,6 +58,12 @@ class Node {
 
 	}
 
+	getCacheKey() {
+
+		return getCacheKey( this );
+
+	}
+
 	getHash( /*builder*/ ) {
 
 		return this.uuid;
@@ -131,15 +137,13 @@ class Node {
 
 	}
 
-	generate( builder ) {
+	generate( builder, output ) {
 
 		const { outputNode } = builder.getNodeProperties( this );
 
 		if ( outputNode?.isNode === true ) {
 
-			const type = this.getNodeType( builder );
-
-			return outputNode.build( builder, type );
+			return outputNode.build( builder, output );
 
 		}
 
@@ -167,7 +171,7 @@ class Node {
 		/* expected return:
 			- "construct"	-> Node
 			- "analyze"		-> null
-			- "generat"		-> String
+			- "generate"	-> String
 		*/
 		let result = null;
 
@@ -176,13 +180,11 @@ class Node {
 		if ( buildStage === 'construct' ) {
 
 			const properties = builder.getNodeProperties( this );
-			const nodeData = builder.getDataFromNode( this );
-
-			if ( properties.initied !== true ) {
 
-				nodeData.initied = true;
+			if ( properties.initialized !== true || builder.context.tempRead === false ) {
 
-				properties.outputNode =  this.construct( builder );
+				properties.initialized = true;
+				properties.outputNode = this.construct( builder );
 
 				for ( const childNode of Object.values( properties ) ) {
 
@@ -211,7 +213,7 @@ class Node {
 
 				result = nodeData.snippet;
 
-				if ( result === undefined ) {
+				if ( result === undefined /*|| builder.context.tempRead === false*/ ) {
 
 					result = this.generate( builder ) || '';
 

package/examples/jsm/nodes/core/NodeBuilder.js

@@ -1,6 +1,6 @@
 import NodeUniform from './NodeUniform.js';
 import NodeAttribute from './NodeAttribute.js';
-import NodeVary from './NodeVary.js';
+import NodeVarying from './NodeVarying.js';
 import NodeVar from './NodeVar.js';
 import NodeCode from './NodeCode.js';
 import NodeKeywords from './NodeKeywords.js';
@@ -55,7 +55,7 @@ class NodeBuilder {
 		this.uniforms = { vertex: [], fragment: [], compute: [], index: 0 };
 		this.codes = { vertex: [], fragment: [], compute: [] };
 		this.attributes = [];
-		this.varys = [];
+		this.varyings = [];
 		this.vars = { vertex: [], fragment: [], compute: [] };
 		this.flow = { code: '' };
 		this.stack = [];
@@ -456,26 +456,26 @@ class NodeBuilder {
 
 	}
 
-	getVaryFromNode( node, type ) {
+	getVaryingFromNode( node, type ) {
 
 		const nodeData = this.getDataFromNode( node, null );
 
-		let nodeVary = nodeData.vary;
+		let nodeVarying = nodeData.varying;
 
-		if ( nodeVary === undefined ) {
+		if ( nodeVarying === undefined ) {
 
-			const varys = this.varys;
-			const index = varys.length;
+			const varyings = this.varyings;
+			const index = varyings.length;
 
-			nodeVary = new NodeVary( 'nodeVary' + index, type );
+			nodeVarying = new NodeVarying( 'nodeVarying' + index, type );
 
-			varys.push( nodeVary );
+			varyings.push( nodeVarying );
 
-			nodeData.vary = nodeVary;
+			nodeData.varying = nodeVarying;
 
 		}
 
-		return nodeVary;
+		return nodeVarying;
 
 	}
 
@@ -572,7 +572,7 @@ class NodeBuilder {
 
 	}
 
-	getVarys( /*shaderStage*/ ) {
+	getVaryings( /*shaderStage*/ ) {
 
 		console.warn( 'Abstract function.' );
 

package/examples/jsm/nodes/core/NodeUtils.js

@@ -1,5 +1,27 @@
 import { Color, Matrix3, Matrix4, Vector2, Vector3, Vector4 } from 'three';
 
+export const getCacheKey = ( object ) => {
+
+	let cacheKey = '{';
+
+	if ( object.isNode === true ) {
+
+		cacheKey += `uuid:"${ object.uuid }",`;
+
+	}
+
+	for ( const property of getNodesKeys( object ) ) {
+
+		cacheKey += `${ property }:${ object[ property ].getCacheKey() },`;
+
+	}
+
+	cacheKey += '}';
+
+	return cacheKey;
+
+};
+
 export const getNodesKeys = ( object ) => {
 
 	const props = [];
@@ -62,7 +84,7 @@ export const getValueType = ( value ) => {
 
 export const getValueFromType = ( type, ...params ) => {
 
-	const last4 = type?.slice( -4 );
+	const last4 = type?.slice( - 4 );
 
 	if ( type === 'color' ) {
 

package/examples/jsm/nodes/core/{NodeVary.js → NodeVarying.js}

@@ -1,8 +1,8 @@
-class NodeVary {
+class NodeVarying {
 
 	constructor( name, type ) {
 
-		this.isNodeVary = true;
+		this.isNodeVarying = true;
 
 		this.name = name;
 		this.type = type;
@@ -11,4 +11,4 @@ class NodeVary {
 
 }
 
-export default NodeVary;
+export default NodeVarying;

package/examples/jsm/nodes/core/{VaryNode.js → VaryingNode.js}

@@ -1,7 +1,7 @@
 import Node from './Node.js';
 import { NodeShaderStage } from './constants.js';
 
-class VaryNode extends Node {
+class VaryingNode extends Node {
 
 	constructor( node, name = null ) {
 
@@ -20,7 +20,7 @@ class VaryNode extends Node {
 
 	getNodeType( builder ) {
 
-		// VaryNode is auto type
+		// VaryingNode is auto type
 
 		return this.node.getNodeType( builder );
 
@@ -32,23 +32,23 @@ class VaryNode extends Node {
 		const node = this.node;
 		const name = this.name;
 
-		const nodeVary = builder.getVaryFromNode( this, type );
+		const nodeVarying = builder.getVaryingFromNode( this, type );
 
 		if ( name !== null ) {
 
-			nodeVary.name = name;
+			nodeVarying.name = name;
 
 		}
 
-		const propertyName = builder.getPropertyName( nodeVary, NodeShaderStage.Vertex );
+		const propertyName = builder.getPropertyName( nodeVarying, NodeShaderStage.Vertex );
 
 		// force node run in vertex stage
 		builder.flowNodeFromShaderStage( NodeShaderStage.Vertex, node, type, propertyName );
 
-		return builder.getPropertyName( nodeVary );
+		return builder.getPropertyName( nodeVarying );
 
 	}
 
 }
 
-export default VaryNode;
+export default VaryingNode;