@onerjs/loaders 8.55.9 → 8.56.1

package/glTF/2.0/glTFLoader.pure.js

@@ -1857,10 +1857,10 @@ export class GLTFLoader {
     /**
      * @internal
      */
-    async _loadMaterialAsync(context, material, babylonMesh, babylonDrawMode, assign = () => { }) {
+    _loadMaterialAsync(context, material, babylonMesh, babylonDrawMode, assign = () => { }) {
         const extensionPromise = this._extensionsLoadMaterialAsync(context, material, babylonMesh, babylonDrawMode, assign);
         if (extensionPromise) {
-            return await extensionPromise;
+            return extensionPromise;
         }
         material._data = material._data || {};
         let babylonData = material._data[babylonDrawMode];
@@ -1887,8 +1887,9 @@ export class GLTFLoader {
             });
         }
         assign(babylonData.babylonMaterial);
-        await babylonData.promise;
-        return babylonData.babylonMaterial;
+        return babylonData.promise.then(() => {
+            return babylonData.babylonMaterial;
+        });
     }
     /**
      * Selects the appropriate PBR material implementation for a given glTF material.
@@ -2219,7 +2220,7 @@ export class GLTFLoader {
         if (extensionPromise) {
             return extensionPromise;
         }
-        if (!GLTFLoader._ValidateUri(uri)) {
+        if (!this._parent._isPreprocessUrlAsyncSet && !GLTFLoader._ValidateUri(uri)) {
             throw new Error(`${context}: '${uri}' is invalid`);
         }
         if (IsBase64DataUrl(uri)) {
@@ -2228,7 +2229,7 @@ export class GLTFLoader {
             return Promise.resolve(data);
         }
         this.log(`${context}: Loading ${uri}`);
-        return this._parent.preprocessUrlAsync(this._rootUrl + uri).then((url) => {
+        return this._parent.preprocessUrlAsync(this._rootUrl + uri, this._rootUrl ?? undefined).then((url) => {
             return new Promise((resolve, reject) => {
                 this._parent._loadFile(this._babylonScene, url, (data) => {
                     if (!this._disposed) {