Skip to content

Commit

Permalink
ci: compile error (#429)
Browse files Browse the repository at this point in the history
Co-authored-by: shensi.zxd <[email protected]>
  • Loading branch information
zhuxudong and shensi.zxd authored Aug 10, 2021
1 parent 6bd4e4d commit ab0e34a
Showing 1 changed file with 13 additions and 18 deletions.
31 changes: 13 additions & 18 deletions packages/loader/src/gltf/parser/MaterialParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@ export class MaterialParser extends Parser {
material.name = name;

if (pbrMetallicRoughness) {
const {
baseColorFactor,
baseColorTexture,
metallicFactor,
roughnessFactor,
metallicRoughnessTexture
} = pbrMetallicRoughness;
const { baseColorFactor, baseColorTexture, metallicFactor, roughnessFactor, metallicRoughnessTexture } =
pbrMetallicRoughness;

if (baseColorFactor) {
material.baseColor = new Color(...baseColorFactor);
Expand All @@ -71,43 +66,43 @@ export class MaterialParser extends Parser {
}

if (!KHR_materials_unlit && !KHR_materials_pbrSpecularGlossiness) {
material = material as PBRMaterial;
material.metallic = metallicFactor ?? 1;
material.roughness = roughnessFactor ?? 1;
const m = material as PBRMaterial;
m.metallic = metallicFactor ?? 1;
m.roughness = roughnessFactor ?? 1;
if (metallicRoughnessTexture) {
material.roughnessMetallicTexture = textures[metallicRoughnessTexture.index];
m.roughnessMetallicTexture = textures[metallicRoughnessTexture.index];
MaterialParser._parseTextureTransform(material, metallicRoughnessTexture.extensions, context);
}
}
}

if (!KHR_materials_unlit) {
material = material as PBRMaterial | PBRSpecularMaterial;
const m = material as PBRMaterial | PBRSpecularMaterial;

if (emissiveTexture) {
material.emissiveTexture = textures[emissiveTexture.index];
m.emissiveTexture = textures[emissiveTexture.index];
MaterialParser._parseTextureTransform(material, emissiveTexture.extensions, context);
}

if (emissiveFactor) {
material.emissiveColor = new Color(...emissiveFactor);
m.emissiveColor = new Color(...emissiveFactor);
}

if (normalTexture) {
const { index, scale } = normalTexture;
material.normalTexture = textures[index];
m.normalTexture = textures[index];
MaterialParser._parseTextureTransform(material, normalTexture.extensions, context);
if (scale !== undefined) {
material.normalTextureIntensity = scale;
m.normalTextureIntensity = scale;
}
}

if (occlusionTexture) {
const { index, strength } = occlusionTexture;
material.occlusionTexture = textures[index];
m.occlusionTexture = textures[index];
MaterialParser._parseTextureTransform(material, occlusionTexture.extensions, context);
if (strength !== undefined) {
material.occlusionTextureIntensity = strength;
m.occlusionTextureIntensity = strength;
}
}
}
Expand Down

0 comments on commit ab0e34a

Please sign in to comment.