super-three 0.133.4 → 0.136.1

package/examples/jsm/renderers/nodes/procedural/CheckerNode.js

@@ -1,13 +1,11 @@
-import FunctionNode from '../core/FunctionNode.js';
 import Node from '../core/Node.js';
 import UVNode from '../accessors/UVNode.js';
 
-import { ShaderNode, float, add, mul, floor, mod, sign } from '../ShaderNode.js';
+import { ShaderNode, add, mul, floor, mod, sign } from '../ShaderNode.js';
 
-// Three.JS Shader Language
-const checkerShaderNode = ShaderNode( ( uv ) => {
+const checkerShaderNode = new ShaderNode( ( inputs ) => {
 
-	uv = mul( uv, 2.0 );
+	const uv = mul( inputs.uv, 2.0 );
 
 	const cx = floor( uv.x );
 	const cy = floor( uv.y );
@@ -19,17 +17,17 @@ const checkerShaderNode = ShaderNode( ( uv ) => {
 
 class CheckerNode extends Node {
 
-	constructor( uv = new UVNode() ) {
+	constructor( uvNode = new UVNode() ) {
 
 		super( 'float' );
 
-		this.uv = uv;
+		this.uvNode = uvNode;
 
 	}
 
-	generate( builder, output ) {
+	generate( builder ) {
 
-		return checkerShaderNode( this.uv ).build( builder, output );
+		return checkerShaderNode( { uv: this.uvNode } ).build( builder );
 
 	}
 

package/examples/jsm/renderers/nodes/utils/ArrayElementNode.js

@@ -0,0 +1,31 @@
+import Node from '../core/Node.js';
+
+class ArrayElementNode extends Node {
+
+	constructor( node, indexNode ) {
+
+		super();
+
+		this.node = node;
+		this.indexNode = indexNode;
+
+	}
+
+	getNodeType( builder ) {
+
+		return this.node.getNodeType( builder );
+
+	}
+
+	generate( builder ) {
+
+		const nodeSnippet = this.node.build( builder );
+		const indexSnippet = this.indexNode.build( builder, 'int' );
+
+		return `${nodeSnippet}[ ${indexSnippet} ]`;
+
+	}
+
+}
+
+export default ArrayElementNode;

package/examples/jsm/renderers/nodes/utils/ConvertNode.js

@@ -0,0 +1,33 @@
+import Node from '../core/Node.js';
+
+class ConvertNode extends Node {
+
+	constructor( node, convertTo ) {
+
+		super();
+
+		this.node = node;
+		this.convertTo = convertTo;
+
+	}
+
+	getNodeType( /*builder*/ ) {
+
+		return this.convertTo;
+
+	}
+
+	generate( builder ) {
+
+		const convertTo = this.convertTo;
+
+		const convertToSnippet = builder.getType( convertTo );
+		const nodeSnippet = this.node.build( builder, convertTo );
+
+		return `${ convertToSnippet }( ${ nodeSnippet } )`;
+
+	}
+
+}
+
+export default ConvertNode;

package/examples/jsm/renderers/nodes/utils/JoinNode.js

@@ -2,30 +2,30 @@ import Node from '../core/Node.js';
 
 class JoinNode extends Node {
 
-	constructor( values = [] ) {
+	constructor( nodes = [] ) {
 
 		super();
 
-		this.values = values;
+		this.nodes = nodes;
 
 	}
 
 	getNodeType( builder ) {
 
-		return builder.getTypeFromLength( this.values.length );
+		return builder.getTypeFromLength( this.nodes.length );
 
 	}
 
 	generate( builder ) {
 
 		const type = this.getNodeType( builder );
-		const values = this.values;
+		const nodes = this.nodes;
 
 		const snippetValues = [];
 
-		for ( let i = 0; i < values.length; i ++ ) {
+		for ( let i = 0; i < nodes.length; i ++ ) {
 
-			const input = values[ i ];
+			const input = nodes[ i ];
 
 			const inputSnippet = input.build( builder, 'float' );
 
@@ -33,7 +33,7 @@ class JoinNode extends Node {
 
 		}
 
-		return `${type}( ${ snippetValues.join( ', ' ) } )`;
+		return `${ builder.getType( type ) }( ${ snippetValues.join( ', ' ) } )`;
 
 	}
 

package/examples/jsm/renderers/nodes/utils/OscNode.js

@@ -0,0 +1,58 @@
+import Node from '../core/Node.js';
+import TimerNode from './TimerNode.js';
+import { abs, fract, round, sin, add, sub, mul, PI2 } from '../ShaderNode.js';
+
+class OscNode extends Node {
+
+	static SINE = 'sine';
+	static SQUARE = 'square';
+	static TRIANGLE = 'triangle';
+	static SAWTOOTH = 'sawtooth';
+
+	constructor( method = OscNode.SINE, timeNode = new TimerNode() ) {
+
+		super();
+
+		this.method = method;
+		this.timeNode = timeNode;
+
+	}
+
+	getNodeType( builder ) {
+
+		return this.timeNode.getNodeType( builder );
+
+	}
+
+	generate( builder ) {
+
+		const method = this.method;
+		const timeNode = this.timeNode;
+
+		let outputNode = null;
+
+		if ( method === OscNode.SINE ) {
+
+			outputNode = add( mul( sin( mul( add( timeNode, .75 ), PI2 ) ), .5 ), .5 );
+
+		} else if ( method === OscNode.SQUARE ) {
+
+			outputNode = round( fract( timeNode ) );
+
+		} else if ( method === OscNode.TRIANGLE ) {
+
+			outputNode = abs( sub( 1, mul( fract( add( timeNode, .5 ) ), 2 ) ) );
+
+		} else if ( method === OscNode.SAWTOOTH ) {
+
+			outputNode = fract( timeNode );
+
+		}
+
+		return outputNode.build( builder );
+
+	}
+
+}
+
+export default OscNode;

package/examples/jsm/renderers/nodes/utils/SplitNode.js

@@ -22,21 +22,31 @@ class SplitNode extends Node {
 		const node = this.node;
 		const nodeTypeLength = builder.getTypeLength( node.getNodeType( builder ) );
 
-		const components = this.components;
+		if ( nodeTypeLength > 1 ) {
 
-		let type = null;
+			const components = this.components;
 
-		if ( components.length >= nodeTypeLength ) {
+			let type = null;
 
-			// need expand the input node
+			if ( components.length >= nodeTypeLength ) {
 
-			type = this.getNodeType( builder );
+				// need expand the input node
 
-		}
+				type = this.getNodeType( builder );
+
+			}
+
+			const nodeSnippet = node.build( builder, type );
+
+			return `${nodeSnippet}.${this.components}`;
 
-		const nodeSnippet = node.build( builder, type );
+		} else {
 
-		return `${nodeSnippet}.${this.components}`;
+			// ignore components if node is a float
+
+			return node.build( builder );
+
+		}
 
 	}
 

package/examples/jsm/renderers/nodes/utils/SpriteSheetUVNode.js

@@ -8,21 +8,21 @@ import JoinNode from '../utils/JoinNode.js';
 
 class SpriteSheetUVNode extends Node {
 
-	constructor( count, uv = new UVNode() ) {
+	constructor( countNode, uvNode = new UVNode(), frameNode = new FloatNode( 0 ).setConst( true ) ) {
 
 		super( 'vec2' );
 
-		this.count = count;
-		this.uv = uv;
-		this.frame = new FloatNode( 0 ).setConst( true );
+		this.countNode = countNode;
+		this.uvNode = uvNode;
+		this.frameNode = frameNode;
 
 	}
 
 	generate( builder ) {
 
-		const uv = this.uv;
-		const count = this.count;
-		const frame = this.frame;
+		const count = this.countNode;
+		const uv = this.uvNode;
+		const frame = this.frameNode;
 
 		const one = new FloatNode( 1 ).setConst( true );
 

package/examples/jsm/renderers/nodes/utils/TimerNode.js

@@ -3,7 +3,7 @@ import { NodeUpdateType } from '../core/constants.js';
 
 class TimerNode extends FloatNode {
 
-	static LOCAL = 'local';	
+	static LOCAL = 'local';
 	static GLOBAL = 'global';
 	static DELTA = 'delta';
 

package/examples/jsm/renderers/webgl/nodes/SlotNode.js

@@ -0,0 +1,22 @@
+import Node from '../../nodes/core/Node.js';
+
+class SlotNode extends Node {
+
+	constructor( node, name, nodeType ) {
+
+		super( nodeType );
+
+		this.node = node;
+		this.name = name;
+
+	}
+
+	generate( builder ) {
+
+		return this.node.build( builder, this.getNodeType( builder ) );
+
+	}
+
+}
+
+export default SlotNode;