@kite3d/engine 0.15.3 → 0.17.0

package/dist/version.js

@@ -1,4 +1,4 @@
-const n = "0.15.3", e = {
+const n = "0.17.0", e = {
   version: n
 }, o = e.version;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kite3d/engine",
-  "version": "0.15.3",
+  "version": "0.17.0",
   "description": "The open Kite3D game runtime, project format, scripting helpers, and game plugins.",
   "type": "module",
   "license": "Apache-2.0",

package/src/runtime/createGame.ts

@@ -29,8 +29,8 @@ import {
 } from '../authoringValidation.ts'
 import {RuntimeNestedAssetLoader} from './nestedAssets.ts'
 import {
-    assetUrlPrefix,
     AssetsJSONManifest,
+    createProjectAssetURLModifier,
     ExternalPlugin,
     isDependencyModuleSpecifier,
     parseAssetsJSONManifest,
@@ -142,7 +142,7 @@ async function createProjectGame({
 
         // Three's LoadingManager delegates through this importer hook. It covers
         // glTF buffers/textures and nested imports without patching global fetch.
-        const urlModifier = createURLModifier(baseUrl, assetsManifest)
+        const urlModifier = createProjectAssetURLModifier(baseUrl, assetsManifest)
         viewer.assetManager.importer.addURLModifier(urlModifier)
         removeURLModifier = () => viewer?.assetManager.importer.removeURLModifier(urlModifier)
 
@@ -246,22 +246,6 @@ async function registerProjectScripts(
     await registerScripts(viewer, modules)
 }
 
-function createURLModifier(base: URL, assets: AssetsJSONManifest) {
-    const assetIdPrefix = `${assetUrlPrefix}@`
-    return (url: string): string => {
-        if (url.startsWith(assetIdPrefix)) {
-            const id = url.slice(assetIdPrefix.length).split('/', 1)[0]
-            const asset = assets.files[id]
-            if (!asset?.path) throw new Error(`Unknown asset id in URL: ${id}`)
-            return new URL(asset.path, base).href
-        }
-        if (url.startsWith(assetUrlPrefix)) {
-            return new URL(url.slice(assetUrlPrefix.length), base).href
-        }
-        return url
-    }
-}
-
 function resolvePluginSpecifier(
     definition: ExternalPlugin,
     packageJson: ProjectPackageJSON,

package/src/runtime/projectFormat.ts

@@ -17,10 +17,35 @@ export interface ProjectGeneratorState {
 export interface AssetsJSONManifest {
     files: Record<string, {
         path: string
+        files?: Record<string, string>
     }>
     version: number
 }
 
+export function createProjectAssetURLModifier(base: URL, assets: AssetsJSONManifest) {
+    const assetIdPrefix = `${assetUrlPrefix}@`
+    return (url: string): string => {
+        if (url.startsWith(assetIdPrefix)) {
+            const request = new URL(url, 'https://kite3d.invalid')
+            const relative = decodeURIComponent(request.pathname.slice(assetIdPrefix.length))
+            const slash = relative.indexOf('/')
+            const id = slash < 0 ? relative : relative.slice(0, slash)
+            const assetPath = slash < 0 ? '' : relative.slice(slash + 1)
+            const asset = assets.files[id]
+            if (!asset?.path) throw new Error(`Unknown asset id in URL: ${id}`)
+            const registered = asset.files?.[assetPath]
+            if (registered) return new URL(registered, base).href
+            if (asset.files) throw new Error(`Unknown file for asset ${id}: ${assetPath}`)
+            if (/^f\.[^/]+$/i.test(assetPath)) return new URL(asset.path, base).href
+            return new URL(assetPath, new URL(asset.path, base)).href
+        }
+        if (url.startsWith(assetUrlPrefix)) {
+            return new URL(url.slice(assetUrlPrefix.length), base).href
+        }
+        return url
+    }
+}
+
 export interface ProjectDependency {
     key: string
     version: string