super-three 0.181.0 → 0.185.0

package/examples/jsm/loaders/TDSLoader.js

@@ -684,11 +684,9 @@ class TDSLoader extends Loader {
 
 			case INT_PERCENTAGE:
 				return ( subChunk.readShort( ) / 100 );
-				break;
 
 			case FLOAT_PERCENTAGE:
 				return subChunk.readFloat( );
-				break;
 
 			default:
 				this.debugMessage( '      Unknown percentage chunk: ' + subChunk.hexId );

package/examples/jsm/loaders/TGALoader.js

@@ -389,7 +389,6 @@ class TGALoader extends DataTextureLoader {
 
 					default:
 						throw new Error( 'THREE.TGALoader: Format not supported.' );
-						break;
 
 				}
 
@@ -415,7 +414,6 @@ class TGALoader extends DataTextureLoader {
 
 					default:
 						throw new Error( 'THREE.TGALoader: Format not supported.' );
-						break;
 
 				}
 

package/examples/jsm/loaders/TTFLoader.js

@@ -2,7 +2,7 @@ import {
 	FileLoader,
 	Loader
 } from 'three';
-import opentype from '../libs/opentype.module.js';
+import opentype from 'https://cdn.jsdelivr.net/npm/opentype.js@1.3.4/+esm';
 
 /**
  * A loader for the TTF format.

package/examples/jsm/loaders/USDLoader.js

@@ -1,20 +1,23 @@
 import {
 	FileLoader,
-	Loader
+	Loader,
+	LoaderUtils
 } from 'three';
 
-import * as fflate from '../libs/fflate.module.js';
+import { unzipSync } from '../libs/fflate.module.js';
 import { USDAParser } from './usd/USDAParser.js';
 import { USDCParser } from './usd/USDCParser.js';
+import { USDComposer } from './usd/USDComposer.js';
 
 /**
- * A loader for the USDZ format.
+ * A loader for the USD format (USD, USDA, USDC, USDZ).
  *
- * USDZ files that use USDC internally are not yet supported, only USDA.
+ * Supports both ASCII (USDA) and binary (USDC) USD files, as well as
+ * USDZ archives containing either format.
  *
  * ```js
- * const loader = new USDZLoader();
- * const model = await loader.loadAsync( 'saeukkang.usdz' );
+ * const loader = new USDLoader();
+ * const model = await loader.loadAsync( 'model.usdz' );
  * scene.add( model );
  * ```
  *
@@ -47,6 +50,8 @@ class USDLoader extends Loader {
 
 		const scope = this;
 
+		const path = ( scope.path === '' ) ? LoaderUtils.extractUrlBase( url ) : scope.path;
+
 		const loader = new FileLoader( scope.manager );
 		loader.setPath( scope.path );
 		loader.setResponseType( 'arraybuffer' );
@@ -56,7 +61,7 @@ class USDLoader extends Loader {
 
 			try {
 
-				onLoad( scope.parse( text ) );
+				scope.parse( text, path, onLoad, onError );
 
 			} catch ( e ) {
 
@@ -81,41 +86,74 @@ class USDLoader extends Loader {
 	/**
 	 * Parses the given USDZ data and returns the resulting group.
 	 *
+	 * The returned group is created synchronously, but any referenced textures
+	 * are loaded asynchronously. Provide `onLoad` to be notified once all
+	 * textures have finished loading.
+	 *
 	 * @param {ArrayBuffer|string} buffer - The raw USDZ data as an array buffer.
+	 * @param {string} [path=''] - The URL base path.
+	 * @param {function(Group)} [onLoad] - Executed once the group and all of its textures are ready.
+	 * @param {onErrorCallback} [onError] - Executed when errors occur.
 	 * @return {Group} The parsed asset as a group.
 	 */
-	parse( buffer ) {
+	parse( buffer, path = '', onLoad, onError ) {
 
 		const usda = new USDAParser();
 		const usdc = new USDCParser();
+		const textDecoder = new TextDecoder();
+
+		function toArrayBuffer( data ) {
+
+			if ( data instanceof ArrayBuffer ) return data;
+
+			if ( data.byteOffset === 0 && data.byteLength === data.buffer.byteLength ) {
+
+				return data.buffer;
+
+			}
+
+			return data.buffer.slice( data.byteOffset, data.byteOffset + data.byteLength );
+
+		}
+
+		function getLowercaseExtension( filename ) {
+
+			const lastDot = filename.lastIndexOf( '.' );
+			if ( lastDot < 0 ) return '';
+
+			const lastSlash = filename.lastIndexOf( '/' );
+			if ( lastSlash > lastDot ) return '';
+
+			return filename.slice( lastDot + 1 ).toLowerCase();
+
+		}
 
 		function parseAssets( zip ) {
 
 			const data = {};
-			const loader = new FileLoader();
-			loader.setResponseType( 'arraybuffer' );
 
 			for ( const filename in zip ) {
 
-				if ( filename.endsWith( 'png' ) ) {
+				const fileBytes = zip[ filename ];
+				const ext = getLowercaseExtension( filename );
 
-					const blob = new Blob( [ zip[ filename ] ], { type: 'image/png' } );
-					data[ filename ] = URL.createObjectURL( blob );
+				if ( ext === 'png' || ext === 'jpg' || ext === 'jpeg' || ext === 'avif' ) {
 
-				}
+					// Keep raw image bytes and create object URLs lazily in USDComposer.
+					data[ filename ] = fileBytes;
+					continue;
 
-				if ( filename.endsWith( 'usd' ) || filename.endsWith( 'usda' ) || filename.endsWith( 'usdc' ) ) {
+				}
 
-					if ( isCrateFile( zip[ filename ] ) ) {
+				if ( ext !== 'usd' && ext !== 'usda' && ext !== 'usdc' ) continue;
 
-						data[ filename ] = usdc.parse( zip[ filename ].buffer, data );
+				if ( isCrateFile( fileBytes ) ) {
 
-					} else {
+					data[ filename ] = usdc.parseData( toArrayBuffer( fileBytes ) );
 
-						const text = fflate.strFromU8( zip[ filename ] );
-						data[ filename ] = usda.parseText( text );
+				} else {
 
-					}
+					data[ filename ] = usda.parseData( textDecoder.decode( fileBytes ) );
 
 				}
 
@@ -128,10 +166,9 @@ class USDLoader extends Loader {
 		function isCrateFile( buffer ) {
 
 			const crateHeader = new Uint8Array( [ 0x50, 0x58, 0x52, 0x2D, 0x55, 0x53, 0x44, 0x43 ] ); // PXR-USDC
+			const view = buffer instanceof Uint8Array ? buffer : new Uint8Array( buffer );
 
-			if ( buffer.byteLength < crateHeader.length ) return false;
-
-			const view = new Uint8Array( buffer, 0, crateHeader.length );
+			if ( view.byteLength < crateHeader.length ) return false;
 
 			for ( let i = 0; i < crateHeader.length; i ++ ) {
 
@@ -145,26 +182,30 @@ class USDLoader extends Loader {
 
 		function findUSD( zip ) {
 
-			if ( zip.length < 1 ) return undefined;
+			const fileNames = Object.keys( zip );
+			if ( fileNames.length < 1 ) return { file: undefined, filename: '', basePath: '' };
 
-			const firstFileName = Object.keys( zip )[ 0 ];
+			const firstFileName = fileNames[ 0 ];
+			const ext = getLowercaseExtension( firstFileName );
 			let isCrate = false;
 
-			// As per the USD specification, the first entry in the zip archive is used as the main file ("UsdStage").
+			const lastSlash = firstFileName.lastIndexOf( '/' );
+			const basePath = lastSlash >= 0 ? firstFileName.slice( 0, lastSlash ) : '';
+
+			// Per AOUSD core spec v1.0.1 section 16.4.1.2, the first ZIP entry is the root layer.
 			// ASCII files can end in either .usda or .usd.
-			// See https://openusd.org/release/spec_usdz.html#layout
-			if ( firstFileName.endsWith( 'usda' ) ) return zip[ firstFileName ];
+			if ( ext === 'usda' ) return { file: zip[ firstFileName ], filename: firstFileName, basePath };
 
-			if ( firstFileName.endsWith( 'usdc' ) ) {
+			if ( ext === 'usdc' ) {
 
 				isCrate = true;
 
-			} else if ( firstFileName.endsWith( 'usd' ) ) {
+			} else if ( ext === 'usd' ) {
 
 				// If this is not a crate file, we assume it is a plain USDA file.
 				if ( ! isCrateFile( zip[ firstFileName ] ) ) {
 
-					return zip[ firstFileName ];
+					return { file: zip[ firstFileName ], filename: firstFileName, basePath };
 
 				} else {
 
@@ -176,41 +217,84 @@ class USDLoader extends Loader {
 
 			if ( isCrate ) {
 
-				return zip[ firstFileName ];
+				return { file: zip[ firstFileName ], filename: firstFileName, basePath };
 
 			}
 
+			return { file: undefined, filename: '', basePath: '' };
+
 		}
 
-		// USDA
+		const scope = this;
+
+		const finalize = ( composer, group ) => {
+
+			if ( onLoad ) {
+
+				Promise.all( composer.texturePromises )
+					.then( () => onLoad( group ) )
+					.catch( ( err ) => onError ? onError( err ) : console.error( err ) );
+
+			}
+
+			return group;
+
+		};
+
+		// USDA (standalone)
 
 		if ( typeof buffer === 'string' ) {
 
-			return usda.parse( buffer, {} );
+			const composer = new USDComposer( scope.manager );
+			const data = usda.parseData( buffer );
+			return finalize( composer, composer.compose( data, {}, {}, path ) );
 
 		}
 
-		// USDC
+		// USDC (standalone)
 
 		if ( isCrateFile( buffer ) ) {
 
-			return usdc.parse( buffer );
+			const composer = new USDComposer( scope.manager );
+			const data = usdc.parseData( toArrayBuffer( buffer ) );
+			return finalize( composer, composer.compose( data, {}, {}, path ) );
 
 		}
 
+		const bytes = new Uint8Array( buffer );
+
 		// USDZ
 
-		const zip = fflate.unzipSync( new Uint8Array( buffer ) );
+		if ( bytes[ 0 ] === 0x50 && bytes[ 1 ] === 0x4B ) {
+
+			const zip = unzipSync( bytes );
+			const assets = parseAssets( zip );
+			const { file, filename, basePath } = findUSD( zip );
+
+			if ( ! file ) {
+
+				throw new Error( 'THREE.USDLoader: Invalid USDZ package. The first ZIP entry must be a USD layer (.usd/.usda/.usdc).' );
+
+			}
+
+			const composer = new USDComposer( scope.manager );
+			const data = assets[ filename ];
+			if ( ! data ) {
 
-		const assets = parseAssets( zip );
+				throw new Error( 'THREE.USDLoader: Failed to parse root layer "' + filename + '".' );
 
-		// console.log( assets );
+			}
 
-		const file = findUSD( zip );
+			return finalize( composer, composer.compose( data, assets, {}, basePath ) );
+
+		}
 
-		const text = fflate.strFromU8( file );
+		// USDA (standalone, as ArrayBuffer)
 
-		return usda.parse( text, assets );
+		const composer = new USDComposer( scope.manager );
+		const text = textDecoder.decode( bytes );
+		const data = usda.parseData( text );
+		return finalize( composer, composer.compose( data, {}, {}, path ) );
 
 	}