Fix primitive e2e error (#2007)

* fix: primitive e2e error
galacean · Feb 22, 2024 · 220f9a7 · 220f9a7
1 parent dc0c20a
commit 220f9a7
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 45 deletions.
diff --git a/e2e/case/primitive-capsule.ts b/e2e/case/primitive-capsule.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-capsule";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-cone.ts b/e2e/case/primitive-cone.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-cone";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-cuboid.ts b/e2e/case/primitive-cuboid.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-cuboid";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-cylinder.ts b/e2e/case/primitive-cylinder.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-cylinder";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-plane.ts b/e2e/case/primitive-plane.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-plane";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-sphere.ts b/e2e/case/primitive-sphere.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-sphere";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/case/primitive-torus.ts b/e2e/case/primitive-torus.ts
@@ -54,8 +54,6 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       meshRenderer.setMaterial(material);
 
       updateForE2E(engine);
-      const category = "Primitive";
-      const name = "primitive-torus";
-      initScreenshot(category, name, engine, camera);
+      initScreenshot(engine, camera);
     });
 });
diff --git a/e2e/config.ts b/e2e/config.ts
@@ -96,5 +96,42 @@ export const E2E_CONFIG = {
       caseFileName: "shadow-basic",
       threshold: 0.2
     }
+  },
+  Primitive: {
+    capsule: {
+      category: "Primitive",
+      caseFileName: "primitive-capsule",
+      threshold: 0.1
+    },
+    cone: {
+      category: "Primitive",
+      caseFileName: "primitive-cone",
+      threshold: 0.1
+    },
+    cuboid: {
+      category: "Primitive",
+      caseFileName: "primitive-cuboid",
+      threshold: 0.1
+    },
+    cylinder: {
+      category: "Primitive",
+      caseFileName: "primitive-cylinder",
+      threshold: 0.1
+    },
+    plane: {
+      category: "Primitive",
+      caseFileName: "primitive-plane",
+      threshold: 0.1
+    },
+    sphere: {
+      category: "Primitive",
+      caseFileName: "primitive-sphere",
+      threshold: 0.1
+    },
+    torus: {
+      category: "Primitive",
+      caseFileName: "primitive-torus",
+      threshold: 0.1
+    }
   }
 };
diff --git a/e2e/tests/primitive.cy.ts b/e2e/tests/primitive.cy.ts
diff --git a/packages/loader/src/gltf/parser/GLTFSchemaParser.ts b/packages/loader/src/gltf/parser/GLTFSchemaParser.ts
@@ -13,7 +13,8 @@ export class GLTFSchemaParser extends GLTFParser {
     const url = glTFResource.url;
     const restoreBufferRequests = contentRestorer.bufferRequests;
     const requestConfig = <RequestConfig>{ type: "arraybuffer" };
-    return request<ArrayBuffer>(url, requestConfig).onProgress(undefined, context._onTaskDetail)
+    return request<ArrayBuffer>(url, requestConfig)
+      .onProgress(undefined, context._onTaskDetail)
       .then((buffer) => {
         restoreBufferRequests.push(new BufferRequestInfo(url, requestConfig));
         return GLTFUtils.parseGLB(context, buffer);