Răsfoiți Sursa

WebGPU: Clean up. (#22768)

* WebGPUNodeBuilder: Clean up.

* WebGPURenderer: Clean up.

* Examples: Clean up.
Michael Herzog 3 ani în urmă
părinte
comite
640a0b509b

+ 0 - 1
examples/jsm/renderers/nodes/accessors/NormalNode.js

@@ -1,6 +1,5 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import NodeKeywords from '../core/NodeKeywords.js';
 import VaryNode from '../core/VaryNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import CameraNode from '../accessors/CameraNode.js';

+ 0 - 1
examples/jsm/renderers/nodes/accessors/PositionNode.js

@@ -1,6 +1,5 @@
 import Node from '../core/Node.js';
 import AttributeNode from '../core/AttributeNode.js';
-import NodeKeywords from '../core/NodeKeywords.js';
 import VaryNode from '../core/VaryNode.js';
 import ModelNode from '../accessors/ModelNode.js';
 import MathNode from '../math/MathNode.js';

+ 1 - 4
examples/jsm/renderers/nodes/inputs/BufferNode.js

@@ -1,7 +1,4 @@
 import InputNode from '../core/InputNode.js';
-import ExpressionNode from '../core/ExpressionNode.js';
-import UVNode from '../accessors/UVNode.js';
-import ColorSpaceNode from '../display/ColorSpaceNode.js';
 
 class BufferNode extends InputNode {
 
@@ -15,7 +12,7 @@ class BufferNode extends InputNode {
 
 	}
 
-	getNodeType( builder ) {
+	getNodeType( /* builder */ ) {
 
 		return this.bufferType;
 

+ 0 - 1
examples/jsm/renderers/webgpu/WebGPURenderer.js

@@ -635,7 +635,6 @@ class WebGPURenderer {
 
 	_projectObject( object, camera, groupOrder ) {
 
-		const info = this._info;
 		const currentRenderList = this._currentRenderList;
 
 		if ( object.visible === false ) return;

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

@@ -171,7 +171,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			if ( alphaTest !== null ) {
 
-				alphaTest = this.addFlow( 'fragment', new VarNode( alphaTest, 'AlphaTest', 'float' ) );
+				this.addFlow( 'fragment', new VarNode( alphaTest, 'AlphaTest', 'float' ) );
 
 				this.addFlow( 'fragment', new ExpressionNode( 'if ( DiffuseColor.a <= AlphaTest ) { discard; }' ) );
 
@@ -441,7 +441,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 			const attributes = this.attributes;
 			const length = attributes.length;
 
-			snippet += `\n`;
+			snippet += '\n';
 
 			for ( let index = 0; index < length; index ++ ) {
 
@@ -453,13 +453,13 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				if ( index + 1 < length ) {
 
-					snippet += `,\n`;
+					snippet += ',\n';
 
 				}
 
 			}
 
-			snippet += `\n`;
+			snippet += '\n';
 
 		}
 
@@ -494,7 +494,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 		if ( shaderStage === 'vertex' ) {
 
-			snippet += `\t[[ builtin( position ) ]] Vertex: vec4<f32>;\n`;
+			snippet += '\t[[ builtin( position ) ]] Vertex: vec4<f32>;\n';
 
 			const varys = this.varys;
 
@@ -512,7 +512,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 			const varys = this.varys;
 
-			snippet += `\n`;
+			snippet += '\n';
 
 			for ( let index = 0; index < varys.length; index ++ ) {
 
@@ -522,13 +522,13 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				if ( index + 1 < varys.length ) {
 
-					snippet += `,\n`;
+					snippet += ',\n';
 
 				}
 
 			}
 
-			snippet += `\n`;
+			snippet += '\n';
 
 		}
 
@@ -603,7 +603,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 		for ( const shaderStage in shadersData ) {
 
-			let flow = `// code\n`;
+			let flow = '// code\n';
 			flow += `\t${ this.flowCode[ shaderStage ] }`;
 			flow += '\n';
 
@@ -617,7 +617,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				if ( slotName ) {
 
-					if ( flow.length > 0 ) flow += `\n`;
+					if ( flow.length > 0 ) flow += '\n';
 
 					flow += `\t// FLOW -> ${ slotName }\n\t`;
 
@@ -627,15 +627,15 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 				if ( node === mainNode ) {
 
-					flow += `// FLOW RESULT\n\t`;
+					flow += '// FLOW RESULT\n\t';
 
 					if ( shaderStage === 'vertex' ) {
 
-						flow += `NodeVarys.Vertex = `;
+						flow += 'NodeVarys.Vertex = ';
 
 					} else if ( shaderStage === 'fragment' ) {
 
-						flow += `return `;
+						flow += 'return ';
 
 					}
 
@@ -661,7 +661,7 @@ class WebGPUNodeBuilder extends NodeBuilder {
 
 	}
 
-	getMethod( method, shaderStage = this.shaderStage ) {
+	getMethod( method ) {
 
 		if ( wgslPolyfill[ method ] !== undefined ) {
 

+ 1 - 1
examples/webgpu_materials.html

@@ -130,7 +130,7 @@
 
 				// Custom ShaderNode ( desaturate filter )
 
-				const desaturateShaderNode = new Nodes.ShaderNode( ( input ) => {
+				const desaturateShaderNode = new ShaderNode( ( input ) => {
 
 					return dot( vec3( 0.299, 0.587, 0.114 ), input.color.xyz );