super-three 0.136.0 → 0.141.0

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

@@ -1,67 +1,41 @@
-import { TempNode } from '../core/TempNode.js';
-import { NodeLib } from '../core/NodeLib.js';
+import AttributeNode from '../core/AttributeNode.js';
 
-class UVNode extends TempNode {
+class UVNode extends AttributeNode {
 
-	constructor( index ) {
+	constructor( index = 0 ) {
 
-		super( 'v2', { shared: false } );
+		super( null, 'vec2' );
 
-		this.index = index || 0;
+		this.isUVNode = true;
 
-	}
-
-	generate( builder, output ) {
-
-		builder.requires.uv[ this.index ] = true;
-
-		const uvIndex = this.index > 0 ? this.index + 1 : '';
-		const result = builder.isShader( 'vertex' ) ? 'uv' + uvIndex : 'vUv' + uvIndex;
-
-		return builder.format( result, this.getType( builder ), output );
+		this.index = index;
 
 	}
 
-	copy( source ) {
-
-		super.copy( source );
+	getAttributeName( /*builder*/ ) {
 
-		this.index = source.index;
+		const index = this.index;
 
-		return this;
+		return 'uv' + ( index > 0 ? index + 1 : '' );
 
 	}
 
-	toJSON( meta ) {
+	serialize( data ) {
 
-		let data = this.getJSONNode( meta );
+		super.serialize( data );
 
-		if ( ! data ) {
+		data.index = this.index;
 
-			data = this.createJSONNode( meta );
+	}
 
-			data.index = this.index;
+	deserialize( data ) {
 
-		}
+		super.deserialize( data );
 
-		return data;
+		this.index = data.index;
 
 	}
 
 }
 
-UVNode.prototype.nodeType = 'UV';
-
-NodeLib.addKeyword( 'uv', function () {
-
-	return new UVNode();
-
-} );
-
-NodeLib.addKeyword( 'uv2', function () {
-
-	return new UVNode( 1 );
-
-} );
-
-export { UVNode };
+export default UVNode;

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

@@ -0,0 +1,23 @@
+import ReferenceNode from './ReferenceNode.js';
+
+class UserDataNode extends ReferenceNode {
+
+	constructor( property, inputType, userData = null ) {
+
+		super( property, inputType, userData );
+
+		this.userData = userData;
+
+	}
+
+	update( frame ) {
+
+		this.object = this.userData !== null ? this.userData : frame.object.userData;
+
+		super.update( frame );
+
+	}
+
+}
+
+export default UserDataNode;

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

@@ -0,0 +1,23 @@
+import UniformNode from './UniformNode.js';
+
+class ArrayUniformNode extends UniformNode {
+
+	constructor( nodes = [] ) {
+
+		super();
+
+		this.isArrayUniformNode = true;
+
+		this.nodes = nodes;
+
+	}
+
+	getNodeType( builder ) {
+
+		return this.nodes[ 0 ].getNodeType( builder );
+
+	}
+
+}
+
+export default ArrayUniformNode;

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

@@ -1,68 +1,71 @@
-import { Node } from './Node.js';
+import Node from './Node.js';
+import VaryNode from './VaryNode.js';
 
 class AttributeNode extends Node {
 
-	constructor( name, type ) {
+	constructor( attributeName, nodeType = null ) {
 
-		super( type );
+		super( nodeType );
 
-		this.name = name;
+		this._attributeName = attributeName;
 
 	}
 
-	getAttributeType( builder ) {
+	getHash( builder ) {
 
-		return typeof this.type === 'number' ? builder.getConstructorFromLength( this.type ) : this.type;
+		return this.getAttributeName( builder );
 
 	}
 
-	getType( builder ) {
+	getNodeType( builder ) {
 
-		const type = this.getAttributeType( builder );
+		let nodeType = super.getNodeType( builder );
 
-		return builder.getTypeByFormat( type );
+		if ( nodeType === null ) {
 
-	}
-
-	generate( builder, output ) {
+			const attributeName = this.getAttributeName( builder );
+			const attribute = builder.geometry.getAttribute( attributeName );
 
-		const type = this.getAttributeType( builder );
+			nodeType = builder.getTypeFromLength( attribute.itemSize );
 
-		const attribute = builder.getAttribute( this.name, type ),
-			name = builder.isShader( 'vertex' ) ? this.name : attribute.varying.name;
+		}
 
-		return builder.format( name, this.getType( builder ), output );
+		return nodeType;
 
 	}
 
-	copy( source ) {
+	setAttributeName( attributeName ) {
 
-		super.copy( source );
-
-		this.type = source.type;
+		this._attributeName = attributeName;
 
 		return this;
 
 	}
 
-	toJSON( meta ) {
+	getAttributeName( /*builder*/ ) {
 
-		let data = this.getJSONNode( meta );
+		return this._attributeName;
 
-		if ( ! data ) {
+	}
 
-			data = this.createJSONNode( meta );
+	generate( builder ) {
 
-			data.type = this.type;
+		const attribute = builder.getAttribute( this.getAttributeName( builder ), this.getNodeType( builder ) );
 
-		}
+		if ( builder.isShaderStage( 'vertex' ) ) {
 
-		return data;
+			return attribute.name;
+
+		} else {
+
+			const nodeVary = new VaryNode( this );
+
+			return nodeVary.build( builder, attribute.type );
+
+		}
 
 	}
 
 }
 
-AttributeNode.prototype.nodeType = 'Attribute';
-
-export { AttributeNode };
+export default AttributeNode;

package/examples/jsm/{renderers/nodes → nodes}/core/BypassNode.js

@@ -6,6 +6,8 @@ class BypassNode extends Node {
 
 		super();
 
+		this.isBypassNode = true;
+
 		this.outputNode = returnNode;
 		this.callNode = callNode;
 
@@ -33,6 +35,4 @@ class BypassNode extends Node {
 
 }
 
-BypassNode.prototype.isBypassNode = true;
-
 export default BypassNode;

package/examples/jsm/{renderers/nodes → nodes}/core/CodeNode.js

@@ -6,9 +6,9 @@ class CodeNode extends Node {
 
 		super( nodeType );
 
-		this.code = code;
+		this.isCodeNode = true;
 
-		this.useKeywords = false;
+		this.code = code;
 
 		this._includes = [];
 
@@ -30,32 +30,6 @@ class CodeNode extends Node {
 
 	generate( builder ) {
 
-		if ( this.useKeywords === true ) {
-
-			const contextKeywords = builder.context.keywords;
-
-			if ( contextKeywords !== undefined ) {
-
-				const nodeData = builder.getDataFromNode( this, builder.shaderStage );
-
-				if ( nodeData.keywords === undefined ) {
-
-					nodeData.keywords = [];
-
-				}
-
-				if ( nodeData.keywords.indexOf( contextKeywords ) === - 1 ) {
-
-					contextKeywords.include( builder, this.code );
-
-					nodeData.keywords.push( contextKeywords );
-
-				}
-
-			}
-
-		}
-
 		const includes = this.getIncludes( builder );
 
 		for ( const include of includes ) {
@@ -73,6 +47,4 @@ class CodeNode extends Node {
 
 }
 
-CodeNode.prototype.isCodeNode = true;
-
 export default CodeNode;

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

@@ -1,125 +1,29 @@
-import { TempNode } from './TempNode.js';
+import InputNode from './InputNode.js';
 
-const declarationRegexp = /^([a-z_0-9]+)\s([a-z_0-9]+)\s?\=?\s?(.*?)(\;|$)/i;
+class ConstNode extends InputNode {
 
-class ConstNode extends TempNode {
+	constructor( value, nodeType = null ) {
 
-	constructor( src, useDefine ) {
+		super( value, nodeType );
 
-		super();
-
-		this.parse( src || ConstNode.PI, useDefine );
-
-	}
-
-	getType( builder ) {
-
-		return builder.getTypeByFormat( this.type );
+		this.isConstNode = true;
 
 	}
 
-	parse( src, useDefine ) {
-
-		this.src = src || '';
-
-		let name, type, value = '';
-
-		const match = this.src.match( declarationRegexp );
-
-		this.useDefine = useDefine || this.src.charAt( 0 ) === '#';
-
-		if ( match && match.length > 1 ) {
-
-			type = match[ 1 ];
-			name = match[ 2 ];
-			value = match[ 3 ];
-
-		} else {
+	generateConst( builder ) {
 
-			name = this.src;
-			type = 'f';
-
-		}
-
-		this.name = name;
-		this.type = type;
-		this.value = value;
-
-	}
-
-	build( builder, output ) {
-
-		if ( output === 'source' ) {
-
-			if ( this.value ) {
-
-				if ( this.useDefine ) {
-
-					return '#define ' + this.name + ' ' + this.value;
-
-				}
-
-				return 'const ' + this.type + ' ' + this.name + ' = ' + this.value + ';';
-
-			} else if ( this.useDefine ) {
-
-				return this.src;
-
-			}
-
-		} else {
-
-			builder.include( this );
-
-			return builder.format( this.name, this.getType( builder ), output );
-
-		}
+		return builder.getConst( this.getNodeType( builder ), this.value );
 
 	}
 
 	generate( builder, output ) {
 
-		return builder.format( this.name, this.getType( builder ), output );
+		const type = this.getNodeType( builder );
 
-	}
-
-	copy( source ) {
-
-		super.copy( source );
-
-		this.parse( source.src, source.useDefine );
-
-		return this;
-
-	}
-
-	toJSON( meta ) {
-
-		let data = this.getJSONNode( meta );
-
-		if ( ! data ) {
-
-			data = this.createJSONNode( meta );
-
-			data.src = this.src;
-
-			if ( data.useDefine === true ) data.useDefine = true;
-
-		}
-
-		return data;
+		return builder.format( this.generateConst( builder ), type, output );
 
 	}
 
 }
 
-ConstNode.prototype.nodeType = 'Const';
-
-ConstNode.PI = 'PI';
-ConstNode.PI2 = 'PI2';
-ConstNode.RECIPROCAL_PI = 'RECIPROCAL_PI';
-ConstNode.RECIPROCAL_PI2 = 'RECIPROCAL_PI2';
-ConstNode.LOG2 = 'LOG2';
-ConstNode.EPSILON = 'EPSILON';
-
-export { ConstNode };
+export default ConstNode;

package/examples/jsm/{renderers/nodes → nodes}/core/ContextNode.js

@@ -6,6 +6,8 @@ class ContextNode extends Node {
 
 		super();
 
+		this.isContextNode = true;
+
 		this.node = node;
 		this.context = context;
 
@@ -17,11 +19,25 @@ class ContextNode extends Node {
 
 	}
 
+	construct( builder ) {
+
+		const previousContext = builder.getContext();
+
+		builder.setContext( { ...builder.context, ...this.context } );
+
+		const node = this.node.build( builder );
+
+		builder.setContext( previousContext );
+
+		return node;
+
+	}
+
 	generate( builder, output ) {
 
 		const previousContext = builder.getContext();
 
-		builder.setContext( Object.assign( {}, builder.context, this.context ) );
+		builder.setContext( { ...builder.context, ...this.context } );
 
 		const snippet = this.node.build( builder, output );
 
@@ -33,6 +49,4 @@ class ContextNode extends Node {
 
 }
 
-ContextNode.prototype.isContextNode = true;
-
 export default ContextNode;

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

@@ -1,15 +1,32 @@
-import { FunctionNode } from './FunctionNode.js';
+import TempNode from './TempNode.js';
 
-class ExpressionNode extends FunctionNode {
+class ExpressionNode extends TempNode {
 
-	constructor( src, type, keywords, extensions, includes ) {
+	constructor( snipped = '', nodeType = 'void' ) {
 
-		super( src, includes, extensions, keywords, type );
+		super( nodeType );
+
+		this.snipped = snipped;
 
 	}
 
-}
+	generate( builder ) {
+
+		const type = this.getNodeType( builder );
+		const snipped = this.snipped;
+
+		if ( type === 'void' ) {
+
+			builder.addFlowCode( snipped );
+
+		} else {
 
-ExpressionNode.prototype.nodeType = 'Expression';
+			return `( ${ snipped } )`;
+
+		}
+
+	}
+
+}
 
-export { ExpressionNode };
+export default ExpressionNode;

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

@@ -1,108 +1,67 @@
-import { TempNode } from './TempNode.js';
+import TempNode from './TempNode.js';
 
 class FunctionCallNode extends TempNode {
 
-	constructor( func, inputs ) {
+	constructor( functionNode = null, parameters = {} ) {
 
 		super();
 
-		this.setFunction( func, inputs );
+		this.functionNode = functionNode;
+		this.parameters = parameters;
 
 	}
 
-	setFunction( func, inputs = [] ) {
+	setParameters( parameters ) {
 
-		this.value = func;
-		this.inputs = inputs;
+		this.parameters = parameters;
 
-	}
-
-	getFunction() {
-
-		return this.value;
+		return this;
 
 	}
 
-	getType( builder ) {
+	getParameters() {
 
-		return this.value.getType( builder );
+		return this.parameters;
 
 	}
 
-	generate( builder, output ) {
-
-		const type = this.getType( builder ),
-			func = this.value;
-
-		let code = func.build( builder, output ) + '( ';
-		const params = [];
-
-		for ( let i = 0; i < func.inputs.length; i ++ ) {
+	getNodeType( builder ) {
 
-			const inpt = func.inputs[ i ],
-				param = this.inputs[ i ] || this.inputs[ inpt.name ];
-
-			params.push( param.build( builder, builder.getTypeByFormat( inpt.type ) ) );
-
-		}
-
-		code += params.join( ', ' ) + ' )';
-
-		return builder.format( code, type, output );
+		return this.functionNode.getNodeType( builder );
 
 	}
 
-	copy( source ) {
-
-		super.copy( source );
-
-		for ( const prop in source.inputs ) {
+	generate( builder ) {
 
-			this.inputs[ prop ] = source.inputs[ prop ];
-
-		}
-
-		this.value = source.value;
-
-		return this;
-
-	}
-
-	toJSON( meta ) {
-
-		let data = this.getJSONNode( meta );
-
-		if ( ! data ) {
-
-			const func = this.value;
+		const params = [];
 
-			data = this.createJSONNode( meta );
+		const functionNode = this.functionNode;
 
-			data.value = this.value.toJSON( meta ).uuid;
+		const inputs = functionNode.getInputs( builder );
+		const parameters = this.parameters;
 
-			if ( func.inputs.length ) {
+		for ( const inputNode of inputs ) {
 
-				data.inputs = {};
+			const node = parameters[ inputNode.name ];
 
-				for ( let i = 0; i < func.inputs.length; i ++ ) {
+			if ( node !== undefined ) {
 
-					const inpt = func.inputs[ i ],
-						node = this.inputs[ i ] || this.inputs[ inpt.name ];
+				params.push( node.build( builder, inputNode.type ) );
 
-					data.inputs[ inpt.name ] = node.toJSON( meta ).uuid;
+			} else {
 
-				}
+				throw new Error( `FunctionCallNode: Input '${inputNode.name}' not found in FunctionNode.` );
 
 			}
 
 		}
 
-		return data;
+		const functionName = functionNode.build( builder, 'property' );
+
+		return `${functionName}( ${params.join( ', ' )} )`;
 
 	}
 
 }
 
-FunctionCallNode.prototype.nodeType = 'FunctionCall';
-
-export { FunctionCallNode };
+export default FunctionCallNode;