super-three 0.164.0 → 0.167.0

package/examples/jsm/loaders/GLTFLoader.js

@@ -2580,18 +2580,24 @@ class GLTFParser {
 		// expensive work of uploading a texture to the GPU off the main thread.
 
 		let isSafari = false;
+		let safariVersion = - 1;
 		let isFirefox = false;
 		let firefoxVersion = - 1;
 
 		if ( typeof navigator !== 'undefined' ) {
 
-			isSafari = /^((?!chrome|android).)*safari/i.test( navigator.userAgent ) === true;
-			isFirefox = navigator.userAgent.indexOf( 'Firefox' ) > - 1;
-			firefoxVersion = isFirefox ? navigator.userAgent.match( /Firefox\/([0-9]+)\./ )[ 1 ] : - 1;
+			const userAgent = navigator.userAgent;
+
+			isSafari = /^((?!chrome|android).)*safari/i.test( userAgent ) === true;
+			const safariMatch = userAgent.match( /Version\/(\d+)/ );
+			safariVersion = isSafari && safariMatch ? parseInt( safariMatch[ 1 ], 10 ) : - 1;
+
+			isFirefox = userAgent.indexOf( 'Firefox' ) > - 1;
+			firefoxVersion = isFirefox ? userAgent.match( /Firefox\/([0-9]+)\./ )[ 1 ] : - 1;
 
 		}
 
-		if ( typeof createImageBitmap === 'undefined' || isSafari || ( isFirefox && firefoxVersion < 98 ) ) {
+		if ( typeof createImageBitmap === 'undefined' || ( isSafari && safariVersion < 17 ) || ( isFirefox && firefoxVersion < 98 ) ) {
 
 			this.textureLoader = new TextureLoader( this.options.manager );
 
@@ -3317,6 +3323,8 @@ class GLTFParser {
 
 			}
 
+			assignExtrasToUserData( texture, sourceDef );
+
 			texture.userData.mimeType = sourceDef.mimeType || getImageURIMimeType( sourceDef.uri );
 
 			return texture;

package/examples/jsm/loaders/LDrawLoader.js

@@ -1974,7 +1974,7 @@ class LDrawLoader extends Loader {
 
 	}
 
-	parse( text, onLoad ) {
+	parse( text, onLoad, onError ) {
 
 		this.partsCache
 			.parseModel( text, this.materialLibrary )
@@ -1985,7 +1985,8 @@ class LDrawLoader extends Loader {
 				group.userData.fileName = '';
 				onLoad( group );
 
-			} );
+			} )
+			.catch( onError );
 
 	}
 

package/examples/jsm/loaders/MMDLoader.js

@@ -131,22 +131,40 @@ class MMDLoader extends Loader {
 
 		}
 
-		const modelExtension = this._extractExtension( url ).toLowerCase();
+		const parser = this._getParser();
+		const extractModelExtension = this._extractModelExtension;
 
-		// Should I detect by seeing header?
-		if ( modelExtension !== 'pmd' && modelExtension !== 'pmx' ) {
+		this.loader
+			.setMimeType( undefined )
+			.setPath( this.path )
+			.setResponseType( 'arraybuffer' )
+			.setRequestHeader( this.requestHeader )
+			.setWithCredentials( this.withCredentials )
+			.load( url, function ( buffer ) {
 
-			if ( onError ) onError( new Error( 'THREE.MMDLoader: Unknown model file extension .' + modelExtension + '.' ) );
+				try {
 
-			return;
+					const modelExtension = extractModelExtension( buffer );
 
-		}
+					if ( modelExtension !== 'pmd' && modelExtension !== 'pmx' ) {
 
-		this[ modelExtension === 'pmd' ? 'loadPMD' : 'loadPMX' ]( url, function ( data ) {
+						if ( onError ) onError( new Error( 'THREE.MMDLoader: Unknown model file extension .' + modelExtension + '.' ) );
 
-			onLoad(	builder.build( data, resourcePath, onProgress, onError )	);
+						return;
 
-		}, onProgress, onError );
+					}
+
+					const data = modelExtension === 'pmd' ? parser.parsePmd( buffer, true ) : parser.parsePmx( buffer, true );
+
+					onLoad( builder.build( data, resourcePath, onProgress, onError ) );
+
+				} catch ( e ) {
+
+					if ( onError ) onError( e );
+
+				}
+
+			}, onProgress, onError );
 
 	}
 
@@ -358,10 +376,11 @@ class MMDLoader extends Loader {
 
 	// private methods
 
-	_extractExtension( url ) {
+	_extractModelExtension( buffer ) {
 
-		const index = url.lastIndexOf( '.' );
-		return index < 0 ? '' : url.slice( index + 1 );
+		const decoder = new TextDecoder( 'utf-8' );
+		const bytes = new Uint8Array( buffer, 0, 3 );
+		return decoder.decode( bytes ).toLowerCase();
 
 	}
 

package/examples/jsm/loaders/MaterialXLoader.js

@@ -1,12 +1,5 @@
 import {
-	FileLoader,
-	Loader,
-	TextureLoader,
-	RepeatWrapping
-} from 'three';
-
-import {
-	MeshBasicNodeMaterial, MeshPhysicalNodeMaterial,
+	FileLoader, Loader, TextureLoader, MeshBasicNodeMaterial, MeshPhysicalNodeMaterial, RepeatWrapping,
 	float, bool, int, vec2, vec3, vec4, color, texture,
 	positionLocal, positionWorld, uv, vertexColor,
 	normalLocal, normalWorld, tangentLocal, tangentWorld,
@@ -20,7 +13,7 @@ import {
 	mx_safepower, mx_contrast,
 	mx_srgb_texture_to_lin_rec709,
 	saturation
-} from '../nodes/Nodes.js';
+} from 'three';
 
 const colorSpaceLib = {
 	mx_srgb_texture_to_lin_rec709

package/examples/jsm/loaders/USDZLoader.js

@@ -52,6 +52,18 @@ class USDAParser {
 					target[ lhs ] = group;
 					target = group;
 
+				} else if ( rhs.endsWith( '(' ) ) {
+
+					// see #28631
+
+					const values = rhs.slice( 0, - 1 );
+					target[ lhs ] = values;
+
+					const meta = {};
+					stack.push( meta );
+
+					target = meta;
+
 				} else {
 
 					target[ lhs ] = rhs;
@@ -170,8 +182,7 @@ class USDZLoader extends Loader {
 
 					if ( isCrateFile( zip[ filename ] ) ) {
 
-						console.warn( 'THREE.USDZLoader: Crate files (.usdc or binary .usd) are not supported.' );
-						continue;
+						throw Error( 'THREE.USDZLoader: Crate files (.usdc or binary .usd) are not supported.' );
 
 					}
 
@@ -230,12 +241,10 @@ class USDZLoader extends Loader {
 
 			if ( isCrate ) {
 
-				console.warn( 'THREE.USDZLoader: Crate files (.usdc or binary .usd) are not supported.' );
+				throw Error( 'THREE.USDZLoader: Crate files (.usdc or binary .usd) are not supported.' );
 
 			}
 
-			return undefined;
-
 		}
 
 		const zip = fflate.unzipSync( new Uint8Array( buffer ) );
@@ -248,15 +257,6 @@ class USDZLoader extends Loader {
 
 		const file = findUSD( zip );
 
-		if ( file === undefined ) {
-
-			console.warn( 'THREE.USDZLoader: No usda file found.' );
-
-			return new Group();
-
-		}
-
-
 		// Parse file
 
 		const text = fflate.strFromU8( file );
@@ -305,30 +305,6 @@ class USDZLoader extends Loader {
 
 				if ( name.startsWith( 'def Mesh' ) ) {
 
-					// Move points to Mesh
-
-					if ( 'point3f[] points' in data ) {
-
-						object[ 'point3f[] points' ] = data[ 'point3f[] points' ];
-
-					}
-
-					// Move st to Mesh
-
-					if ( 'texCoord2f[] primvars:st' in data ) {
-
-						object[ 'texCoord2f[] primvars:st' ] = data[ 'texCoord2f[] primvars:st' ];
-
-					}
-
-					// Move st indices to Mesh
-
-					if ( 'int[] primvars:st:indices' in data ) {
-
-						object[ 'int[] primvars:st:indices' ] = data[ 'int[] primvars:st:indices' ];
-
-					}
-
 					return object;
 
 				}
@@ -350,62 +326,150 @@ class USDZLoader extends Loader {
 
 			if ( ! data ) return undefined;
 
-			let geometry = new BufferGeometry();
+			const geometry = new BufferGeometry();
+			let indices = null;
+			let counts = null;
+			let uvs = null;
+
+			let positionsLength = - 1;
+
+			// index
 
 			if ( 'int[] faceVertexIndices' in data ) {
 
-				const indices = JSON.parse( data[ 'int[] faceVertexIndices' ] );
-				geometry.setIndex( indices );
+				indices = JSON.parse( data[ 'int[] faceVertexIndices' ] );
+
+			}
+
+			// face count
+
+			if ( 'int[] faceVertexCounts' in data ) {
+
+				counts = JSON.parse( data[ 'int[] faceVertexCounts' ] );
+				indices = toTriangleIndices( indices, counts );
 
 			}
 
+			// position
+
 			if ( 'point3f[] points' in data ) {
 
 				const positions = JSON.parse( data[ 'point3f[] points' ].replace( /[()]*/g, '' ) );
-				const attribute = new BufferAttribute( new Float32Array( positions ), 3 );
+				positionsLength = positions.length;
+				let attribute = new BufferAttribute( new Float32Array( positions ), 3 );
+
+				if ( indices !== null ) attribute = toFlatBufferAttribute( attribute, indices );
+
 				geometry.setAttribute( 'position', attribute );
 
 			}
 
+			// uv
+
+			if ( 'float2[] primvars:st' in data ) {
+
+				data[ 'texCoord2f[] primvars:st' ] = data[ 'float2[] primvars:st' ];
+
+			}
+
+			if ( 'texCoord2f[] primvars:st' in data ) {
+
+				uvs = JSON.parse( data[ 'texCoord2f[] primvars:st' ].replace( /[()]*/g, '' ) );
+				let attribute = new BufferAttribute( new Float32Array( uvs ), 2 );
+
+				if ( indices !== null ) attribute = toFlatBufferAttribute( attribute, indices );
+
+				geometry.setAttribute( 'uv', attribute );
+
+			}
+
+			if ( 'int[] primvars:st:indices' in data && uvs !== null ) {
+
+				// custom uv index, overwrite uvs with new data
+
+				const attribute = new BufferAttribute( new Float32Array( uvs ), 2 );
+				let indices = JSON.parse( data[ 'int[] primvars:st:indices' ] );
+				indices = toTriangleIndices( indices, counts );
+				geometry.setAttribute( 'uv', toFlatBufferAttribute( attribute, indices ) );
+
+			}
+
+			// normal
+
 			if ( 'normal3f[] normals' in data ) {
 
 				const normals = JSON.parse( data[ 'normal3f[] normals' ].replace( /[()]*/g, '' ) );
-				const attribute = new BufferAttribute( new Float32Array( normals ), 3 );
+				let attribute = new BufferAttribute( new Float32Array( normals ), 3 );
+
+				// normals require a special treatment in USD
+
+				if ( normals.length === positionsLength ) {
+
+					// raw normal and position data have equal length (like produced by USDZExporter)
+
+					if ( indices !== null ) attribute = toFlatBufferAttribute( attribute, indices );
+
+				} else {
+
+					// unequal length, normals are independent of faceVertexIndices
+
+					let indices = Array.from( Array( normals.length / 3 ).keys() ); // [ 0, 1, 2, 3 ... ]
+					indices = toTriangleIndices( indices, counts );
+					attribute = toFlatBufferAttribute( attribute, indices );
+
+				}
+
 				geometry.setAttribute( 'normal', attribute );
 
 			} else {
 
+				// compute flat vertex normals
+
 				geometry.computeVertexNormals();
 
 			}
 
-			if ( 'float2[] primvars:st' in data ) {
+			return geometry;
 
-				data[ 'texCoord2f[] primvars:st' ] = data[ 'float2[] primvars:st' ];
+		}
 
-			}
+		function toTriangleIndices( rawIndices, counts ) {
 
-			if ( 'texCoord2f[] primvars:st' in data ) {
+			const indices = [];
 
-				const uvs = JSON.parse( data[ 'texCoord2f[] primvars:st' ].replace( /[()]*/g, '' ) );
-				const attribute = new BufferAttribute( new Float32Array( uvs ), 2 );
+			for ( let i = 0; i < counts.length; i ++ ) {
+
+				const count = counts[ i ];
+
+				const stride = i * count;
+
+				if ( count === 3 ) {
+
+					const a = rawIndices[ stride + 0 ];
+					const b = rawIndices[ stride + 1 ];
+					const c = rawIndices[ stride + 2 ];
+
+					indices.push( a, b, c );
 
-				if ( 'int[] primvars:st:indices' in data ) {
+				} else if ( count === 4 ) {
 
-					geometry = geometry.toNonIndexed();
+					const a = rawIndices[ stride + 0 ];
+					const b = rawIndices[ stride + 1 ];
+					const c = rawIndices[ stride + 2 ];
+					const d = rawIndices[ stride + 3 ];
 
-					const indices = JSON.parse( data[ 'int[] primvars:st:indices' ] );
-					geometry.setAttribute( 'uv', toFlatBufferAttribute( attribute, indices ) );
+					indices.push( a, b, c );
+					indices.push( a, c, d );
 
 				} else {
 
-					geometry.setAttribute( 'uv', attribute );
+					console.warn( 'THREE.USDZLoader: Face vertex count of %s unsupported.', count );
 
 				}
 
 			}
 
-			return geometry;
+			return indices;
 
 		}
 
@@ -506,9 +570,11 @@ class USDZLoader extends Loader {
 
 			if ( data !== undefined ) {
 
-				if ( 'def Shader "PreviewSurface"' in data ) {
+				const surfaceConnection = data[ 'token outputs:surface.connect' ];
+				const surfaceName = /(\w+).output/.exec( surfaceConnection )[ 1 ];
+				const surface = data[ `def Shader "${surfaceName}"` ];
 
-					const surface = data[ 'def Shader "PreviewSurface"' ];
+				if ( surface !== undefined ) {
 
 					if ( 'color3f inputs:diffuseColor.connect' in surface ) {
 
@@ -677,24 +743,6 @@ class USDZLoader extends Loader {
 
 				}
 
-				if ( 'def Shader "diffuseColor_texture"' in data ) {
-
-					const sampler = data[ 'def Shader "diffuseColor_texture"' ];
-
-					material.map = buildTexture( sampler );
-					material.map.colorSpace = SRGBColorSpace;
-
-				}
-
-				if ( 'def Shader "normal_texture"' in data ) {
-
-					const sampler = data[ 'def Shader "normal_texture"' ];
-
-					material.normalMap = buildTexture( sampler );
-					material.normalMap.colorSpace = NoColorSpace;
-
-				}
-
 			}
 
 			return material;
@@ -729,7 +777,7 @@ class USDZLoader extends Loader {
 
 			if ( 'asset inputs:file' in data ) {
 
-				const path = data[ 'asset inputs:file' ].replace( /@*/g, '' );
+				const path = data[ 'asset inputs:file' ].replace( /@*/g, '' ).trim();
 
 				const loader = new TextureLoader();