Ver código fonte

Revert "TSL: Added type conversions to `WGSLNodeFunction` and fleshed out precision. (#28577)" (#28659)

This reverts commit e37cf82bcf685890159e8e863a4a1eed5b4467f4.
sunag 1 ano atrás
pai
commit
88f8b7c03c

+ 6 - 49
examples/jsm/renderers/webgpu/nodes/WGSLNodeFunction.js

@@ -5,43 +5,9 @@ const declarationRegexp = /^[fn]*\s*([a-z_0-9]+)?\s*\(([\s\S]*?)\)\s*[\-\>]*\s*(
 const propertiesRegexp = /[a-z_0-9]+|<(.*?)>+/ig;
 
 const wgslTypeLib = {
-	'f32': 'float',
-	'i32': 'int',
-	'u32': 'uint',
-	'bool': 'bool',
-
-	'vec2<f32>': 'vec2',
- 	'vec2<i32>': 'ivec2',
- 	'vec2<u32>': 'uvec2',
- 	'vec2<bool>': 'bvec2',
-
-	'vec3<f32>': 'vec3',
-	'vec3<i32>': 'ivec3',
-	'vec3<u32>': 'uvec3',
-	'vec3<bool>': 'bvec3',
-
-	'vec4<f32>': 'vec4',
-	'vec4<i32>': 'ivec4',
-	'vec4<u32>': 'uvec4',
-	'vec4<bool>': 'bvec4',
-
-	'mat2x2<f32>': 'mat2',
-	'mat2x2<i32>': 'imat2',
-	'mat2x2<u32>': 'umat2',
-	'mat2x2<bool>': 'bmat2',
-
-	'mat3x3<f32>': 'mat3',
-	'mat3x3<i32>': 'imat3',
-	'mat3x3<u32>': 'umat3',
-	'mat3x3<bool>': 'bmat3',
-
-	'mat4x4<f32>': 'mat4',
-	'mat4x4<i32>': 'imat4',
-	'mat4x4<u32>': 'umat4',
-	'mat4x4<bool>': 'bmat4'
+	f32: 'float'
 };
 
-
 const parse = ( source ) => {
 
 	source = source.trim();
@@ -76,24 +42,15 @@ const parse = ( source ) => {
 			const name = propsMatches[ i ++ ][ 0 ];
 			let type = propsMatches[ i ++ ][ 0 ];
 
-			// precision
-
-			if ( i < propsMatches.length && propsMatches[ i ][ 0 ].startsWith( '<' ) === true ) {
-
-				const elementType = propsMatches[ i ++ ][ 0 ];
-
-				// If primitive data type
-				if ( ! elementType.includes( ',' ) ) {
-
-					type += elementType;
+			type = wgslTypeLib[ type ] || type;
 
-				}
+			// precision
 
-			}
-
-			type = wgslTypeLib[ type ] || type;
+			if ( i < propsMatches.length && propsMatches[ i ][ 0 ].startsWith( '<' ) === true )
+				i ++;
 
 			// add input
+
 			inputs.push( new NodeFunctionInput( type, name ) );
 
 		}