@openusd-wasm/three-loader 0.0.1 → 0.0.2

package/dist/openusd_three_loader.d.ts

@@ -233,6 +233,18 @@ declare class USDManipulationControls {
   private restoreHighlight;
 }
 //#endregion
+//#region src/asset-resolver.d.ts
+declare function autoResolveAssetFiles(rootData: Uint8Array, options: USDLoaderParseOptions): Promise<Record<string, Uint8Array>>;
+declare function autoResolveTextureFiles(metadata: USDModelData, existingFiles: Record<string, Uint8Array>, options: USDLoaderParseOptions): Promise<Record<string, Uint8Array>>;
+declare function createTextureResolverFromEntries(entries: Map<string, Uint8Array>): {
+  resolve: USDTextureResolver;
+  urls: Map<string, string>;
+} | null;
+declare function createPackageTextureResolver(data: Uint8Array): {
+  resolve: USDTextureResolver;
+  urls: Map<string, string>;
+} | null;
+//#endregion
 //#region src/metadata.d.ts
 declare function extractUSDModelData(pxr: Pxr, stage: PxrObject, options?: ExtractUSDModelDataOptions): USDModelData;
 //#endregion
@@ -240,4 +252,4 @@ declare function extractUSDModelData(pxr: Pxr, stage: PxrObject, options?: Extra
 declare function buildUSDObject(data: USDModelData, options?: BuildUSDObjectOptions): THREE.Group;
 declare function createUSDLoadedModel(data: USDModelData, pxr: USDLoadedModel['pxr'], rootLayerIdentifier: string, options?: BuildUSDObjectOptions, stage?: unknown): USDLoadedModel;
 //#endregion
-export { type BuildUSDObjectOptions, type ExtractUSDModelDataOptions, type PxrObject, type USDAnimationInfo, type USDAssetValue, type USDFileExtension, type USDJointDriveInfo, type USDJointInfo, type USDLoadedModel, USDLoader, type USDLoaderOptions, type USDLoaderParseOptions, type USDManipulationChangeEvent, USDManipulationControls, type USDManipulationControlsOptions, type USDManipulationHoverEvent, type USDMaterialInfo, type USDMeshElement, type USDMeshGeometryData, type USDModelData, type USDShaderInfo, type USDSourceInput, type USDStageInfo, type USDTextureResolver, type USDTextureResolverContext, type USDTransformAnimation, type USDTransformAnimationSample, type USDVector2, type USDVector3, type USDVector4, type USDViewPrim, buildUSDObject, createUSDLoadedModel, extractUSDModelData };
+export { type BuildUSDObjectOptions, type ExtractUSDModelDataOptions, type PxrObject, type USDAnimationInfo, type USDAssetValue, type USDFileExtension, type USDJointDriveInfo, type USDJointInfo, type USDLoadedModel, USDLoader, type USDLoaderOptions, type USDLoaderParseOptions, type USDManipulationChangeEvent, USDManipulationControls, type USDManipulationControlsOptions, type USDManipulationHoverEvent, type USDMaterialInfo, type USDMeshElement, type USDMeshGeometryData, type USDModelData, type USDShaderInfo, type USDSourceInput, type USDStageInfo, type USDTextureResolver, type USDTextureResolverContext, type USDTransformAnimation, type USDTransformAnimationSample, type USDVector2, type USDVector3, type USDVector4, type USDViewPrim, autoResolveAssetFiles, autoResolveTextureFiles, buildUSDObject, createPackageTextureResolver, createTextureResolverFromEntries, createUSDLoadedModel, extractUSDModelData };

package/dist/openusd_three_loader.js

@@ -13,7 +13,8 @@ const DEFAULT_ASSET_SEARCH_EXTENSIONS = [
 	".webp",
 	".ktx2",
 	".exr",
-	".hdr"
+	".hdr",
+	".mdl"
 ];
 const DEFAULT_ASSET_SEARCH_ROOTS = [
 	"resource",
@@ -30,6 +31,20 @@ const DEFAULT_ASSET_SEARCH_ROOTS = [
 ];
 const DEFAULT_MAX_ASSET_REFERENCES = 80;
 const DEFAULT_MAX_ASSET_REFERENCE_DEPTH = 4;
+const DEFAULT_PACKAGE_REMAP_ALIAS_COUNT = 16;
+const USD_LAYER_EXTENSIONS = new Set([
+	".usd",
+	".usda",
+	".usdc",
+	".usdz"
+]);
+const TEXTURE_DIRECTORY_NAMES = new Set([
+	"img",
+	"image",
+	"images",
+	"texture",
+	"textures"
+]);
 function toFetchableUrl(value) {
 	try {
 		const url = new URL(value, globalThis.location?.href);
@@ -91,8 +106,8 @@ function trimAssetReference(value) {
 	if (/^[A-Za-z]:[\\/]/.test(ref)) return null;
 	if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(ref)) return null;
 	if (ref.startsWith("/")) return null;
-	if (ref.includes("\0") || /\s/.test(ref)) return null;
-	if (!/^[A-Za-z0-9._~!$&'()+,;=@/-]+$/.test(ref)) return null;
+	if (/[\0\r\n\t\f\v]/.test(ref)) return null;
+	if (!/^[ A-Za-z0-9._~!$&'()+,;=@/-]+$/.test(ref)) return null;
 	return ref;
 }
 function isUsdCrate(data) {
@@ -192,6 +207,41 @@ function buildReferencePathVariants(relativePath) {
 		aliases: [normalized]
 	}];
 }
+function buildPackageRemapAliases(sourceRelativePath, assetPath) {
+	const extension = extensionOf(assetPath);
+	if (!extension || USD_LAYER_EXTENSIONS.has(extension)) return [];
+	const name = baseName(assetPath);
+	if (!name) return [];
+	const aliasDirs = new Set([dirname(sourceRelativePath)]);
+	const assetDir = dirname(assetPath);
+	const assetParentDir = dirname(assetDir);
+	const assetTextureDir = baseName(assetDir).toLowerCase();
+	if (TEXTURE_DIRECTORY_NAMES.has(assetTextureDir)) aliasDirs.add(assetParentDir);
+	return unique([...aliasDirs].flatMap((aliasDir) => Array.from({ length: DEFAULT_PACKAGE_REMAP_ALIAS_COUNT }, (_, index) => joinRelativePath(aliasDir, `${index}/${name}`))));
+}
+function addPackageRemapAliases(files, aliases, data, ownedAliases, aliasConflicts, existingFiles = {}) {
+	for (const alias of aliases) {
+		if (aliasConflicts.has(alias)) continue;
+		const existingInput = existingFiles[alias];
+		if (existingInput && existingInput !== data) {
+			aliasConflicts.add(alias);
+			continue;
+		}
+		const existing = files[alias];
+		if (existing && existing !== data) {
+			if (ownedAliases.has(alias)) {
+				delete files[alias];
+				ownedAliases.delete(alias);
+			}
+			aliasConflicts.add(alias);
+			continue;
+		}
+		if (!existing) {
+			files[alias] = data;
+			ownedAliases.add(alias);
+		}
+	}
+}
 function unique(values) {
 	return [...new Set(values)];
 }
@@ -246,7 +296,9 @@ function buildFetchAttempts(ref, sourceUrl, sourceRelativePath, searchExtensions
 				seen.add(url);
 				attempts.push({
 					url,
-					fsPaths: [...fsAliases]
+					fsPaths: [...fsAliases],
+					sourceRelativePath: pathWithExtension,
+					packageRemapAliases: buildPackageRemapAliases(sourceRelativePath, pathWithExtension)
 				});
 			} catch {}
 		}
@@ -273,6 +325,8 @@ async function autoResolveAssetFiles(rootData, options) {
 	const maxDepth = options.maxAssetReferenceDepth ?? DEFAULT_MAX_ASSET_REFERENCE_DEPTH;
 	const rootRelativePath = normalizeFsRelativePath(options.fileName ?? fileNameForSource$1(sourcePath));
 	const files = {};
+	const ownedPackageAliases = /* @__PURE__ */ new Set();
+	const packageAliasConflicts = /* @__PURE__ */ new Set();
 	const fetchedUrls = /* @__PURE__ */ new Set();
 	const queued = /* @__PURE__ */ new Set();
 	const rootRefs = discoverAssetReferences(rootData, searchExtensions, true);
@@ -294,9 +348,13 @@ async function autoResolveAssetFiles(rootData, options) {
 			fetchedUrls.add(attempt.url);
 			const data = await fetchBinary(attempt.url);
 			if (!data) continue;
-			for (const fsPath of attempt.fsPaths) files[fsPath] = data;
+			for (const fsPath of attempt.fsPaths) {
+				ownedPackageAliases.delete(fsPath);
+				files[fsPath] = data;
+			}
+			addPackageRemapAliases(files, attempt.packageRemapAliases, data, ownedPackageAliases, packageAliasConflicts);
 			if (item.depth < maxDepth) {
-				const sourceRelativePath = attempt.fsPaths.find((path) => extensionOf(path)) ?? attempt.fsPaths[0];
+				const sourceRelativePath = attempt.sourceRelativePath;
 				if (sourceRelativePath) for (const ref of discoverAssetReferences(data, searchExtensions, !isUsdCrate(data))) {
 					const queueKey = `${attempt.url}\n${ref}`;
 					if (queued.has(queueKey)) continue;
@@ -317,27 +375,22 @@ async function autoResolveAssetFiles(rootData, options) {
 	}
 	return files;
 }
-function isTextureAssetReference(value) {
+function isMetadataAssetReference(value, searchExtensions) {
 	if (/^(blob|data):/i.test(value)) return false;
 	if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(value)) return false;
 	if (value.startsWith("/")) return false;
-	return [
-		".png",
-		".jpg",
-		".jpeg",
-		".webp"
-	].includes(extensionOf(value));
+	return searchExtensions.includes(extensionOf(value));
 }
-function collectTextureAssetReferences(value, refs = /* @__PURE__ */ new Set()) {
+function collectMetadataAssetReferences(value, searchExtensions, refs = /* @__PURE__ */ new Set()) {
 	if (!value) return refs;
 	if (Array.isArray(value)) {
-		for (const item of value) collectTextureAssetReferences(item, refs);
+		for (const item of value) collectMetadataAssetReferences(item, searchExtensions, refs);
 		return refs;
 	}
 	if (typeof value !== "object") return refs;
 	const asset = value;
-	for (const item of [asset.path, asset.url]) if (typeof item === "string" && isTextureAssetReference(item)) refs.add(item);
-	for (const item of Object.values(value)) collectTextureAssetReferences(item, refs);
+	for (const item of [asset.path, asset.url]) if (typeof item === "string" && isMetadataAssetReference(item, searchExtensions)) refs.add(item);
+	for (const item of Object.values(value)) collectMetadataAssetReferences(item, searchExtensions, refs);
 	return refs;
 }
 async function autoResolveTextureFiles(metadata, existingFiles, options) {
@@ -347,13 +400,15 @@ async function autoResolveTextureFiles(metadata, existingFiles, options) {
 	if (!sourceUrl) return {};
 	const searchExtensions = options.assetSearchExtensions ?? DEFAULT_ASSET_SEARCH_EXTENSIONS;
 	const configuredSearchRoots = normalizeSearchRoots(options.assetSearchRoots);
-	const textureRefs = [...collectTextureAssetReferences(metadata)];
+	const textureRefs = [...collectMetadataAssetReferences(metadata, searchExtensions)];
 	const searchRoots = unique([...inferReferencedSearchRoots(Object.keys(existingFiles), configuredSearchRoots), ...inferReferencedSearchRoots(textureRefs, configuredSearchRoots)]);
 	const maxFiles = options.maxAssetReferences ?? DEFAULT_MAX_ASSET_REFERENCES;
 	const remainingFiles = Math.max(maxFiles - uniqueFileCount(existingFiles), 0);
 	if (remainingFiles === 0) return {};
 	const rootRelativePath = normalizeFsRelativePath(options.fileName ?? fileNameForSource$1(sourcePath));
 	const files = {};
+	const ownedPackageAliases = /* @__PURE__ */ new Set();
+	const packageAliasConflicts = /* @__PURE__ */ new Set();
 	const fetchedUrls = /* @__PURE__ */ new Set();
 	let resolvedFiles = 0;
 	for (const ref of textureRefs) {
@@ -364,7 +419,11 @@ async function autoResolveTextureFiles(metadata, existingFiles, options) {
 			fetchedUrls.add(attempt.url);
 			const data = await fetchBinary(attempt.url);
 			if (!data) continue;
-			for (const fsPath of attempt.fsPaths) files[fsPath] = data;
+			for (const fsPath of attempt.fsPaths) {
+				ownedPackageAliases.delete(fsPath);
+				files[fsPath] = data;
+			}
+			addPackageRemapAliases(files, attempt.packageRemapAliases, data, ownedPackageAliases, packageAliasConflicts, existingFiles);
 			resolvedFiles += 1;
 			break;
 		}
@@ -462,6 +521,7 @@ const MATERIAL_INPUT_SUFFIXES = [
 	"translation",
 	"rotation"
 ];
+const MATERIAL_ASSET_ATTRIBUTE_NAMES = new Set(["info:mdl:sourceAsset"]);
 const JOINT_TYPES = {
 	PhysicsFixedJoint: "fixed",
 	PhysicsRevoluteJoint: "revolute",
@@ -1034,8 +1094,7 @@ function collectShaderInputs(prim, time) {
 	try {
 		for (const attribute of attributes) {
 			const name = String(attribute.GetName());
-			if (!name.includes("inputs:")) continue;
-			if (!MATERIAL_INPUT_SUFFIXES.some((suffix) => name.endsWith(suffix))) continue;
+			if (!(name.includes("inputs:") && MATERIAL_INPUT_SUFFIXES.some((suffix) => name.endsWith(suffix))) && !MATERIAL_ASSET_ATTRIBUTE_NAMES.has(name)) continue;
 			const value = attribute.Get(time);
 			const connections = attribute.GetConnections();
 			if (value !== null && value !== void 0) inputs[name] = normalizeValue(value);
@@ -2145,4 +2204,4 @@ var USDManipulationControls = class {
 	}
 };
 //#endregion
-export { USDLoader, USDManipulationControls, buildUSDObject, createUSDLoadedModel, extractUSDModelData };
+export { USDLoader, USDManipulationControls, autoResolveAssetFiles, autoResolveTextureFiles, buildUSDObject, createPackageTextureResolver, createTextureResolverFromEntries, createUSDLoadedModel, extractUSDModelData };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openusd-wasm/three-loader",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Three.js loader for OpenUSD assets backed by @openusd-wasm/pxr.",
   "license": "MIT",
   "homepage": "https://github.com/openusd-wasm/openusd-pxr-wasm",
@@ -35,7 +35,7 @@
     "tsdown": "^0.22.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.5",
-    "@openusd-wasm/pxr": "0.0.1"
+    "@openusd-wasm/pxr": "0.0.2"
   },
   "publishConfig": {
     "access": "public"