fix(loaderFunctions): onUrl on loadGltf

Orillusion · Mar 12, 2024 · 65bda50 · 65bda50
1 parent b4d1460
commit 65bda50
Showing 1 changed file with 30 additions and 2 deletions.
diff --git a/src/assets/Res.ts b/src/assets/Res.ts
@@ -179,13 +179,15 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let parser;
         let ext = url.substring(url.lastIndexOf('.')).toLowerCase();
         let loader = new FileLoader();
         if (ext == '.gltf') {
             parser = await loader.load(url, GLTFParser, loaderFunctions);
-
         } else {
             parser = await loader.load(url, GLBParser, loaderFunctions);
         }
@@ -206,6 +208,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let parser;
         let ext = url.substring(url.lastIndexOf('.')).toLowerCase();
@@ -229,6 +234,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let loader = new FileLoader();
         let parser = await loader.load(url, B3DMParser, loaderFunctions, userData);
         let obj = parser.data;
@@ -246,6 +254,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let loader = new FileLoader();
         let parser = await loader.load(url, I3DMParser, loaderFunctions, userData);
         let obj = parser.data;
@@ -264,6 +275,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let texture = new BitmapTexture2D();
         texture.flipY = flipY;
         await texture.load(url, loaderFunctions);
@@ -314,7 +328,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
-
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let hdrTexture = new HDRTexture();
         hdrTexture = await hdrTexture.load(url, loaderFunctions);
         this._texturePool.set(url, hdrTexture);
@@ -332,6 +348,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let hdrTexture = new HDRTextureCube();
         hdrTexture = await hdrTexture.load(url, loaderFunctions);
         this._texturePool.set(url, hdrTexture);
@@ -348,6 +367,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let ldrTextureCube = new LDRTextureCube();
         ldrTextureCube = await ldrTextureCube.load(url, loaderFunctions);
         this._texturePool.set(url, ldrTextureCube);
@@ -381,6 +403,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let cubeMap = new BitmapTextureCube();
         await cubeMap.loadStd(url);
@@ -392,6 +417,9 @@ export class Res {
      * @param url the path of image
      */
     public async loadJSON(url: string, loaderFunctions?: LoaderFunctions) {
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         return await new FileLoader()
             .loadJson(url, loaderFunctions)
             .then(async (ret) => {