fix: load gltf has no material (#408)

* fix: load gltf has no material
galacean · Jul 30, 2021 · 731a74d · 731a74d
1 parent 8585af9
commit 731a74d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/packages/loader/src/scene-loader/resources/GLTFResource.ts b/packages/loader/src/scene-loader/resources/GLTFResource.ts
@@ -48,33 +48,35 @@ export class GLTFResource extends SchemaResource {
             }
           }
         };
-        for (let i = 0; i < materials.length; i++) {
-          const material = materials[i];
-          let materialResource = null;
-          let type = "";
+        if (materials?.length) {
+          for (let i = 0; i < materials.length; i++) {
+            const material = materials[i];
+            let materialResource = null;
+            let type = "";
 
-          if (material instanceof PBRMaterial) {
-            materialResource = new PBRMaterialResource(this.resourceManager);
-            type = "PBRMaterial";
-          } else if (material instanceof UnlitMaterial) {
-            materialResource = new UnlitMaterialResource(this.resourceManager);
-            type = "UnlitMaterial";
-          } else if (material instanceof PBRSpecularMaterial) {
-            materialResource = new PBRSpecularMaterialResource(this.resourceManager);
-            type = "PBRSpecularMaterial";
-          } else {
-            materialResource = new BlinnPhongMaterialResource(this.resourceManager);
-            type = "BlinnPhongMaterial";
-          }
+            if (material instanceof PBRMaterial) {
+              materialResource = new PBRMaterialResource(this.resourceManager);
+              type = "PBRMaterial";
+            } else if (material instanceof UnlitMaterial) {
+              materialResource = new UnlitMaterialResource(this.resourceManager);
+              type = "UnlitMaterial";
+            } else if (material instanceof PBRSpecularMaterial) {
+              materialResource = new PBRSpecularMaterialResource(this.resourceManager);
+              type = "PBRSpecularMaterial";
+            } else {
+              materialResource = new BlinnPhongMaterialResource(this.resourceManager);
+              type = "BlinnPhongMaterial";
+            }
 
-          this._attachedResources.push(materialResource);
-          loadPromises.push(
-            materialResource.loadWithAttachedResources(resourceManager, {
-              type,
-              name: material.name,
-              resource: material
-            })
-          );
+            this._attachedResources.push(materialResource);
+            loadPromises.push(
+              materialResource.loadWithAttachedResources(resourceManager, {
+                type,
+                name: material.name,
+                resource: material
+              })
+            );
+          }
         }
         Promise.all(loadPromises).then((res) => {
           const newMaterial = result.structure.props.newMaterial;

diff --git a/packages/loader/src/scene-loader/resources/TextureResource.ts b/packages/loader/src/scene-loader/resources/TextureResource.ts
@@ -38,9 +38,6 @@ export class TextureResource extends SchemaResource {
   setMeta() {
     if (this.resource) {
       this._meta.name = this.resource.name;
-      if (this.resource.image) {
-        this._meta.url = this.resource.image.src;
-      }
     }
   }
 }