Skip to content

[glTF] Support materials without pbrMetallicRoughness #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
footballhead wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[glTF] Support materials without pbrMetallicRoughness #612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/ppx/scene/scene_gltf_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,17 +458,11 @@ GltfMaterialSelector::~GltfMaterialSelector()

std::string GltfMaterialSelector::DetermineMaterial(const cgltf_material* pGltfMaterial) const
{
std::string ident = PPX_MATERIAL_IDENT_ERROR;

// Determine material type
if (pGltfMaterial->unlit) {
ident = PPX_MATERIAL_IDENT_UNLIT;
}
else if (pGltfMaterial->has_pbr_metallic_roughness) {
ident = PPX_MATERIAL_IDENT_STANDARD;
return PPX_MATERIAL_IDENT_UNLIT;
}

return ident;
return PPX_MATERIAL_IDENT_STANDARD;
}

// -------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1156,6 +1150,16 @@ ppx::Result GltfLoader::LoadPbrMetallicRoughnessMaterialInternal(
PPX_ASSERT_NULL_ARG(pGltfMaterial);
PPX_ASSERT_NULL_ARG(pTargetMaterial);

pTargetMaterial->SetEmissiveFactor(*(reinterpret_cast<const float3*>(pGltfMaterial->emissive_factor)));

// pbrMetallicRoughness is not required. 5.19 says "When undefined, all the default values of pbrMetallicRoughness MUST apply"
if (!pGltfMaterial->has_pbr_metallic_roughness) {
pTargetMaterial->SetBaseColorFactor(glm::float4(1.F, 1.F, 1.F, 1.F));
pTargetMaterial->SetMetallicFactor(1.F);
pTargetMaterial->SetRoughnessFactor(1.F);
return ppx::SUCCESS;
}

// pbrMetallicRoughness textures
if (!IsNull(pGltfMaterial->pbr_metallic_roughness.base_color_texture.texture)) {
auto ppxres = LoadTextureViewInternal(
Expand Down Expand Up @@ -1212,7 +1216,6 @@ ppx::Result GltfLoader::LoadPbrMetallicRoughnessMaterialInternal(
pTargetMaterial->SetBaseColorFactor(*(reinterpret_cast<const float4*>(pGltfMaterial->pbr_metallic_roughness.base_color_factor)));
pTargetMaterial->SetMetallicFactor(pGltfMaterial->pbr_metallic_roughness.metallic_factor);
pTargetMaterial->SetRoughnessFactor(pGltfMaterial->pbr_metallic_roughness.roughness_factor);
pTargetMaterial->SetEmissiveFactor(*(reinterpret_cast<const float3*>(pGltfMaterial->emissive_factor)));

if (pGltfMaterial->has_emissive_strength) {
pTargetMaterial->SetEmissiveStrength(pGltfMaterial->emissive_strength.emissive_strength);
Expand Down
Loading