usd-gltf 0.1.0 → 0.3.0

package/README.md

@@ -1,6 +1,6 @@
 # usd-gltf
 
-Convert between [OpenUSD](https://openusd.org/) and [glTF](https://www.khronos.org/gltf/) in both directions, in pure JavaScript with no dependencies. Runs in Node and the browser, [live demo](https://richardmonette.github.io/usd-gltf/examples/). Reads and writes all three USD encodings: text `.usda`, binary crate `.usdc`, and the `.usdz` package.
+Convert between [OpenUSD](https://openusd.org/) and [glTF](https://www.khronos.org/gltf/) (`.glb`, or `.gltf` with embedded or external files) in both directions, in pure JavaScript with no dependencies. Runs in Node and the browser, [live demo](https://richardmonette.github.io/usd-gltf/examples/). Reads and writes all three USD encodings: text `.usda`, binary crate `.usdc`, and the `.usdz` package.
 
 ```
 npm install usd-gltf
@@ -35,14 +35,47 @@ USD to glTF composes the stage first (sublayers, references, payloads, inherits,
 - Material variant sets as `KHR_materials_variants`, animation variant sets as separate glTF animations
 - Cameras, UsdLux lights as `KHR_lights_punctual`, PointInstancers
 
-glTF to USD writes `UsdPreviewSurface` materials, UsdSkel skins and blend shapes, time sampled animation, variant sets for material variants and multiple animations, cameras and lights. glTF features that `UsdPreviewSurface` can't express (transmission, sheen, iridescence, ...) are kept in the material's `customData`, so converting back to glTF is lossless.
+glTF to USD writes `UsdPreviewSurface` materials, UsdSkel skins and blend shapes, time sampled animation, variant sets for material variants and multiple animations, cameras and lights. glTF features that `UsdPreviewSurface` can't express (transmission, sheen, iridescence, ...) are kept in the material's `customData`, so converting back to glTF is lossless. Primitives of a mesh that share their vertex data become one USD Mesh with a GeomSubset per primitive, and each Mesh keeps only the vertices it uses, so vertex data is never repeated per primitive.
+
+glTF compression: meshopt (`EXT_meshopt_compression`, `KHR_meshopt_compression`), `KHR_mesh_quantization` and Draco (`KHR_draco_mesh_compression`, see below) are decoded. KTX2 textures (`KHR_texture_basisu`) are not: an asset that requires them fails with an error naming the extension, and when they are optional the PNG or JPEG fallback is used.
+
+### Draco
+
+usd-gltf doesn't bundle a Draco decoder; it loads Google's only when a file is Draco compressed, and uses the uncompressed fallback without loading anything when a file has one.
+
+- **Node:** install [`draco3d`](https://www.npmjs.com/package/draco3d) alongside, an optional peer dependency, and Draco files just work: `npm install draco3d`.
+- **Browsers:** the decoder (about 250 KB) is fetched from Google's CDN, `www.gstatic.com/draco/versioned/decoders/1.5.7/`, pinned to that version and checked against its SHA-256 before it runs. This needs a secure context, and a Content Security Policy that allows the fetch, `unsafe-eval` and WebAssembly.
+- **Your own:** pass a decoder module as `dracoDecoder` to use a self hosted copy, or where the CDN isn't allowed:
+
+```js
+import draco3d from 'draco3d';
+const usdz = await glbToUSD( glb, { dracoDecoder: await draco3d.createDecoderModule() } );
+```
+
+## Limits
+
+Input size alone doesn't bound how much memory a conversion needs: an accessor can declare millions of vertices with no data behind them, and compressed geometry and images expand when decoded. Both directions take opt-in limits:
+
+```js
+const usdz = await glbToUSD( glb, {
+	maxDecodedBytes: 512 * 2 ** 20, // decoded data held during the conversion
+	maxOutputBytes: 256 * 2 ** 20, // any output buffer: the layer, the usdz or glb, as it grows
+	signal: AbortSignal.timeout( 30000 ), // cancellation
+} );
+```
+
+- `maxDecodedBytes` counts, before each allocation: glTF accessors (including ones without a bufferView) and meshopt decoding; USD crate arrays, compressed sections and zip entries; images, from the size in their header; and the arrays written into the converted USD layer, so data referenced many times is counted every time it is written. It is not a limit on the whole process's memory: the input, its parsed JSON or USD text, and other transient copies aren't counted.
+- `maxOutputBytes` is checked as the usdc, usda and glb writers grow and before the final usdz or glb buffer is allocated.
+- `signal` is checked between prims, nodes, meshes, materials and layers. A cancelled conversion rejects with the signal's reason and returns nothing. To stop work that is in a single long step, run the conversion in a worker and terminate it.
+
+Going over a limit rejects with a `ConversionLimitError` whose `stage`, `resource` (`'decoded'` or `'output'`), `limit` and `attempted` say what was too big; it never includes input data or file names. Without limits nothing changes. Sizes that can't be right (an accessor reading past its bufferView, a count too big to allocate, a zip entry inflating past its stated size) are rejected whatever the limits.
 
 ## Conformance
 
 Current status:
 
 - All 18 USD files in Apple's AR Quick Look gallery convert to GLB. Per mesh triangle counts and world space bounds at the start, middle and end of each animation match OpenUSD with skinning baked, and the Khronos glTF Validator reports no errors. (The gallery's three `.reality` files are RealityKit's format, not USD.)
-- All 150 Khronos glTF sample models convert to USDZ that OpenUSD's validators accept with no errors or warnings, with geometry matching the source at several animation times, and convert back to glTF with identical materials, material variants and animations.
+- All 150 Khronos glTF sample models convert to USDZ that OpenUSD's validators accept with no errors or warnings, with geometry matching the source at several animation times, and convert back to glTF with identical materials, material variants and animations. Each model is checked as `.gltf`, and also as `.glb` (120 models), embedded `.gltf` (32 models) and Draco compressed (16 models) where the sample set has those versions: 318 conversions in all.
 
 The acceptance corpora are every model in [Apple's AR Quick Look gallery](https://developer.apple.com/augmented-reality/quick-look/) and every model in the [Khronos glTF Sample Assets](https://github.com/KhronosGroup/glTF-Sample-Assets). Conversions are checked against Pixar's OpenUSD (`usd-core`) and the Khronos glTF Validator: per mesh triangle counts and world space bounds at several animation times, with skinning baked by OpenUSD, must match.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usd-gltf",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Convert between USD (usda, usdc, usdz) and glTF / GLB, pure JavaScript with no dependencies",
   "type": "module",
   "main": "src/index.js",
@@ -35,7 +35,8 @@
     "gltf",
     "glb",
     "converter",
-    "3d"
+    "3d",
+    "draco"
   ],
   "author": "Richard Monette",
   "license": "MIT",
@@ -47,7 +48,16 @@
     "url": "https://github.com/richardmonette/usd-gltf/issues"
   },
   "homepage": "https://github.com/richardmonette/usd-gltf#readme",
+  "peerDependencies": {
+    "draco3d": "^1.5.7"
+  },
+  "peerDependenciesMeta": {
+    "draco3d": {
+      "optional": true
+    }
+  },
   "devDependencies": {
+    "draco3d": "^1.5.7",
     "gltf-validator": "^2.0.0-dev.3.10",
     "meshoptimizer": "^1.3.0"
   },

package/src/convert/gltf-to-usd.js

@@ -14,6 +14,7 @@
 import { AssetPath, Layer, ListOp, PrimSpec, PropertySpec } from '../usd/model.js';
 import { compose, decompose, identity, invert, multiply } from '../util/math.js';
 import { decodeImageAsync, encodePNG, imageMimeType } from '../image/index.js';
+import { rethrowFatal } from '../limits.js';
 
 const MODES = { POINTS: 0, LINES: 1, LINE_LOOP: 2, LINE_STRIP: 3, TRIANGLES: 4, TRIANGLE_STRIP: 5, TRIANGLE_FAN: 6 };
 const WRAP = { 10497: 'repeat', 33648: 'mirror', 33071: 'clamp' };
@@ -33,8 +34,9 @@ function sanitize( name, fallback ) {
 
 class Builder {
 
-	constructor() {
+	constructor( budget ) {
 
+		this.budget = budget;
 		this.layer = new Layer( 'root.usda' );
 		this.paths = new Map(); // PrimSpec -> path
 
@@ -65,6 +67,8 @@ class Builder {
 
 	attr( prim, name, typeName, value, { interpolation, uniform = false, metadata = {}, timeSamples = null, custom = false } = {} ) {
 
+		// arrays authored in the layer count as decoded data: they live until the layer is written
+		if ( ArrayBuffer.isView( value ) ) this.budget.decode( value.byteLength, 'usd layer' );
 		const p = prim.addProperty( new PropertySpec( name, 'attribute' ) );
 		p.typeName = typeName;
 		if ( value !== undefined ) p.default = value;
@@ -110,17 +114,20 @@ export class GLTFToUSD {
 
 		this.doc = doc;
 		this.json = doc.json;
+		this.budget = doc.budget;
 		this.log = log;
 		this.textureDir = textureDir;
 		this.imageDecoder = imageDecoder;
 		this.bakeNormalScale = bakeNormalScale;
 		this.debug = debug; // returns the node/primitive -> prim path mapping, for verification
-		this.b = new Builder();
+		this.b = new Builder( this.budget );
 		this.files = []; // { name, data } for the package
 		this.imageFiles = new Map(); // image index -> path | null
 		this.materialPaths = new Map(); // material index (or 'default') -> path
 		this.nodePrims = new Map(); // node index -> prim spec
 		this.meshPrims = new Map(); // `${node}/${primitive}` -> prim spec
+		this.bindingPrims = new Map(); // `${node}/${primitive}` -> prim spec its material binds to (the mesh or a GeomSubset)
+		this.vertexOrders = new Map(); // prim spec -> glTF vertex index per USD point, when compacted
 		this.jointNodes = new Set();
 		this.timeCodes = new Set();
 
@@ -199,11 +206,12 @@ export class GLTFToUSD {
 				// usdz packages may only hold png and jpeg images
 				try {
 
-					bytes = encodePNG( await decodeImageAsync( bytes, mime, this.imageDecoder ) );
+					bytes = encodePNG( await decodeImageAsync( bytes, mime, this.imageDecoder, this.budget ) );
 					mime = 'image/png';
 
 				} catch ( e ) {
 
+					rethrowFatal( e, this.budget );
 					this.log( `image ${ index }: ${ e.message }` );
 					bytes = null;
 
@@ -238,7 +246,7 @@ export class GLTFToUSD {
 
 		try {
 
-			const img = await decodeImageAsync( image.bytes, image.mimeType, this.imageDecoder );
+			const img = await decodeImageAsync( image.bytes, image.mimeType, this.imageDecoder, this.budget );
 			const max = img.bitDepth === 16 ? 65535 : 255;
 			const out = new Uint8Array( img.width * img.height * 3 );
 
@@ -261,6 +269,7 @@ export class GLTFToUSD {
 
 		} catch ( e ) {
 
+			rethrowFatal( e, this.budget );
 			this.log( `normal map ${ source }: ${ e.message }` );
 
 		}
@@ -275,7 +284,8 @@ export class GLTFToUSD {
 		const texture = this.json.textures?.[ textureIndex ];
 		if ( ! texture ) return undefined;
 		const ext = texture.extensions || {};
-		return ext.KHR_texture_basisu?.source ?? ext.EXT_texture_webp?.source ?? ext.EXT_texture_avif?.source ?? texture.source;
+		// KTX2 can't be decoded, so an optional basisu texture uses its fallback
+		return ext.EXT_texture_webp?.source ?? ext.EXT_texture_avif?.source ?? texture.source ?? ext.KHR_texture_basisu?.source;
 
 	}
 
@@ -323,6 +333,7 @@ export class GLTFToUSD {
 
 	async convertMaterial( material, index ) {
 
+		this.budget.check();
 		const b = this.b;
 		const m = b.def( this.materialScope, sanitize( material.name, 'material' ), 'Material' );
 		const mPath = b.path( m );
@@ -572,6 +583,7 @@ export class GLTFToUSD {
 
 	convertNode( index, parent ) {
 
+		this.budget.check();
 		const node = this.json.nodes[ index ];
 		const b = this.b;
 		if ( this.jointNodes.has( index ) && ! this.hasContent( index ) ) return null;
@@ -664,22 +676,31 @@ export class GLTFToUSD {
 		const node = this.json.nodes[ nodeIndex ];
 		const mesh = this.json.meshes[ node.mesh ];
 		const skinned = node.skin !== undefined;
-		const instancing = node.extensions?.EXT_mesh_gpu_instancing;
+		const instancing = node.extensions?.EXT_mesh_gpu_instancing && ! skinned;
+		const groups = instancing ? mesh.primitives.map( ( _, p ) => [ p ] ) : this.primitiveGroups( mesh );
 
-		mesh.primitives.forEach( ( primitive, p ) => {
+		groups.forEach( ( group ) => {
 
-			const name = sanitize( mesh.primitives.length > 1 ? `${ mesh.name || 'mesh' }_${ p }` : mesh.name, `mesh_${ node.mesh }` );
+			const p = group[ 0 ];
+			const primitive = mesh.primitives[ p ];
+			const name = sanitize( groups.length > 1 ? `${ mesh.name || 'mesh' }_${ p }` : mesh.name, `mesh_${ node.mesh }` );
 
-			if ( instancing && ! skinned ) {
+			if ( instancing ) {
 
-				this.convertInstancer( prim, name, primitive, instancing, nodeIndex, p );
+				this.convertInstancer( prim, name, primitive, node.extensions.EXT_mesh_gpu_instancing, nodeIndex, p );
 				return;
 
 			}
 
-			const meshPrim = this.convertPrimitive( prim, name, primitive, { nodeIndex, joints: skinned } );
+			const meshPrim = this.convertPrimitive( prim, name, primitive, { nodeIndex, joints: skinned, group: group.map( ( q ) => mesh.primitives[ q ] ) } );
 			if ( ! meshPrim ) return;
-			this.meshPrims.set( `${ nodeIndex }/${ p }`, meshPrim );
+
+			group.forEach( ( q, k ) => {
+
+				this.meshPrims.set( `${ nodeIndex }/${ q }`, meshPrim );
+				this.bindingPrims.set( `${ nodeIndex }/${ q }`, group.length > 1 ? meshPrim.children.get( `primitive_${ k }` ) : meshPrim );
+
+			} );
 
 			// skins are bound once skeletons exist; morph only meshes get a rigid one joint skeleton
 			if ( skinned ) ( this.pendingSkinned ||= [] ).push( { nodeIndex, primitive, p, meshPrim } );
@@ -690,9 +711,32 @@ export class GLTFToUSD {
 	}
 
 	/**
-	 * Writes one glTF primitive as a Mesh, Points or BasisCurves prim.
+	 * Groups a mesh's primitives that share all vertex data, so each group becomes one USD Mesh
+	 * with a GeomSubset per primitive (how USD -> glTF splits a mesh by material).
+	 * @returns {number[][]} primitive indices
+	 */
+	primitiveGroups( mesh ) {
+
+		const groups = new Map();
+
+		mesh.primitives.forEach( ( q, p ) => {
+
+			const triangles = ( q.mode ?? MODES.TRIANGLES ) >= MODES.TRIANGLES && q.indices !== undefined && q.attributes.POSITION !== undefined;
+			const doubleSided = !! this.json.materials?.[ q.material ]?.doubleSided;
+			const key = triangles ? JSON.stringify( [ Object.entries( q.attributes ).sort(), q.targets ?? null, doubleSided ] ) : p;
+			( groups.get( key ) || groups.set( key, [] ).get( key ) ).push( p );
+
+		} );
+
+		return [ ...groups.values() ];
+
+	}
+
+	/**
+	 * Writes one glTF primitive as a Mesh, Points or BasisCurves prim. Triangle primitives sharing
+	 * vertex data (group) become one Mesh with a GeomSubset each. Unreferenced vertices are dropped.
 	 */
-	convertPrimitive( parent, name, primitive, { nodeIndex, joints = null } = {} ) {
+	convertPrimitive( parent, name, primitive, { nodeIndex, joints = null, group = [ primitive ] } = {} ) {
 
 		const doc = this.doc;
 		const b = this.b;
@@ -750,57 +794,72 @@ export class GLTFToUSD {
 		}
 
 		// triangles; strips and fans are expanded
-		let tris = indices;
-
-		if ( mode === MODES.TRIANGLE_STRIP ) {
+		const parts = group.map( ( q ) => q === primitive ? triangleList( indices, mode ) : triangleList( doc.getAccessor( q.indices ).array, q.mode ?? MODES.TRIANGLES ) );
+		let tris = parts[ 0 ];
 
-			const out = [];
-			for ( let i = 0; i + 2 < indices.length; i ++ ) {
+		if ( parts.length > 1 ) {
 
-				if ( i % 2 === 0 ) out.push( indices[ i ], indices[ i + 1 ], indices[ i + 2 ] );
-				else out.push( indices[ i + 1 ], indices[ i ], indices[ i + 2 ] );
-
-			}
-
-			tris = Uint32Array.from( out );
-
-		} else if ( mode === MODES.TRIANGLE_FAN ) {
-
-			const out = [];
-			for ( let i = 1; i + 1 < indices.length; i ++ ) out.push( indices[ 0 ], indices[ i ], indices[ i + 1 ] );
-			tris = Uint32Array.from( out );
+			tris = new Uint32Array( parts.reduce( ( n, t ) => n + t.length, 0 ) );
+			parts.reduce( ( at, t ) => ( tris.set( t, at ), at + t.length ), 0 );
 
 		}
 
-		tris = tris.subarray( 0, tris.length - ( tris.length % 3 ) );
+		// keep only referenced vertices, in their original order
+		const order = vertexOrder( tris, count );
+		if ( order ) tris = remapIndices( tris, order, count );
+		const pick = ( array, size ) => order ? gather( array, size, order ) : array;
+		const points = pick( positions, 3 );
+
 		const prim = b.def( parent, name, 'Mesh' );
-		b.attr( prim, 'points', 'point3f[]', positions );
+		b.attr( prim, 'points', 'point3f[]', points );
 		b.attr( prim, 'faceVertexCounts', 'int[]', new Int32Array( tris.length / 3 ).fill( 3 ) );
 		b.attr( prim, 'faceVertexIndices', 'int[]', Int32Array.from( tris ) );
-		b.attr( prim, 'extent', 'float3[]', extent( positions ) );
+		b.attr( prim, 'extent', 'float3[]', extent( points ) );
 		b.attr( prim, 'subdivisionScheme', 'token', 'none', { uniform: true } );
+		if ( order ) this.vertexOrders.set( prim, order );
 
-		if ( attrs.NORMAL !== undefined ) b.attr( prim, 'normals', 'normal3f[]', doc.getFloats( attrs.NORMAL ).array, { interpolation: 'vertex' } );
+		if ( attrs.NORMAL !== undefined ) b.attr( prim, 'normals', 'normal3f[]', pick( doc.getFloats( attrs.NORMAL ).array, 3 ), { interpolation: 'vertex' } );
 
 		for ( let i = 0; attrs[ 'TEXCOORD_' + i ] !== undefined; i ++ ) {
 
-			const uv = doc.getFloats( attrs[ 'TEXCOORD_' + i ] ).array;
+			const uv = pick( doc.getFloats( attrs[ 'TEXCOORD_' + i ] ).array, 2 );
 			const st = new Float32Array( uv.length );
 			for ( let k = 0; k < uv.length; k += 2 ) { st[ k ] = uv[ k ]; st[ k + 1 ] = 1 - uv[ k + 1 ]; }
 			b.attr( prim, i ? `primvars:st${ i }` : 'primvars:st', 'texCoord2f[]', st, { interpolation: 'vertex' } );
 
 		}
 
-		if ( attrs.TANGENT !== undefined ) b.attr( prim, 'primvars:tangents', 'float4[]', doc.getFloats( attrs.TANGENT ).array, { interpolation: 'vertex' } );
+		if ( attrs.TANGENT !== undefined ) b.attr( prim, 'primvars:tangents', 'float4[]', pick( doc.getFloats( attrs.TANGENT ).array, 4 ), { interpolation: 'vertex' } );
 
-		this.writeColors( prim, attrs, null, 'vertex' );
+		this.writeColors( prim, attrs, order, 'vertex' );
 		if ( attrs.COLOR_0 !== undefined ) gltfData( prim ).color0 = true;
 
 		const material = primitive.material !== undefined ? this.json.materials[ primitive.material ] : null;
 		if ( material?.doubleSided ) b.attr( prim, 'doubleSided', 'bool', true, { uniform: true } );
-		this.bindMaterial( prim, primitive.material );
 
-		if ( joints ) this.writeSkinWeights( prim, attrs, joints );
+		if ( group.length === 1 ) {
+
+			this.bindMaterial( prim, primitive.material );
+
+		} else {
+
+			b.attr( prim, 'subsetFamily:materialBind:familyType', 'token', 'partition', { uniform: true } );
+			let face = 0;
+
+			parts.forEach( ( t, k ) => {
+
+				const subset = b.def( prim, `primitive_${ k }`, 'GeomSubset' );
+				b.attr( subset, 'elementType', 'token', 'face', { uniform: true } );
+				b.attr( subset, 'familyName', 'token', 'materialBind', { uniform: true } );
+				b.attr( subset, 'indices', 'int[]', Int32Array.from( { length: t.length / 3 }, ( _, i ) => face + i ) );
+				face += t.length / 3;
+				this.bindMaterial( subset, group[ k ].material );
+
+			} );
+
+		}
+
+		if ( joints ) this.writeSkinWeights( prim, attrs, joints, order );
 
 		void nodeIndex;
 		return prim;
@@ -865,10 +924,11 @@ export class GLTFToUSD {
 
 	// --- skins and morph targets ---
 
-	writeSkinWeights( prim, attrs, joints ) {
+	writeSkinWeights( prim, attrs, joints, order = null ) {
 
+		const pick = ( array ) => order ? gather( array, 4, order ) : array;
 		const sets = [];
-		for ( let s = 0; attrs[ 'JOINTS_' + s ] !== undefined; s ++ ) sets.push( [ this.doc.getAccessor( attrs[ 'JOINTS_' + s ], { normalize: false } ).array, this.doc.getFloats( attrs[ 'WEIGHTS_' + s ] ).array ] );
+		for ( let s = 0; attrs[ 'JOINTS_' + s ] !== undefined; s ++ ) sets.push( [ pick( this.doc.getAccessor( attrs[ 'JOINTS_' + s ], { normalize: false } ).array ), pick( this.doc.getFloats( attrs[ 'WEIGHTS_' + s ] ).array ) ] );
 		if ( ! sets.length ) return;
 
 		const n = sets[ 0 ][ 0 ].length / 4;
@@ -907,14 +967,16 @@ export class GLTFToUSD {
 		const b = this.b;
 		const targets = [];
 		const shapeNames = [];
+		const order = this.vertexOrders.get( meshPrim );
+		const pick = ( array ) => order ? gather( array, 3, order ) : array;
 
 		primitive.targets.forEach( ( target, i ) => {
 
 			const name = sanitize( names?.[ i ], `target_${ i }` );
 			const shape = b.def( meshPrim, name, 'BlendShape' );
-			const count = this.doc.json.accessors[ primitive.attributes.POSITION ].count;
-			b.attr( shape, 'offsets', 'vector3f[]', target.POSITION !== undefined ? this.doc.getFloats( target.POSITION ).array : new Float32Array( count * 3 ), { uniform: true } );
-			if ( target.NORMAL !== undefined ) b.attr( shape, 'normalOffsets', 'vector3f[]', this.doc.getFloats( target.NORMAL ).array, { uniform: true } );
+			const count = order ? order.length : this.doc.json.accessors[ primitive.attributes.POSITION ].count;
+			b.attr( shape, 'offsets', 'vector3f[]', target.POSITION !== undefined ? pick( this.doc.getFloats( target.POSITION ).array ) : new Float32Array( count * 3 ), { uniform: true } );
+			if ( target.NORMAL !== undefined ) b.attr( shape, 'normalOffsets', 'vector3f[]', pick( this.doc.getFloats( target.NORMAL ).array ), { uniform: true } );
 			targets.push( b.path( shape ) );
 			shapeNames.push( shape.name );
 
@@ -1648,7 +1710,7 @@ export class GLTFToUSD {
 			const variant = new PrimSpec( name, 'over', '' );
 			set.set( name, variant );
 
-			for ( const [ key, prim ] of this.meshPrims ) {
+			for ( const [ key, prim ] of this.bindingPrims ) {
 
 				const [ nodeIndex, p ] = key.split( '/' ).map( Number );
 				const primitive = this.json.meshes[ this.json.nodes[ nodeIndex ].mesh ].primitives[ p ];
@@ -1771,6 +1833,64 @@ export function sampleTrack( track, time ) {
 
 }
 
+// Triangle indices of a TRIANGLES, TRIANGLE_STRIP or TRIANGLE_FAN primitive.
+function triangleList( indices, mode ) {
+
+	let tris = indices;
+
+	if ( mode === MODES.TRIANGLE_STRIP ) {
+
+		const out = [];
+		for ( let i = 0; i + 2 < indices.length; i ++ ) {
+
+			if ( i % 2 === 0 ) out.push( indices[ i ], indices[ i + 1 ], indices[ i + 2 ] );
+			else out.push( indices[ i + 1 ], indices[ i ], indices[ i + 2 ] );
+
+		}
+
+		tris = Uint32Array.from( out );
+
+	} else if ( mode === MODES.TRIANGLE_FAN ) {
+
+		const out = [];
+		for ( let i = 1; i + 1 < indices.length; i ++ ) out.push( indices[ 0 ], indices[ i ], indices[ i + 1 ] );
+		tris = Uint32Array.from( out );
+
+	}
+
+	return tris.subarray( 0, tris.length - ( tris.length % 3 ) );
+
+}
+
+// The referenced vertices in ascending order, or null when every vertex is used.
+function vertexOrder( indices, count ) {
+
+	const used = new Uint8Array( count );
+	let n = 0;
+	for ( let i = 0; i < indices.length; i ++ ) if ( indices[ i ] < count && ! used[ indices[ i ] ] ) { used[ indices[ i ] ] = 1; n ++; }
+	if ( n === count ) return null;
+	const order = new Uint32Array( n );
+	for ( let v = 0, k = 0; v < count; v ++ ) if ( used[ v ] ) order[ k ++ ] = v;
+	return order;
+
+}
+
+function remapIndices( indices, order, count ) {
+
+	const map = new Uint32Array( count );
+	order.forEach( ( v, k ) => { map[ v ] = k; } );
+	return Uint32Array.from( indices, ( v ) => map[ v ] );
+
+}
+
+function gather( array, size, order ) {
+
+	const out = new array.constructor( order.length * size );
+	for ( let k = 0; k < order.length; k ++ ) for ( let c = 0; c < size; c ++ ) out[ k * size + c ] = array[ order[ k ] * size + c ];
+	return out;
+
+}
+
 function extent( positions ) {
 
 	const min = [ Infinity, Infinity, Infinity ], max = [ - Infinity, - Infinity, - Infinity ];

package/src/convert/usd-material.js

@@ -9,6 +9,7 @@
 import { decodeImageAsync, encodePNG, encodePNGAsync, imageMimeType, isGreyscaleImage } from '../image/index.js';
 import { multiply } from '../util/math.js';
 import { resolveAssetPath } from '../usd/stage.js';
+import { Budget, rethrowFatal } from '../limits.js';
 
 const WRAP = { repeat: 10497, mirror: 33648, clamp: 33071, black: 33071 };
 const CHANNEL = { r: 0, g: 1, b: 2, a: 3, x: 0, y: 1, z: 2, w: 3 };
@@ -68,9 +69,10 @@ function binary( a, b, op ) {
 
 export class MaterialConverter {
 
-	constructor( stage, builder, { log = () => {}, imageDecoder = null } = {} ) {
+	constructor( stage, builder, { log = () => {}, imageDecoder = null, budget = new Budget() } = {} ) {
 
 		this.stage = stage;
+		this.budget = budget;
 		this.builder = builder;
 		this.log = log;
 		this.imageDecoder = imageDecoder;
@@ -467,6 +469,7 @@ export class MaterialConverter {
 
 		} catch ( e ) {
 
+			rethrowFatal( e, this.budget );
 			this.log( `texture ${ file }: ${ e.message }` );
 
 		}
@@ -498,10 +501,11 @@ export class MaterialConverter {
 
 				try {
 
-					return await decodeImageAsync( await this.stage.readAsset( file ), undefined, this.imageDecoder );
+					return await decodeImageAsync( await this.stage.readAsset( file ), undefined, this.imageDecoder, this.budget );
 
 				} catch ( e ) {
 
+					rethrowFatal( e, this.budget );
 					this.log( `decode ${ file }: ${ e.message }` );
 					return null;
 
@@ -680,6 +684,7 @@ export class MaterialConverter {
 	 */
 	async convert( material, { doubleSided = false, vertexColors = false, variant = '' } = {} ) {
 
+		this.budget.check();
 		const key = material.path + ( doubleSided ? '|ds' : '' ) + ( variant ? '|' + variant : '' );
 		if ( this.materials.has( key ) ) return this.materials.get( key );
 

package/src/convert/usd-to-gltf.js

@@ -6,6 +6,7 @@ import { getXformOps, evaluateOps, xformSampleTimes } from '../usd/xform.js';
 import { MaterialConverter, gltfTextureTransform } from './usd-material.js';
 import { triangulateMesh, normalizeNormals } from './usd-mesh.js';
 import { generateShape } from './usd-shapes.js';
+import { Budget } from '../limits.js';
 import { compose, decompose, identity, invert, isIdentity, multiply, normalMatrix, transformDirection, transformPoint } from '../util/math.js';
 
 const SKIP_TYPES = new Set( [ 'Material', 'Shader', 'NodeGraph', 'GeomSubset', 'SkelAnimation', 'BlendShape', 'RenderSettings', 'RenderProduct', 'RenderVar', 'GeometryLight', 'DomeLight', 'Backdrop' ] );
@@ -14,14 +15,15 @@ const SHAPE_TYPES = new Set( [ 'Cube', 'Sphere', 'Cylinder', 'Cone', 'Capsule',
 
 export class USDToGLTF {
 
-	constructor( stage, { log = () => {}, materialVariants = true, debug = false, imageDecoder = null } = {} ) {
+	constructor( stage, { log = () => {}, materialVariants = true, debug = false, imageDecoder = null, budget = new Budget() } = {} ) {
 
 		this.stage = stage;
+		this.budget = budget;
 		this.log = log;
 		this.debug = debug; // records usd paths and time mapping in extras, for verification
 		this.materialVariants = materialVariants;
-		this.builder = new GLTFBuilder();
-		this.materials = new MaterialConverter( stage, this.builder, { log, imageDecoder } );
+		this.builder = new GLTFBuilder( 'usd-gltf', budget );
+		this.materials = new MaterialConverter( stage, this.builder, { log, imageDecoder, budget } );
 		this.json = this.builder.json;
 		this.meshCache = new Map();
 		this.primNodes = new Map(); // prim path -> node index (first instance)
@@ -101,6 +103,7 @@ export class USDToGLTF {
 
 	async convertPrim( prim, parentPrim ) {
 
+		this.budget.check();
 		if ( ! this.isRenderable( prim ) ) return null;
 
 		const node = { name: prim.name };
@@ -199,6 +202,7 @@ export class USDToGLTF {
 
 	async convertMesh( prim, nodeIndex ) {
 
+		this.budget.check();
 		const node = this.json.nodes[ nodeIndex ];
 		const skel = this.skinningFor( prim );
 
@@ -289,7 +293,7 @@ export class USDToGLTF {
 
 			const indices = data.vertexCount < 65536 ? Uint16Array.from( group.indices ) : Uint32Array.from( group.indices );
 			const primitive = { attributes: { ...attributes }, indices: this.builder.addAccessor( indices, 'SCALAR', { target: 34963 } ) };
-			const material = ( group.subset && this.boundMaterial( group.subset ) ) || this.defaultMaterial( prim ) || this.boundMaterial( prim );
+			const material = ( group.subset && ( this.defaultMaterial( group.subset ) || this.boundMaterial( group.subset ) ) ) || this.defaultMaterial( prim ) || this.boundMaterial( prim );
 
 			if ( material ) primitive.material = await this.materials.convert( material, { doubleSided, vertexColors } );
 			else primitive.material = this.materials.defaultMaterial( data.constantColor, data.constantOpacity, vertexColors, doubleSided );