introduce automatic use of .toVar() to assign()

Author: sunag

src/nodes/core/AssignNode.js

@@ -97,6 +97,9 @@ class AssignNode extends TempNode {
 
 		const { targetNode, sourceNode } = this;
 
+		const targetProperties = builder.getNodeProperties( targetNode );
+		targetProperties.assign = true;
+
 		const properties = builder.getNodeProperties( this );
 		properties.sourceNode = sourceNode;
 		properties.targetNode = targetNode.context( { assign: true } );

src/nodes/core/NodeBuilder.js

@@ -1755,6 +1755,8 @@ class NodeBuilder {
 	 */
 	getArrayCount( node ) {
 
+		// TODO: Move this to the node itself
+
 		let count = null;
 
 		if ( node.isArrayNode ) count = node.count;

src/nodes/core/StackNode.js

@@ -245,6 +245,30 @@ class StackNode extends Node {
 
 	}
 
+	setup( builder ) {
+
+		const nodeProperties = builder.getNodeProperties( this );
+
+		let index = 0;
+
+		for ( const childNode of this.getChildren() ) {
+
+			if ( childNode.isVarNode && childNode.intention === true ) {
+
+				continue;
+
+			}
+
+			nodeProperties[ 'node' + index ++ ] = childNode;
+
+		}
+
+		// return a outputNode if exists or null
+
+		return nodeProperties.outputNode || null;
+
+	}
+
 	build( builder, ...params ) {
 
 		const previousBuildStack = builder.currentStack;
@@ -258,6 +282,18 @@ class StackNode extends Node {
 
 		for ( const node of this.nodes ) {
 
+			if ( node.isVarNode && node.intention === true ) {
+
+				const properties = builder.getNodeProperties( node );
+
+				if ( properties.assign !== true ) {
+
+					continue;
+
+				}
+
+			}
+
 			if ( buildStage === 'setup' ) {
 
 				node.build( builder );

src/nodes/core/VarNode.js

@@ -1,5 +1,5 @@
 import Node from './Node.js';
-import { addMethodChaining, nodeProxy } from '../tsl/TSLCore.js';
+import { addMethodChaining, getCurrentStack, nodeProxy } from '../tsl/TSLCore.js';
 
 /**
  * Class for representing shader variables as nodes. Variables are created from
@@ -81,6 +81,16 @@ class VarNode extends Node {
 		 */
 		this.parents = true;
 
+		this.intention = false;
+
+	}
+
+	setIntention( value ) {
+
+		this.intention = value;
+
+		return this;
+
 	}
 
 	getMemberType( builder, name ) {
@@ -101,6 +111,25 @@ class VarNode extends Node {
 
 	}
 
+	build( ...params ) {
+
+		if ( this.intention === true ) {
+
+			const builder = params[ 0 ];
+			const properties = builder.getNodeProperties( this );
+
+			if ( properties.assign !== true ) {
+
+				return this.node.build( ...params );
+
+			}
+
+		}
+
+		return super.build( ...params );
+
+	}
+
 	generate( builder ) {
 
 		const { node, name, readOnly } = this;
@@ -189,10 +218,26 @@ export const Var = ( node, name = null ) => createVar( node, name ).toStack();
  */
 export const Const = ( node, name = null ) => createVar( node, name, true ).toStack();
 
+//
+//
+
+export const VarIntention = ( node ) => {
+
+	if ( getCurrentStack() === null ) {
+
+		return node;
+
+	}
+
+	return createVar( node ).setIntention( true ).toStack();
+
+};
+
 // Method chaining
 
 addMethodChaining( 'toVar', Var );
 addMethodChaining( 'toConst', Const );
+addMethodChaining( 'toVarIntention', VarIntention );
 
 // Deprecated
 

src/nodes/math/ConditionalNode.js

@@ -73,6 +73,8 @@ class ConditionalNode extends Node {
 
 			// fallback setup
 
+			// TODO: use build here
+
 			this.setup( builder );
 
 			return this.getNodeType( builder );