super-three 0.147.0 → 0.152.0

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

@@ -4,20 +4,33 @@ import NodeVarying from './NodeVarying.js';
 import NodeVar from './NodeVar.js';
 import NodeCode from './NodeCode.js';
 import NodeKeywords from './NodeKeywords.js';
-import { NodeUpdateType } from './constants.js';
-
-import { REVISION, LinearEncoding, Color, Vector2, Vector3, Vector4 } from 'three';
-
-export const defaultShaderStages = [ 'fragment', 'vertex' ];
-export const shaderStages = [ ...defaultShaderStages, 'compute' ];
-export const vector = [ 'x', 'y', 'z', 'w' ];
-
-const typeFromLength = new Map();
-typeFromLength.set( 2, 'vec2' );
-typeFromLength.set( 3, 'vec3' );
-typeFromLength.set( 4, 'vec4' );
-typeFromLength.set( 9, 'mat3' );
-typeFromLength.set( 16, 'mat4' );
+import NodeCache from './NodeCache.js';
+import { NodeUpdateType, defaultBuildStages, shaderStages } from './constants.js';
+
+import { REVISION, NoColorSpace, LinearEncoding, sRGBEncoding, SRGBColorSpace, Color, Vector2, Vector3, Vector4, Float16BufferAttribute } from 'three';
+
+import { stack } from './StackNode.js';
+import { maxMipLevel } from '../utils/MaxMipLevelNode.js';
+
+const typeFromLength = new Map( [
+	[ 2, 'vec2' ],
+	[ 3, 'vec3' ],
+	[ 4, 'vec4' ],
+	[ 9, 'mat3' ],
+	[ 16, 'mat4' ]
+] );
+
+const typeFromArray = new Map( [
+	[ Int8Array, 'int' ],
+	[ Int16Array, 'int' ],
+	[ Int32Array, 'int' ],
+	[ Uint8Array, 'uint' ],
+	[ Uint16Array, 'uint' ],
+	[ Uint32Array, 'uint' ],
+	[ Float32Array, 'float' ]
+] );
+
+const isNonPaddingElementArray = new Set( [ Int32Array, Uint32Array, Float32Array ] );
 
 const toFloat = ( value ) => {
 
@@ -32,18 +45,20 @@ class NodeBuilder {
 	constructor( object, renderer, parser ) {
 
 		this.object = object;
-		this.material = object.material || null;
-		this.geometry = object.geometry || null;
+		this.material = object && ( object.material || null );
+		this.geometry = object && ( object.geometry || null );
 		this.renderer = renderer;
 		this.parser = parser;
 
 		this.nodes = [];
 		this.updateNodes = [];
+		this.updateBeforeNodes = [];
 		this.hashNodes = {};
 
-		this.scene = null;
 		this.lightsNode = null;
+		this.environmentNode = null;
 		this.fogNode = null;
+		this.toneMappingNode = null;
 
 		this.vertexShader = null;
 		this.fragmentShader = null;
@@ -57,14 +72,19 @@ class NodeBuilder {
 		this.varyings = [];
 		this.vars = { vertex: [], fragment: [], compute: [] };
 		this.flow = { code: '' };
-		this.stack = [];
+		this.chaining = [];
+		this.stack = stack();
+		this.tab = '\t';
 
 		this.context = {
 			keywords: new NodeKeywords(),
-			material: object.material
+			material: this.material,
+			getMIPLevelAlgorithmNode: ( textureNode, levelNode ) => levelNode.mul( maxMipLevel( textureNode ) )
 		};
 
-		this.nodesData = new WeakMap();
+		this.cache = new NodeCache();
+		this.globalCache = this.cache;
+
 		this.flowsData = new WeakMap();
 
 		this.shaderStage = null;
@@ -72,59 +92,66 @@ class NodeBuilder {
 
 	}
 
-	get node() {
+	setHashNode( node, hash ) {
 
-		return this.stack[ this.stack.length - 1 ];
+		this.hashNodes[ hash ] = node;
 
 	}
 
-	addStack( node ) {
+	addNode( node ) {
 
-		/*
-		if ( this.stack.indexOf( node ) !== - 1 ) {
+		if ( this.nodes.indexOf( node ) === - 1 ) {
 
-			console.warn( 'Recursive node: ', node );
+			const updateType = node.getUpdateType();
+			const updateBeforeType = node.getUpdateBeforeType();
 
-		}
-		*/
+			if ( updateType !== NodeUpdateType.NONE ) {
 
-		this.stack.push( node );
+				this.updateNodes.push( node );
 
-	}
+			}
+
+			if ( updateBeforeType !== NodeUpdateType.NONE ) {
 
-	removeStack( node ) {
+				this.updateBeforeNodes.push( node );
 
-		const lastStack = this.stack.pop();
+			}
 
-		if ( lastStack !== node ) {
+			this.nodes.push( node );
 
-			throw new Error( 'NodeBuilder: Invalid node stack!' );
+			this.setHashNode( node, node.getHash( this ) );
 
 		}
 
 	}
 
-	setHashNode( node, hash ) {
+	get currentNode() {
 
-		this.hashNodes[ hash ] = node;
+		return this.chaining[ this.chaining.length - 1 ];
 
 	}
 
-	addNode( node ) {
+	addChain( node ) {
 
-		if ( this.nodes.indexOf( node ) === - 1 ) {
+		/*
+		if ( this.chaining.indexOf( node ) !== - 1 ) {
 
-			const updateType = node.getUpdateType( this );
+			console.warn( 'Recursive node: ', node );
 
-			if ( updateType !== NodeUpdateType.NONE ) {
+		}
+		*/
 
-				this.updateNodes.push( node );
+		this.chaining.push( node );
 
-			}
+	}
 
-			this.nodes.push( node );
+	removeChain( node ) {
 
-			this.setHashNode( node, node.getHash( this ) );
+		const lastChain = this.chaining.pop();
+
+		if ( lastChain !== node ) {
+
+			throw new Error( 'NodeBuilder: Invalid node chaining!' );
 
 		}
 
@@ -162,55 +189,55 @@ class NodeBuilder {
 
 	}
 
-	isAvailable( /*name*/ ) {
+	setCache( cache ) {
 
-		return false;
+		this.cache = cache;
 
 	}
 
-	getInstanceIndex() {
+	getCache() {
 
-		console.warn( 'Abstract function.' );
+		return this.cache;
 
 	}
 
-	getFrontFacing() {
+	isAvailable( /*name*/ ) {
 
-		console.warn( 'Abstract function.' );
+		return false;
 
 	}
 
-	getFragCoord() {
+	getInstanceIndex() {
 
 		console.warn( 'Abstract function.' );
 
 	}
 
-	isFlipY() {
+	getFrontFacing() {
 
-		return false;
+		console.warn( 'Abstract function.' );
 
 	}
 
-	getTexture( /* textureProperty, uvSnippet */ ) {
+	getFragCoord() {
 
 		console.warn( 'Abstract function.' );
 
 	}
 
-	getTextureLevel( /* textureProperty, uvSnippet, levelSnippet */ ) {
+	isFlipY() {
 
-		console.warn( 'Abstract function.' );
+		return false;
 
 	}
 
-	getCubeTexture( /* textureProperty, uvSnippet */ ) {
+	getTexture( /* texture, textureProperty, uvSnippet */ ) {
 
 		console.warn( 'Abstract function.' );
 
 	}
 
-	getCubeTextureLevel( /* textureProperty, uvSnippet, levelSnippet */ ) {
+	getTextureLevel( /* texture, textureProperty, uvSnippet, levelSnippet */ ) {
 
 		console.warn( 'Abstract function.' );
 
@@ -278,7 +305,7 @@ class NodeBuilder {
 
 	hasGeometryAttribute( name ) {
 
-		return this.geometry?.getAttribute( name ) !== undefined;
+		return this.geometry && this.geometry.getAttribute( name ) !== undefined;
 
 	}
 
@@ -338,25 +365,33 @@ class NodeBuilder {
 
 	}
 
+	/** @deprecated, r152 */
 	getTextureEncodingFromMap( map ) {
 
-		let encoding;
+		console.warn( 'THREE.NodeBuilder: Method .getTextureEncodingFromMap replaced by .getTextureColorSpaceFromMap in r152+.' );
+		return this.getTextureColorSpaceFromMap( map ) === SRGBColorSpace ? sRGBEncoding : LinearEncoding;
+
+	}
+
+	getTextureColorSpaceFromMap( map ) {
+
+		let colorSpace;
 
 		if ( map && map.isTexture ) {
 
-			encoding = map.encoding;
+			colorSpace = map.colorSpace;
 
 		} else if ( map && map.isWebGLRenderTarget ) {
 
-			encoding = map.texture.encoding;
+			colorSpace = map.texture.colorSpace;
 
 		} else {
 
-			encoding = LinearEncoding;
+			colorSpace = NoColorSpace;
 
 		}
 
-		return encoding;
+		return colorSpace;
 
 	}
 
@@ -390,12 +425,42 @@ class NodeBuilder {
 	getTypeFromLength( length, componentType = 'float' ) {
 
 		if ( length === 1 ) return componentType;
+
 		const baseType = typeFromLength.get( length );
 		const prefix = componentType === 'float' ? '' : componentType[ 0 ];
+
 		return prefix + baseType;
 
 	}
 
+	getTypeFromArray( array ) {
+
+		return typeFromArray.get( array.constructor );
+
+	}
+
+	getTypeFromAttribute( attribute ) {
+
+		let dataAttribute = attribute;
+
+		if ( attribute.isInterleavedBufferAttribute ) dataAttribute = attribute.data;
+
+		const array = dataAttribute.array;
+		const itemSize = isNonPaddingElementArray.has( array.constructor ) ? attribute.itemSize : dataAttribute.stride || attribute.itemSize;
+		const normalized = attribute.normalized;
+
+		let arrayType;
+
+		if ( ! ( attribute instanceof Float16BufferAttribute ) && normalized !== true ) {
+
+			arrayType = this.getTypeFromArray( array );
+
+		}
+
+		return this.getTypeFromLength( itemSize, arrayType );
+
+	}
+
 	getTypeLength( type ) {
 
 		const vecType = this.getVectorType( type );
@@ -432,15 +497,35 @@ class NodeBuilder {
 
 	}
 
+	addStack() {
+
+		this.stack = stack( this.stack );
+
+		return this.stack;
+
+	}
+
+	removeStack() {
+
+		const currentStack = this.stack;
+
+		this.stack = currentStack.parent;
+
+		return currentStack;
+
+	}
+
 	getDataFromNode( node, shaderStage = this.shaderStage ) {
 
-		let nodeData = this.nodesData.get( node );
+		const cache = node.isGlobal( this ) ? this.globalCache : this.cache;
+
+		let nodeData = cache.getNodeData( node );
 
 		if ( nodeData === undefined ) {
 
 			nodeData = { vertex: {}, fragment: {}, compute: {} };
 
-			this.nodesData.set( node, nodeData );
+			cache.setNodeData( node, nodeData );
 
 		}
 
@@ -450,13 +535,9 @@ class NodeBuilder {
 
 	getNodeProperties( node, shaderStage = this.shaderStage ) {
 
-		const nodeData = this.getDataFromNode( this, shaderStage );
-		const constructHash = node.getConstructHash( this );
-
-		nodeData.properties = nodeData.properties || {};
-		nodeData.properties[ constructHash ] = nodeData.properties[ constructHash ] || { outputNode: null };
+		const nodeData = this.getDataFromNode( node, shaderStage );
 
-		return nodeData.properties[ constructHash ];
+		return nodeData.properties || ( nodeData.properties = { outputNode: null } );
 
 	}
 
@@ -551,10 +632,46 @@ class NodeBuilder {
 
 	}
 
+	addLineFlowCode( code ) {
+
+		if ( code === '' ) return this;
+
+		code = this.tab + code;
+
+		if ( ! /;\s*$/.test( code ) ) {
+
+			code = code + ';\n';
+
+		}
+
+		this.flow.code += code;
+
+		return this;
+
+	}
+
 	addFlowCode( code ) {
 
 		this.flow.code += code;
 
+		return this;
+
+	}
+
+	addFlowTab() {
+
+		this.tab += '\t';
+
+		return this;
+
+	}
+
+	removeFlowTab() {
+
+		this.tab = this.tab.slice( 0, - 1 );
+
+		return this;
+
 	}
 
 	getFlowData( node/*, shaderStage*/ ) {
@@ -603,7 +720,7 @@ class NodeBuilder {
 
 		if ( propertyName !== null ) {
 
-			flowData.code += `${propertyName} = ${flowData.result};\n\t`;
+			flowData.code += `${ this.tab + propertyName } = ${ flowData.result };\n`;
 
 		}
 
@@ -703,65 +820,39 @@ class NodeBuilder {
 
 	build() {
 
-		// stage 1: generate shader node
-
-		this.setBuildStage( 'construct' );
-
-		for ( const shaderStage of shaderStages ) {
+		// construct() -> stage 1: create possible new nodes and returns an output reference node
+		// analyze()   -> stage 2: analyze nodes to possible optimization and validation
+		// generate()  -> stage 3: generate shader
 
-			this.setShaderStage( shaderStage );
+		for ( const buildStage of defaultBuildStages ) {
 
-			const flowNodes = this.flowNodes[ shaderStage ];
+			this.setBuildStage( buildStage );
 
-			for ( const node of flowNodes ) {
+			if ( this.context.vertex && this.context.vertex.isNode ) {
 
-				node.build( this );
+				this.flowNodeFromShaderStage( 'vertex', this.context.vertex );
 
 			}
 
-		}
-
-		// stage 2: analyze nodes to possible optimization and validation
-
-		this.setBuildStage( 'analyze' );
-
-		for ( const shaderStage of shaderStages ) {
-
-			this.setShaderStage( shaderStage );
-
-			const flowNodes = this.flowNodes[ shaderStage ];
-
-			for ( const node of flowNodes ) {
-
-				node.build( this );
+			for ( const shaderStage of shaderStages ) {
 
-			}
-
-		}
-
-		// stage 3: pre-build vertex code used in fragment shader
+				this.setShaderStage( shaderStage );
 
-		this.setBuildStage( 'generate' );
-
-		if ( this.context.vertex && this.context.vertex.isNode ) {
-
-			this.flowNodeFromShaderStage( 'vertex', this.context.vertex );
-
-		}
+				const flowNodes = this.flowNodes[ shaderStage ];
 
-		// stage 4: generate shader
+				for ( const node of flowNodes ) {
 
-		this.setBuildStage( 'generate' );
+					if ( buildStage === 'generate' ) {
 
-		for ( const shaderStage of shaderStages ) {
+						this.flowNode( node );
 
-			this.setShaderStage( shaderStage );
+					} else {
 
-			const flowNodes = this.flowNodes[ shaderStage ];
+						node.build( this );
 
-			for ( const node of flowNodes ) {
+					}
 
-				this.flowNode( node );
+				}
 
 			}
 
@@ -770,7 +861,7 @@ class NodeBuilder {
 		this.setBuildStage( null );
 		this.setShaderStage( null );
 
-		// stage 5: build code for a specific output
+		// stage 4: build code for a specific output
 
 		this.buildCode();
 
@@ -816,7 +907,7 @@ class NodeBuilder {
 
 		if ( fromTypeLength > toTypeLength ) {
 
-			return this.format( `${ snippet }.${ 'xyz'.slice( 0, toTypeLength ) }`, this.getTypeFromLength( toTypeLength ), toType );
+			return this.format( `${ snippet }.${ 'xyz'.slice( 0, toTypeLength ) }`, this.getTypeFromLength( toTypeLength, this.getComponentType( fromType ) ), toType );
 
 		}
 

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

@@ -0,0 +1,26 @@
+let id = 0;
+
+class NodeCache {
+
+	constructor() {
+
+		this.id = id ++;
+		this.nodesData = new WeakMap();
+
+	}
+
+	getNodeData( node ) {
+
+		return this.nodesData.get( node );
+
+	}
+
+	setNodeData( node, data ) {
+
+		this.nodesData.set( node, data );
+
+	}
+
+}
+
+export default NodeCache;

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

@@ -8,31 +8,82 @@ class NodeFrame {
 		this.deltaTime = 0;
 
 		this.frameId = 0;
+		this.renderId = 0;
 
 		this.startTime = null;
 
-		this.updateMap = new WeakMap();
+		this.frameMap = new WeakMap();
+		this.frameBeforeMap = new WeakMap();
+		this.renderMap = new WeakMap();
+		this.renderBeforeMap = new WeakMap();
 
 		this.renderer = null;
 		this.material = null;
 		this.camera = null;
 		this.object = null;
+		this.scene = null;
+
+	}
+
+	updateBeforeNode( node ) {
+
+		const updateType = node.getUpdateBeforeType();
+
+		if ( updateType === NodeUpdateType.FRAME ) {
+
+			if ( this.frameBeforeMap.get( node ) !== this.frameId ) {
+
+				this.frameBeforeMap.set( node, this.frameId );
+
+				node.updateBefore( this );
+
+			}
+
+		} else if ( updateType === NodeUpdateType.RENDER ) {
+
+			if ( this.renderBeforeMap.get( node ) !== this.renderId || this.frameBeforeMap.get( node ) !== this.frameId ) {
+
+				this.renderBeforeMap.set( node, this.renderId );
+				this.frameBeforeMap.set( node, this.frameId );
+
+				node.updateBefore( this );
+
+			}
+
+		} else if ( updateType === NodeUpdateType.OBJECT ) {
+
+			node.updateBefore( this );
+
+		}
 
 	}
 
 	updateNode( node ) {
 
-		if ( node.updateType === NodeUpdateType.FRAME ) {
+		const updateType = node.getUpdateType();
+
+		if ( updateType === NodeUpdateType.FRAME ) {
+
+			if ( this.frameMap.get( node ) !== this.frameId ) {
+
+				this.frameMap.set( node, this.frameId );
+
+				node.update( this );
+
+			}
+
+		} else if ( updateType === NodeUpdateType.RENDER ) {
 
-			if ( this.updateMap.get( node ) !== this.frameId ) {
+			if ( this.renderMap.get( node ) !== this.renderId || this.frameMap.get( node ) !== this.frameId ) {
 
-				this.updateMap.set( node, this.frameId );
+				this.renderMap.set( node, this.renderId );
+				this.frameMap.set( node, this.frameId );
 
 				node.update( this );
 
 			}
 
-		} else if ( node.updateType === NodeUpdateType.OBJECT ) {
+		} else if ( updateType === NodeUpdateType.OBJECT ) {
 
 			node.update( this );