enhance: process GLTFBufferParser and GLTFTextureParser pipelines…

… in parallel.
galacean · Jul 4, 2023 · ce566c6 · ce566c6
1 parent 1d15f56
commit ce566c6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/packages/loader/src/gltf/parser/GLTFBufferParser.ts b/packages/loader/src/gltf/parser/GLTFBufferParser.ts
@@ -31,7 +31,7 @@ export class GLTFBufferParser extends GLTFParser {
       }).then((glTF: IGLTF) => {
         context.glTF = glTF;
 
-        return Promise.all(
+        const buffersPromise = Promise.all(
           glTF.buffers.map((buffer: IBuffer) => {
             const absoluteUrl = Utils.resolveAbsoluteUrl(url, buffer.uri);
             restoreBufferRequests.push(new BufferRequestInfo(absoluteUrl, requestConfig));
@@ -40,6 +40,12 @@ export class GLTFBufferParser extends GLTFParser {
         ).then((buffers: ArrayBuffer[]) => {
           context.buffers = buffers;
         });
+        // If the textures are all urls, process `GLTFBufferParser` and `GLTFTextureParser` pipelines in parallel.
+        if (glTF.textures && glTF.textures.every((texture) => glTF.images[texture.source])) {
+          context.buffersPromise = buffersPromise;
+        } else {
+          return buffersPromise;
+        }
       });
     }
   }

diff --git a/packages/loader/src/gltf/parser/GLTFParserContext.ts b/packages/loader/src/gltf/parser/GLTFParserContext.ts
@@ -18,6 +18,7 @@ import type { IGLTF } from "../GLTFSchema";
 export class GLTFParserContext {
   glTF: IGLTF;
   buffers: ArrayBuffer[];
+  buffersPromise?: Promise<void>;
   glTFResource: GLTFResource;
   keepMeshData: boolean;
   hasSkinned: boolean = false;

diff --git a/packages/loader/src/gltf/parser/GLTFTextureParser.ts b/packages/loader/src/gltf/parser/GLTFTextureParser.ts
@@ -13,7 +13,7 @@ export class GLTFTextureParser extends GLTFParser {
   };
 
   parse(context: GLTFParserContext): AssetPromise<Texture2D[]> {
-    const { glTFResource, glTF, buffers } = context;
+    const { glTFResource, glTF, buffers, buffersPromise } = context;
     const { engine, url } = glTFResource;
 
     if (glTF.textures) {
@@ -66,7 +66,14 @@ export class GLTFTextureParser extends GLTFParser {
           texturesPromiseInfo.resolve(textures);
         })
         .catch(texturesPromiseInfo.reject);
-      return texturesPromiseInfo.promise;
+
+      if (buffersPromise) {
+        return (<AssetPromise<void>>buffersPromise).then(() => {
+          return texturesPromiseInfo.promise;
+        });
+      } else {
+        return texturesPromiseInfo.promise;
+      }
     }
   }