super-three 0.133.2 → 0.135.0

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

@@ -5,10 +5,10 @@ import ModelNode from '../accessors/ModelNode.js';
 import CameraNode from '../accessors/CameraNode.js';
 import OperatorNode from '../math/OperatorNode.js';
 import MathNode from '../math/MathNode.js';
-import { inverseTransformDirection } from '../functions/MathFunctions.js';
 
 class NormalNode extends Node {
 
+	static GEOMETRY = 'geometry';
 	static LOCAL = 'local';
 	static WORLD = 'world';
 	static VIEW = 'view';
@@ -21,16 +21,26 @@ class NormalNode extends Node {
 
 	}
 
+	getHash( /*builder*/ ) {
+
+		return `normal-${this.scope}`;
+
+	}
+
 	generate( builder ) {
 
 		const scope = this.scope;
 
 		let outputNode = null;
 
-		if ( scope === NormalNode.LOCAL ) {
+		if ( scope === NormalNode.GEOMETRY ) {
 
 			outputNode = new AttributeNode( 'normal', 'vec3' );
 
+		} else if ( scope === NormalNode.LOCAL ) {
+
+			outputNode = new VaryNode( new NormalNode( NormalNode.GEOMETRY ) );
+
 		} else if ( scope === NormalNode.VIEW ) {
 
 			const vertexNormalNode = new OperatorNode( '*', new ModelNode( ModelNode.NORMAL_MATRIX ), new NormalNode( NormalNode.LOCAL ) );
@@ -38,7 +48,8 @@ class NormalNode extends Node {
 
 		} else if ( scope === NormalNode.WORLD ) {
 
-			const vertexNormalNode = inverseTransformDirection.call( { dir: new NormalNode( NormalNode.VIEW ), matrix: new CameraNode( CameraNode.VIEW_MATRIX ) } );
+			// 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 ) );
 
 		}

package/examples/jsm/renderers/nodes/accessors/PointUVNode.js

@@ -6,11 +6,9 @@ class PointUVNode extends Node {
 
 		super( 'vec2' );
 
-		Object.defineProperty( this, 'isPointUVNode', { value: true } );
-
 	}
 
-	generate( builder ) {
+	generate( /*builder*/ ) {
 
 		return 'vec2( gl_PointCoord.x, 1.0 - gl_PointCoord.y )';
 
@@ -18,4 +16,6 @@ class PointUVNode extends Node {
 
 }
 
+PointUVNode.prototype.isPointUVNode = true;
+
 export default PointUVNode;

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

@@ -4,10 +4,10 @@ import VaryNode from '../core/VaryNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import MathNode from '../math/MathNode.js';
 import OperatorNode from '../math/OperatorNode.js';
-import { transformDirection } from '../functions/MathFunctions.js';
 
 class PositionNode extends Node {
 
+	static GEOMETRY = 'geometry';
 	static LOCAL = 'local';
 	static WORLD = 'world';
 	static VIEW = 'view';
@@ -21,19 +21,29 @@ class PositionNode extends Node {
 
 	}
 
+	getHash( /*builder*/ ) {
+
+		return `position-${this.scope}`;
+
+	}
+
 	generate( builder ) {
 
 		const scope = this.scope;
 
 		let outputNode = null;
 
-		if ( scope === PositionNode.LOCAL ) {
-			
+		if ( scope === PositionNode.GEOMETRY ) {
+
 			outputNode = new AttributeNode( 'position', 'vec3' );
-			
+
+		} else if ( scope === PositionNode.LOCAL ) {
+
+			outputNode = new VaryNode( new PositionNode( PositionNode.GEOMETRY ) );
+
 		} else if ( scope === PositionNode.WORLD ) {
 
-			const vertexPositionNode = transformDirection.call( { dir: new PositionNode( PositionNode.LOCAL ), matrix: new ModelNode( ModelNode.WORLD_MATRIX ) } );
+			const vertexPositionNode = new MathNode( MathNode.TRANSFORM_DIRECTION, new ModelNode( ModelNode.WORLD_MATRIX ), new PositionNode( PositionNode.LOCAL ) );
 			outputNode = new VaryNode( vertexPositionNode );
 
 		} else if ( scope === PositionNode.VIEW ) {

package/examples/jsm/renderers/nodes/accessors/SkinningNode.js

@@ -0,0 +1,107 @@
+import Node from '../core/Node.js';
+import AttributeNode from '../core/AttributeNode.js';
+import PositionNode from '../accessors/PositionNode.js';
+import NormalNode from '../accessors/NormalNode.js';
+import Matrix4Node from '../inputs/Matrix4Node.js';
+import BufferNode from '../inputs/BufferNode.js';
+
+import { ShaderNode, assign, element, add, mul, transformDirection } from '../ShaderNode.js';
+
+import { NodeUpdateType } from '../core/constants.js';
+
+const Skinning = new ShaderNode( ( inputs, builder ) => {
+
+	const { position, normal, index, weight, bindMatrix, bindMatrixInverse, boneMatrices } = inputs;
+
+	const boneMatX = element( boneMatrices, index.x );
+	const boneMatY = element( boneMatrices, index.y );
+	const boneMatZ = element( boneMatrices, index.z );
+	const boneMatW = element( boneMatrices, index.w );
+
+	// POSITION
+
+	const skinVertex = mul( bindMatrix, position );
+
+	const skinned = add(
+		mul( mul( boneMatX, skinVertex ), weight.x ),
+		mul( mul( boneMatY, skinVertex ), weight.y ),
+		mul( mul( boneMatZ, skinVertex ), weight.z ),
+		mul( mul( boneMatW, skinVertex ), weight.w )
+	);
+
+	const skinPosition = mul( bindMatrixInverse, skinned ).xyz;
+
+	// NORMAL
+
+	let skinMatrix = add(
+		mul( weight.x, boneMatX ),
+		mul( weight.y, boneMatY ),
+		mul( weight.z, boneMatZ ),
+		mul( weight.w, boneMatW )
+	);
+
+	skinMatrix = mul( mul( bindMatrixInverse, skinMatrix ), bindMatrix );
+
+	const skinNormal = transformDirection( skinMatrix, normal ).xyz;
+
+	// ASSIGNS
+
+	assign( position, skinPosition ).build( builder );
+	assign( normal, skinNormal ).build( builder );
+
+} );
+
+class SkinningNode extends Node {
+
+	constructor( skinnedMesh ) {
+
+		super( 'void' );
+
+		this.skinnedMesh = skinnedMesh;
+
+		this.updateType = NodeUpdateType.Object;
+
+		//
+
+		this.skinIndexNode = new AttributeNode( 'skinIndex', 'uvec4' );
+		this.skinWeightNode = new AttributeNode( 'skinWeight', 'vec4' );
+
+		this.bindMatrixNode = new Matrix4Node( skinnedMesh.bindMatrix );
+		this.bindMatrixInverseNode = new Matrix4Node( skinnedMesh.bindMatrixInverse );
+		this.boneMatricesNode = new BufferNode( skinnedMesh.skeleton.boneMatrices, 'mat4', skinnedMesh.skeleton.bones.length );
+
+	}
+
+	generate( builder ) {
+
+		// inout nodes
+		const position = new PositionNode( PositionNode.LOCAL );
+		const normal = new NormalNode( NormalNode.LOCAL );
+
+		const index = this.skinIndexNode;
+		const weight = this.skinWeightNode;
+		const bindMatrix = this.bindMatrixNode;
+		const bindMatrixInverse = this.bindMatrixInverseNode;
+		const boneMatrices = this.boneMatricesNode;
+
+		Skinning( {
+			position,
+			normal,
+			index,
+			weight,
+			bindMatrix,
+			bindMatrixInverse,
+			boneMatrices
+		}, builder );
+
+	}
+
+	update() {
+
+		this.skinnedMesh.skeleton.update();
+
+	}
+
+}
+
+export default SkinningNode;

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

@@ -2,22 +2,24 @@ import AttributeNode from '../core/AttributeNode.js';
 
 class UVNode extends AttributeNode {
 
-	constructor( index = 0 ) {
+	constructor( value = 0 ) {
 
 		super( null, 'vec2' );
 
-		this.index = index;
-
-		Object.defineProperty( this, 'isUVNode', { value: true } );
+		this.value = value;
 
 	}
 
 	getAttributeName( /*builder*/ ) {
 
-		return 'uv' + ( this.index > 0 ? this.index + 1 : '' );
+		const value = this.value;
+
+		return 'uv' + ( value > 0 ? value + 1 : '' );
 
 	}
 
 }
 
+UVNode.prototype.isUVNode = true;
+
 export default UVNode;

package/examples/jsm/renderers/nodes/core/ArrayInputNode.js

@@ -2,17 +2,17 @@ import InputNode from './InputNode.js';
 
 class ArrayInputNode extends InputNode {
 
-	constructor( value = [] ) {
+	constructor( nodes = [] ) {
 
 		super();
 
-		this.value = value;
+		this.nodes = nodes;
 
 	}
 
 	getNodeType( builder ) {
 
-		return this.value[ 0 ].getNodeType( builder );
+		return this.nodes[ 0 ].getNodeType( builder );
 
 	}
 

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

@@ -11,6 +11,12 @@ class AttributeNode extends Node {
 
 	}
 
+	getHash( builder ) {
+
+		return this.getAttributeName( builder );
+
+	}
+
 	setAttributeName( attributeName ) {
 
 		this._attributeName = attributeName;

package/examples/jsm/renderers/nodes/core/BypassNode.js

@@ -0,0 +1,38 @@
+import Node from './Node.js';
+
+class BypassNode extends Node {
+
+	constructor( returnNode, callNode ) {
+
+		super();
+
+		this.outputNode = returnNode;
+		this.callNode = callNode;
+
+	}
+
+	getNodeType( builder ) {
+
+		return this.outputNode.getNodeType( builder );
+
+	}
+
+	generate( builder, output ) {
+
+		const snippet = this.callNode.build( builder, 'void' );
+
+		if ( snippet !== '' ) {
+
+			builder.addFlowCode( snippet );
+
+		}
+
+		return this.outputNode.build( builder, output );
+
+	}
+
+}
+
+BypassNode.prototype.isBypassNode = true;
+
+export default BypassNode;

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

@@ -12,8 +12,6 @@ class CodeNode extends Node {
 
 		this._includes = [];
 
-		Object.defineProperty( this, 'isCodeNode', { value: true } );
-
 	}
 
 	setIncludes( includes ) {
@@ -34,7 +32,7 @@ class CodeNode extends Node {
 
 		if ( this.useKeywords === true ) {
 
-			const contextKeywords = builder.getContextValue( 'keywords' );
+			const contextKeywords = builder.context.keywords;
 
 			if ( contextKeywords !== undefined ) {
 
@@ -75,4 +73,6 @@ class CodeNode extends Node {
 
 }
 
+CodeNode.prototype.isCodeNode = true;
+
 export default CodeNode;

package/examples/jsm/renderers/nodes/core/ContextNode.js

@@ -2,30 +2,13 @@ import Node from './Node.js';
 
 class ContextNode extends Node {
 
-	constructor( node, nodeType, context = {} ) {
+	constructor( node, context = {} ) {
 
-		super( nodeType );
+		super();
 
 		this.node = node;
-
 		this.context = context;
 
-		Object.defineProperty( this, 'isContextNode', { value: true } );
-
-	}
-
-	setContextValue( name, value ) {
-
-		this.context[ name ] = value;
-
-		return this;
-
-	}
-
-	getContextValue( name ) {
-
-		return this.context[ name ];
-
 	}
 
 	getNodeType( builder ) {
@@ -50,4 +33,6 @@ class ContextNode extends Node {
 
 }
 
+ContextNode.prototype.isContextNode = true;
+
 export default ContextNode;

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

@@ -2,7 +2,7 @@ import TempNode from './TempNode.js';
 
 class ExpressionNode extends TempNode {
 
-	constructor( snipped = '', nodeType = null ) {
+	constructor( snipped = '', nodeType = 'void' ) {
 
 		super( nodeType );
 
@@ -12,7 +12,18 @@ class ExpressionNode extends TempNode {
 
 	generate( builder ) {
 
-		return `( ${ this.snipped } )`;
+		const type = this.getNodeType( builder );
+		const snipped = this.snipped;
+
+		if ( type === 'void' ) {
+
+			builder.addFlowCode( snipped );
+
+		} else {
+
+			return `( ${ snipped } )`;
+
+		}
 
 	}
 

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

@@ -1,143 +1,43 @@
 import CodeNode from './CodeNode.js';
-import NodeFunctionInput from './NodeFunctionInput.js';
 import FunctionCallNode from './FunctionCallNode.js';
 
-const declarationRegexp = /^\s*(highp|mediump|lowp)?\s*([a-z_0-9]+)\s*([a-z_0-9]+)?\s*\((.*?)\)/i;
-const propertiesRegexp = /[a-z_0-9]+/ig;
-
-const pragmaMain = '#pragma main';
-
 class FunctionNode extends CodeNode {
 
 	constructor( code = '' ) {
 
 		super( code );
 
-		this.inputs = [];
-
-		this.name = '';
-		this.needsUpdate = true;
-
 		this.useKeywords = true;
 
-		this.presicion = '';
-
-		this._includeCode = '';
-		this._internalCode = '';
-
 	}
 
 	getNodeType( builder ) {
 
-		if ( this.needsUpdate === true ) {
-
-			this.parse();
-
-		}
-
-		return super.getNodeType( builder );
+		return this.getNodeFunction( builder ).type;
 
 	}
 
-	getInputs( /*builder*/ ) {
-
-		if ( this.needsUpdate === true ) {
-
-			this.parse();
+	getInputs( builder ) {
 
-		}
-
-		return this.inputs;
+		return this.getNodeFunction( builder ).inputs;
 
 	}
 
-	parse() {
-
-		const code = this.code;
-
-		const pragmaMainIndex = code.indexOf( pragmaMain );
-
-		const mainCode = pragmaMainIndex !== - 1 ? code.substr( pragmaMainIndex + pragmaMain.length ) : code;
-
-		const declaration = mainCode.match( declarationRegexp );
-
-		if ( declaration !== null && declaration.length === 5 ) {
-
-			// tokenizer
-
-			const paramsCode = declaration[ 4 ];
-			const propsMatches = [];
-
-			let nameMatch = null;
-
-			while ( ( nameMatch = propertiesRegexp.exec( paramsCode ) ) !== null ) {
-
-				propsMatches.push( nameMatch );
-
-			}
-
-			// parser
-
-			const inputs = [];
-
-			let i = 0;
-
-			while ( i < propsMatches.length ) {
-
-				const isConst = propsMatches[ i ][ 0 ] === 'const';
-
-				if ( isConst === true ) {
+	getNodeFunction( builder ) {
 
-					i ++;
+		const nodeData = builder.getDataFromNode( this );
 
-				}
+		let nodeFunction = nodeData.nodeFunction;
 
-				let qualifier = propsMatches[ i ][ 0 ];
+		if ( nodeFunction === undefined ) {
 
-				if ( qualifier === 'in' || qualifier === 'out' || qualifier === 'inout' ) {
+			nodeFunction = builder.parser.parseFunction( this.code );
 
-					i ++;
-
-				} else {
-
-					qualifier = '';
-
-				}
-
-				const type = propsMatches[ i ++ ][ 0 ];
-
-				let count = Number.parseInt( propsMatches[ i ][ 0 ] );
-
-				if ( Number.isNaN( count ) === false ) i ++;
-				else count = 0;
-
-				const name = propsMatches[ i ++ ][ 0 ];
-
-				inputs.push( new NodeFunctionInput( type, name, qualifier, isConst, count ) );
-
-			}
-
-			const blockCode = mainCode.substring( declaration[ 0 ].length );
-
-			this.name = declaration[ 3 ] !== undefined ? declaration[ 3 ] : '';
-			this.nodeType = declaration[ 2 ];
-
-			this.presicion = declaration[ 1 ] !== undefined ? declaration[ 1 ] : '';
-
-			this.inputs = inputs;
-
-			this._includeCode = pragmaMainIndex !== - 1 ? code.substr( 0, pragmaMainIndex ) : '';
-			this._internalCode = `( ${paramsCode} ) ${blockCode}`;
-
-		} else {
-
-			throw new Error( 'FunctionNode: Function is not a GLSL code.' );
+			nodeData.nodeFunction = nodeFunction;
 
 		}
 
-		this.code = code;
-
-		this.needsUpdate = false;
+		return nodeFunction;
 
 	}
 
@@ -151,37 +51,24 @@ class FunctionNode extends CodeNode {
 
 		super.generate( builder );
 
-		const type = this.getNodeType( builder );
+		const nodeFunction = this.getNodeFunction( builder );
+
+		const name = nodeFunction.name;
+		const type = nodeFunction.type;
+
 		const nodeCode = builder.getCodeFromNode( this, type );
 
-		if ( this.name !== '' ) {
+		if ( name !== '' ) {
 
 			// use a custom property name
 
-			nodeCode.name = this.name;
+			nodeCode.name = name;
 
 		}
 
 		const propertyName = builder.getPropertyName( nodeCode );
 
-		const presicion = this.presicion;
-		const includeCode = this._includeCode;
-
-		let code = `${type} ${propertyName} ${this._internalCode}`;
-
-		if ( presicion !== '' ) {
-
-			code = `${presicion} ${code}`;
-
-		}
-
-		if ( includeCode !== '' ) {
-
-			code = `${includeCode} ${code}`;
-
-		}
-
-		nodeCode.code = code;
+		nodeCode.code = this.getNodeFunction( builder ).getCode( propertyName );
 
 		if ( output === 'property' ) {
 
@@ -189,7 +76,7 @@ class FunctionNode extends CodeNode {
 
 		} else {
 
-			return builder.format( `${propertyName}()`, type, output );
+			return builder.format( `${ propertyName }()`, type, output );
 
 		}
 

package/examples/jsm/renderers/nodes/core/InputNode.js

@@ -2,9 +2,11 @@ import Node from './Node.js';
 
 class InputNode extends Node {
 
-	constructor( nodeType ) {
+	constructor( inputType ) {
 
-		super( nodeType );
+		super( inputType );
+
+		this.inputType = inputType;
 
 		this.constant = false;
 
@@ -24,6 +26,12 @@ class InputNode extends Node {
 
 	}
 
+	getInputType( builder ) {
+
+		return this.inputType;
+
+	}
+
 	generateConst( builder ) {
 
 		return builder.getConst( this.getNodeType( builder ), this.value );
@@ -40,7 +48,9 @@ class InputNode extends Node {
 
 		} else {
 
-			const nodeUniform = builder.getUniformFromNode( this, builder.shaderStage, type );
+			const inputType = this.getInputType( builder );
+
+			const nodeUniform = builder.getUniformFromNode( this, builder.shaderStage, inputType );
 			const propertyName = builder.getPropertyName( nodeUniform );
 
 			return builder.format( propertyName, type, output );