From 4445abd3577296e347b5c14164cd17cd364acf5e Mon Sep 17 00:00:00 2001 From: sunag Date: Tue, 23 Jan 2024 19:42:18 -0300 Subject: [PATCH] Nodes: getComponentType() instead of getPrimitiveType() (#27617) --- examples/jsm/nodes/core/NodeBuilder.js | 14 +------------- examples/jsm/nodes/utils/JoinNode.js | 4 ++-- examples/jsm/nodes/utils/SplitNode.js | 8 ++++---- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/examples/jsm/nodes/core/NodeBuilder.js b/examples/jsm/nodes/core/NodeBuilder.js index 3855dba05c3677..9fe8a62c746eee 100644 --- 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 index 2360783a785b3d..a1df4b94495732 100644 --- a/examples/jsm/nodes/utils/JoinNode.js +++ b/examples/jsm/nodes/utils/JoinNode.js @@ -28,7 +28,7 @@ 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 = []; @@ -36,7 +36,7 @@ class JoinNode extends TempNode { 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 index 84d4354c086828..f4cab3e238888a 100644 --- 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 ) ); }