fix: glTF parser error and test case

galacean · Aug 31, 2023 · 0fcb02a · 0fcb02a
1 parent 8adb519
commit 0fcb02a
Show file tree

Hide file tree

Showing 3 changed files with 275 additions and 261 deletions.
diff --git a/packages/loader/src/gltf/parser/GLTFEntityParser.ts b/packages/loader/src/gltf/parser/GLTFEntityParser.ts
@@ -8,7 +8,7 @@ export class GLTFEntityParser extends GLTFParser {
   parse(context: GLTFParserContext, index: number): Entity {
     const entityInfo = context.glTF.nodes[index];
     const engine = context.glTFResource.engine;
-    const { matrix, translation, rotation, scale } = entityInfo;
+    const { matrix, translation, rotation, scale, extensions } = entityInfo;
     const entity = new Entity(engine, entityInfo.name || `_GLTF_ENTITY_${index}`);
 
     const { transform } = entity;
@@ -37,6 +37,8 @@ export class GLTFEntityParser extends GLTFParser {
       }
     }
 
+    GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, entity, entityInfo);
+
     return entity;
   }
 }
diff --git a/packages/loader/src/gltf/parser/GLTFSceneParser.ts b/packages/loader/src/gltf/parser/GLTFSceneParser.ts
@@ -79,7 +79,7 @@ export class GLTFSceneParser extends GLTFParser {
   private _parseEntityComponent(context: GLTFParserContext, index: number): Promise<void[]> {
     const { glTF, glTFResource } = context;
     const entityInfo = glTF.nodes[index];
-    const { camera: cameraID, mesh: meshID, extensions } = entityInfo;
+    const { camera: cameraID, mesh: meshID } = entityInfo;
     const entity = context.get<Entity>(GLTFParserType.Entity, index);
     let promise: Promise<void[]>;
 
@@ -101,8 +101,6 @@ export class GLTFSceneParser extends GLTFParser {
         }
       }
 
-      GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, entity, entityInfo);
-
       return Promise.all(promises);
     });
   }