فهرست منبع

Rename NodeVary* to NodeVarying* (#24388)

sunag 3 سال پیش
والد
کامیت
93f49ed914

+ 6 - 6
examples/jsm/nodes/Nodes.js

@@ -18,12 +18,12 @@ import NodeFunctionInput from './core/NodeFunctionInput.js';
 import NodeKeywords from './core/NodeKeywords.js';
 import NodeUniform from './core/NodeUniform.js';
 import NodeVar from './core/NodeVar.js';
-import NodeVary from './core/NodeVary.js';
+import NodeVarying from './core/NodeVarying.js';
 import PropertyNode from './core/PropertyNode.js';
 import TempNode from './core/TempNode.js';
 import UniformNode from './core/UniformNode.js';
 import VarNode from './core/VarNode.js';
-import VaryNode from './core/VaryNode.js';
+import VaryingNode from './core/VaryingNode.js';
 
 // accessors
 import BufferNode from './accessors/BufferNode.js';
@@ -127,12 +127,12 @@ const nodeLib = {
 	NodeKeywords,
 	NodeUniform,
 	NodeVar,
-	NodeVary,
+	NodeVarying,
 	PropertyNode,
 	TempNode,
 	UniformNode,
 	VarNode,
-	VaryNode,
+	VaryingNode,
 
 	// geometry
 	RangeNode,
@@ -235,12 +235,12 @@ export {
 	NodeKeywords,
 	NodeUniform,
 	NodeVar,
-	NodeVary,
+	NodeVarying,
 	PropertyNode,
 	TempNode,
 	UniformNode,
 	VarNode,
-	VaryNode,
+	VaryingNode,
 
 	// geometry
 	RangeNode,

+ 4 - 4
examples/jsm/nodes/accessors/NormalNode.js

@@ -1,6 +1,6 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import VaryNode from '../core/VaryNode.js';
+import VaryingNode from '../core/VaryingNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import CameraNode from '../accessors/CameraNode.js';
 import OperatorNode from '../math/OperatorNode.js';
@@ -39,18 +39,18 @@ class NormalNode extends Node {
 
 		} else if ( scope === NormalNode.LOCAL ) {
 
-			outputNode = new VaryNode( new NormalNode( NormalNode.GEOMETRY ) );
+			outputNode = new VaryingNode( new NormalNode( NormalNode.GEOMETRY ) );
 
 		} else if ( scope === NormalNode.VIEW ) {
 
 			const vertexNormalNode = new OperatorNode( '*', new ModelNode( ModelNode.NORMAL_MATRIX ), new NormalNode( NormalNode.LOCAL ) );
-			outputNode = new MathNode( MathNode.NORMALIZE, new VaryNode( vertexNormalNode ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexNormalNode ) );
 
 		} else if ( scope === NormalNode.WORLD ) {
 
 			// 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 ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexNormalNode ) );
 
 		}
 

+ 5 - 5
examples/jsm/nodes/accessors/PositionNode.js

@@ -1,6 +1,6 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import VaryNode from '../core/VaryNode.js';
+import VaryingNode from '../core/VaryingNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import MathNode from '../math/MathNode.js';
 import OperatorNode from '../math/OperatorNode.js';
@@ -39,22 +39,22 @@ class PositionNode extends Node {
 
 		} else if ( scope === PositionNode.LOCAL ) {
 
-			outputNode = new VaryNode( new PositionNode( PositionNode.GEOMETRY ) );
+			outputNode = new VaryingNode( new PositionNode( PositionNode.GEOMETRY ) );
 
 		} else if ( scope === PositionNode.WORLD ) {
 
 			const vertexPositionNode = new MathNode( MathNode.TRANSFORM_DIRECTION, new ModelNode( ModelNode.WORLD_MATRIX ), new PositionNode( PositionNode.LOCAL ) );
-			outputNode = new VaryNode( vertexPositionNode );
+			outputNode = new VaryingNode( vertexPositionNode );
 
 		} else if ( scope === PositionNode.VIEW ) {
 
 			const vertexPositionNode = new OperatorNode( '*', new ModelNode( ModelNode.VIEW_MATRIX ), new PositionNode( PositionNode.LOCAL ) );
-			outputNode = new VaryNode( vertexPositionNode );
+			outputNode = new VaryingNode( vertexPositionNode );
 
 		} else if ( scope === PositionNode.VIEW_DIRECTION ) {
 
 			const vertexPositionNode = new MathNode( MathNode.NEGATE, new PositionNode( PositionNode.VIEW ) );
-			outputNode = new MathNode( MathNode.NORMALIZE, new VaryNode( vertexPositionNode ) );
+			outputNode = new MathNode( MathNode.NORMALIZE, new VaryingNode( vertexPositionNode ) );
 
 		}
 

+ 3 - 3
examples/jsm/nodes/core/AttributeNode.js

@@ -1,5 +1,5 @@
 import Node from './Node.js';
-import VaryNode from './VaryNode.js';
+import VaryingNode from './VaryingNode.js';
 
 class AttributeNode extends Node {
 
@@ -58,9 +58,9 @@ class AttributeNode extends Node {
 
 		} else {
 
-			const nodeVary = new VaryNode( this );
+			const nodeVarying = new VaryingNode( this );
 
-			return nodeVary.build( builder, attribute.type );
+			return nodeVarying.build( builder, attribute.type );
 
 		}
 

+ 12 - 12
examples/jsm/nodes/core/NodeBuilder.js

@@ -1,6 +1,6 @@
 import NodeUniform from './NodeUniform.js';
 import NodeAttribute from './NodeAttribute.js';
-import NodeVary from './NodeVary.js';
+import NodeVarying from './NodeVarying.js';
 import NodeVar from './NodeVar.js';
 import NodeCode from './NodeCode.js';
 import NodeKeywords from './NodeKeywords.js';
@@ -55,7 +55,7 @@ class NodeBuilder {
 		this.uniforms = { vertex: [], fragment: [], compute: [], index: 0 };
 		this.codes = { vertex: [], fragment: [], compute: [] };
 		this.attributes = [];
-		this.varys = [];
+		this.varyings = [];
 		this.vars = { vertex: [], fragment: [], compute: [] };
 		this.flow = { code: '' };
 		this.stack = [];
@@ -456,26 +456,26 @@ class NodeBuilder {
 
 	}
 
-	getVaryFromNode( node, type ) {
+	getVaryingFromNode( node, type ) {
 
 		const nodeData = this.getDataFromNode( node, null );
 
-		let nodeVary = nodeData.vary;
+		let nodeVarying = nodeData.varying;
 
-		if ( nodeVary === undefined ) {
+		if ( nodeVarying === undefined ) {
 
-			const varys = this.varys;
-			const index = varys.length;
+			const varyings = this.varyings;
+			const index = varyings.length;
 
-			nodeVary = new NodeVary( 'nodeVary' + index, type );
+			nodeVarying = new NodeVarying( 'nodeVarying' + index, type );
 
-			varys.push( nodeVary );
+			varyings.push( nodeVarying );
 
-			nodeData.vary = nodeVary;
+			nodeData.varying = nodeVarying;
 
 		}
 
-		return nodeVary;
+		return nodeVarying;
 
 	}
 
@@ -572,7 +572,7 @@ class NodeBuilder {
 
 	}
 
-	getVarys( /*shaderStage*/ ) {
+	getVaryings( /*shaderStage*/ ) {
 
 		console.warn( 'Abstract function.' );
 

+ 3 - 3
examples/jsm/nodes/core/NodeVary.js → examples/jsm/nodes/core/NodeVarying.js

@@ -1,8 +1,8 @@
-class NodeVary {
+class NodeVarying {
 
 	constructor( name, type ) {
 
-		this.isNodeVary = true;
+		this.isNodeVarying = true;
 
 		this.name = name;
 		this.type = type;
@@ -11,4 +11,4 @@ class NodeVary {
 
 }
 
-export default NodeVary;
+export default NodeVarying;

+ 7 - 7
examples/jsm/nodes/core/VaryNode.js → examples/jsm/nodes/core/VaryingNode.js

@@ -1,7 +1,7 @@
 import Node from './Node.js';
 import { NodeShaderStage } from './constants.js';
 
-class VaryNode extends Node {
+class VaryingNode extends Node {
 
 	constructor( node, name = null ) {
 
@@ -20,7 +20,7 @@ class VaryNode extends Node {
 
 	getNodeType( builder ) {
 
-		// VaryNode is auto type
+		// VaryingNode is auto type
 
 		return this.node.getNodeType( builder );
 
@@ -32,23 +32,23 @@ class VaryNode extends Node {
 		const node = this.node;
 		const name = this.name;
 
-		const nodeVary = builder.getVaryFromNode( this, type );
+		const nodeVarying = builder.getVaryingFromNode( this, type );
 
 		if ( name !== null ) {
 
-			nodeVary.name = name;
+			nodeVarying.name = name;
 
 		}
 
-		const propertyName = builder.getPropertyName( nodeVary, NodeShaderStage.Vertex );
+		const propertyName = builder.getPropertyName( nodeVarying, NodeShaderStage.Vertex );
 
 		// force node run in vertex stage
 		builder.flowNodeFromShaderStage( NodeShaderStage.Vertex, node, type, propertyName );
 
-		return builder.getPropertyName( nodeVary );
+		return builder.getPropertyName( nodeVarying );
 
 	}
 
 }
 
-export default VaryNode;
+export default VaryingNode;

+ 2 - 2
examples/jsm/nodes/shadernode/ShaderNodeBaseElements.js

@@ -11,7 +11,7 @@ import InstanceIndexNode from '../core/InstanceIndexNode.js';
 import PropertyNode from '../core/PropertyNode.js';
 import UniformNode from '../core/UniformNode.js';
 import VarNode from '../core/VarNode.js';
-import VaryNode from '../core/VaryNode.js';
+import VaryingNode from '../core/VaryingNode.js';
 
 // accessors
 import BufferNode from '../accessors/BufferNode.js';
@@ -120,7 +120,7 @@ export const call = nodeProxy( FunctionCallNode );
 export const instanceIndex = nodeImmutable( InstanceIndexNode );
 export const label = nodeProxy( VarNode );
 export const temp = label;
-export const vary = nodeProxy( VaryNode );
+export const varying = nodeProxy( VaryingNode );
 
 // accesors
 

+ 7 - 7
examples/jsm/renderers/webgl/nodes/WebGLNodeBuilder.js

@@ -284,15 +284,15 @@ class WebGLNodeBuilder extends NodeBuilder {
 
 	}
 
-	getVarys( /* shaderStage */ ) {
+	getVaryings( /* shaderStage */ ) {
 
 		let snippet = '';
 
-		const varys = this.varys;
+		const varyings = this.varyings;
 
-		for ( const vary of varys ) {
+		for ( const varying of varyings ) {
 
-			snippet += `varying ${vary.type} ${vary.name}; `;
+			snippet += `varying ${varying.type} ${varying.name}; `;
 
 		}
 
@@ -378,7 +378,7 @@ class WebGLNodeBuilder extends NodeBuilder {
 
 			const uniforms = this.getUniforms( shaderStage );
 			const attributes = this.getAttributes( shaderStage );
-			const varys = this.getVarys( shaderStage );
+			const varyings = this.getVaryings( shaderStage );
 			const vars = this.getVars( shaderStage );
 			const codes = this.getCodes( shaderStage );
 
@@ -391,8 +391,8 @@ ${uniforms}
 // attributes
 ${attributes}
 
-// varys
-${varys}
+// varyings
+${varyings}
 
 // vars
 ${vars}

+ 20 - 20
examples/jsm/renderers/webgpu/nodes/WebGPUNodeBuilder.js

@@ -203,11 +203,11 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 	getPropertyName( node, shaderStage = this.shaderStage ) {
 
-		if ( node.isNodeVary === true ) {
+		if ( node.isNodeVarying === true ) {
 
 			if ( shaderStage === 'vertex' ) {
 
-				return `NodeVarys.${ node.name }`;
+				return `NodeVaryings.${ node.name }`;
 
 			}
 
@@ -457,7 +457,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 	}
 
-	getVarys( shaderStage ) {
+	getVaryings( shaderStage ) {
 
 		const snippets = [];
 
@@ -465,25 +465,25 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			this.getBuiltin( 'position', 'Vertex', 'vec4<f32>', 'vertex' );
 
-			const varys = this.varys;
+			const varyings = this.varyings;
 
-			for ( let index = 0; index < varys.length; index ++ ) {
+			for ( let index = 0; index < varyings.length; index ++ ) {
 
-				const vary = varys[ index ];
+				const varying = varyings[ index ];
 
-				snippets.push( `@location( ${index} ) ${ vary.name } : ${ this.getType( vary.type ) }` );
+				snippets.push( `@location( ${index} ) ${ varying.name } : ${ this.getType( varying.type ) }` );
 
 			}
 
 		} else if ( shaderStage === 'fragment' ) {
 
-			const varys = this.varys;
+			const varyings = this.varyings;
 
-			for ( let index = 0; index < varys.length; index ++ ) {
+			for ( let index = 0; index < varyings.length; index ++ ) {
 
-				const vary = varys[ index ];
+				const varying = varyings[ index ];
 
-				snippets.push( `@location( ${index} ) ${ vary.name } : ${ this.getType( vary.type ) }` );
+				snippets.push( `@location( ${index} ) ${ varying.name } : ${ this.getType( varying.type ) }` );
 
 			}
 
@@ -497,7 +497,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 		const code = snippets.join( ',\n\t' );
 
-		return shaderStage === 'vertex' ? this._getWGSLStruct( 'NodeVarysStruct', '\t' + code ) : code;
+		return shaderStage === 'vertex' ? this._getWGSLStruct( 'NodeVaryingsStruct', '\t' + code ) : code;
 
 	}
 
@@ -612,7 +612,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 					if ( shaderStage === 'vertex' ) {
 
-						flow += 'NodeVarys.Vertex = ';
+						flow += 'NodeVaryings.Vertex = ';
 
 					} else if ( shaderStage === 'fragment' ) {
 
@@ -630,7 +630,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			stageData.uniforms = this.getUniforms( shaderStage );
 			stageData.attributes = this.getAttributes( shaderStage );
-			stageData.varys = this.getVarys( shaderStage );
+			stageData.varyings = this.getVaryings( shaderStage );
 			stageData.vars = this.getVars( shaderStage );
 			stageData.codes = this.getCodes( shaderStage );
 			stageData.flow = flow;
@@ -701,17 +701,17 @@ class WebGPUNodeBuilder extends NodeBuilder {
 // uniforms
 ${shaderData.uniforms}
 
-// varys
-${shaderData.varys}
+// varyings
+${shaderData.varyings}
 
 // codes
 ${shaderData.codes}
 
 @vertex
-fn main( ${shaderData.attributes} ) -> NodeVarysStruct {
+fn main( ${shaderData.attributes} ) -> NodeVaryingsStruct {
 
 	// system
-	var NodeVarys: NodeVarysStruct;
+	var NodeVaryings: NodeVaryingsStruct;
 
 	// vars
 	${shaderData.vars}
@@ -719,7 +719,7 @@ fn main( ${shaderData.attributes} ) -> NodeVarysStruct {
 	// flow
 	${shaderData.flow}
 
-	return NodeVarys;
+	return NodeVaryings;
 
 }
 `;
@@ -737,7 +737,7 @@ ${shaderData.uniforms}
 ${shaderData.codes}
 
 @fragment
-fn main( ${shaderData.varys} ) -> @location( 0 ) vec4<f32> {
+fn main( ${shaderData.varyings} ) -> @location( 0 ) vec4<f32> {
 
 	// vars
 	${shaderData.vars}