Nodes: getComponentType() instead of getPrimitiveType() (mrdoob#27617)

aardgoose · Jan 23, 2024 · 4445abd · 4445abd
1 parent 51d582b
commit 4445abd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/examples/jsm/nodes/core/NodeBuilder.js b/examples/jsm/nodes/core/NodeBuilder.js
@@ -1178,18 +1178,6 @@ class NodeBuilder {
 
 	}
 
-	getPrimitiveType( type ) {
-
-		let primitiveType;
-
-		if ( type[ 0 ] === 'i' ) primitiveType = 'int';
-		else if ( type[ 0 ] === 'u' ) primitiveType = 'uint';
-		else primitiveType = 'float';
-
-		return primitiveType;
-
-	}
-
 	format( snippet, fromType, toType ) {
 
 		fromType = this.getVectorType( fromType );
@@ -1249,7 +1237,7 @@ class NodeBuilder {
 			// convert a number value to vector type, e.g:
 			// vec3( 1u ) -> vec3( float( 1u ) )
 
-			snippet = `${ this.getType( this.getPrimitiveType( toType ) ) }( ${ snippet } )`;
+			snippet = `${ this.getType( this.getComponentType( toType ) ) }( ${ snippet } )`;
 
 		}
 

diff --git a/examples/jsm/nodes/utils/JoinNode.js b/examples/jsm/nodes/utils/JoinNode.js
@@ -28,15 +28,15 @@ class JoinNode extends TempNode {
 		const type = this.getNodeType( builder );
 		const nodes = this.nodes;
 
-		const primitiveType = builder.getPrimitiveType( type );
+		const primitiveType = builder.getComponentType( type );
 
 		const snippetValues = [];
 
 		for ( const input of nodes ) {
 
 			let inputSnippet = input.build( builder );
 
-			const inputPrimitiveType = builder.getPrimitiveType( input.getNodeType( builder ) );
+			const inputPrimitiveType = builder.getComponentType( input.getNodeType( builder ) );
 
 			if ( inputPrimitiveType !== primitiveType ) {
 

diff --git a/examples/jsm/nodes/utils/SplitNode.js b/examples/jsm/nodes/utils/SplitNode.js
@@ -30,15 +30,15 @@ class SplitNode extends Node {
 
 	}
 
-	getPrimitiveType( builder ) {
+	getComponentType( builder ) {
 
-		return builder.getPrimitiveType( this.node.getNodeType( builder ) );
+		return builder.getComponentType( this.node.getNodeType( builder ) );
 
 	}
 
 	getNodeType( builder ) {
 
-		return builder.getTypeFromLength( this.components.length, this.getPrimitiveType( builder ) );
+		return builder.getTypeFromLength( this.components.length, this.getComponentType( builder ) );
 
 	}
 
@@ -59,7 +59,7 @@ class SplitNode extends Node {
 
 				// needed expand the input node
 
-				type = builder.getTypeFromLength( this.getVectorLength(), this.getPrimitiveType( builder ) );
+				type = builder.getTypeFromLength( this.getVectorLength(), this.getComponentType( builder ) );
 
 			}