Explorar o código

Nodes: Remove `ArrayUniformNode` (#27705)

* Rename ArrayUniformNode -> VectorUniformNode

* Remove Vector/ArrayUniformNode

* cleanup
sunag hai 1 ano
pai
achega
a988218a34

+ 0 - 1
examples/jsm/nodes/Nodes.js

@@ -5,7 +5,6 @@
 export * from './core/constants.js';
 
 // core
-export { default as ArrayUniformNode /* @TODO: arrayUniform */ } from './core/ArrayUniformNode.js';
 export { default as AssignNode, assign } from './core/AssignNode.js';
 export { default as AttributeNode, attribute } from './core/AttributeNode.js';
 export { default as BypassNode, bypass } from './core/BypassNode.js';

+ 0 - 26
examples/jsm/nodes/core/ArrayUniformNode.js

@@ -1,26 +0,0 @@
-import UniformNode from './UniformNode.js';
-import { addNodeClass } from './Node.js';
-
-class ArrayUniformNode extends UniformNode {
-
-	constructor( nodes = [] ) {
-
-		super();
-
-		this.isArrayUniformNode = true;
-
-		this.nodes = nodes;
-
-	}
-
-	getNodeType( builder ) {
-
-		return this.nodes[ 0 ].getNodeType( builder );
-
-	}
-
-}
-
-export default ArrayUniformNode;
-
-addNodeClass( 'ArrayUniformNode', ArrayUniformNode );

+ 2 - 25
examples/jsm/renderers/webgpu/nodes/WGSLNodeBuilder.js

@@ -7,7 +7,6 @@ import { NodeSampledTexture, NodeSampledCubeTexture } from '../../common/nodes/N
 
 import UniformBuffer from '../../common/UniformBuffer.js';
 import StorageBuffer from '../../common/StorageBuffer.js';
-import { getVectorLength, getStrideLength } from '../../common/BufferUtils.js';
 
 import { NodeBuilder, CodeNode } from '../../../nodes/Nodes.js';
 
@@ -411,31 +410,9 @@ class WGSLNodeBuilder extends NodeBuilder {
 
 				}
 
-				if ( node.isArrayUniformNode === true ) {
+				uniformGPU = this.getNodeUniform( uniformNode, type );
 
-					uniformGPU = [];
-
-					for ( const uniformNode of node.nodes ) {
-
-						const uniformNodeGPU = this.getNodeUniform( uniformNode, type );
-
-						// fit bounds to buffer
-						uniformNodeGPU.boundary = getVectorLength( uniformNodeGPU.itemSize );
-						uniformNodeGPU.itemSize = getStrideLength( uniformNodeGPU.itemSize );
-
-						uniformsGroup.addUniform( uniformNodeGPU );
-
-						uniformGPU.push( uniformNodeGPU );
-
-					}
-
-				} else {
-
-					uniformGPU = this.getNodeUniform( uniformNode, type );
-
-					uniformsGroup.addUniform( uniformGPU );
-
-				}
+				uniformsGroup.addUniform( uniformGPU );
 
 			}