Skip to content
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

Merge gz-common5 ➡️ main #541

Merged
merged 3 commits into from
Oct 9, 2023
+23 −11
Merged

Merge gz-common5 ➡️ main #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7838ced
Prevent loading lightmaps if mesh is a glb file that has an occlusion…
iche033 Oct 5, 2023
d9d1722
EnumIface: suppress deprecation warning (#540)
scpeters Oct 8, 2023
8c1213e
Merge branch 'gz-common5' into scpeters/merge_5_main
scpeters Oct 8, 2023
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
24 changes: 15 additions & 9 deletions graphics/src/AssimpLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,21 @@ MaterialPtr AssimpLoader::Implementation::CreateMaterial(
this->GenerateTextureName(_scene, assimpMat, "Roughness"));
pbr.SetRoughnessMap(texName, texData);
}
// Load lightmap only if it is not a glb/glTF mesh that contains a
// MetallicRoughness texture
// It was found that lightmap field just stores the entire MetallicRoughness
// texture. Issues were also reported in assimp:
// https://github.com/assimp/assimp/issues/3120
// https://github.com/assimp/assimp/issues/4637
unsigned int uvIdx = 0;
ret = assimpMat->GetTexture(
aiTextureType_LIGHTMAP, 0, &texturePath, NULL, &uvIdx);
if (ret == AI_SUCCESS)
{
auto [texName, texData] = this->LoadTexture(_scene, texturePath,
this->GenerateTextureName(_scene, assimpMat, "Lightmap"));
pbr.SetLightMap(texName, uvIdx, texData);
}
}
#endif
ret = assimpMat->GetTexture(aiTextureType_NORMALS, 0, &texturePath);
Expand All @@ -442,15 +457,6 @@ MaterialPtr AssimpLoader::Implementation::CreateMaterial(
this->GenerateTextureName(_scene, assimpMat, "Emissive"));
pbr.SetEmissiveMap(texName, texData);
}
unsigned int uvIdx = 0;
ret = assimpMat->GetTexture(
aiTextureType_LIGHTMAP, 0, &texturePath, NULL, &uvIdx);
if (ret == AI_SUCCESS)
{
auto [texName, texData] = this->LoadTexture(_scene, texturePath,
this->GenerateTextureName(_scene, assimpMat, "Lightmap"));
pbr.SetLightMap(texName, uvIdx, texData);
}
#ifndef GZ_ASSIMP_PRE_5_2_0
float value;
ret = assimpMat->Get(AI_MATKEY_METALLIC_FACTOR, value);
Expand Down
10 changes: 8 additions & 2 deletions graphics/src/AssimpLoader_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,16 @@ TEST_F(AssimpLoader, LoadGlbPbrAsset)
// Check pixel values to test metallicroughness texture splitting
EXPECT_FLOAT_EQ(pbr->MetalnessMapData()->Pixel(256, 256).R(), 0.0);
EXPECT_FLOAT_EQ(pbr->RoughnessMapData()->Pixel(256, 256).R(), 124.0 / 255.0);

// Bug in assimp 5.0.x that doesn't parse coordinate sets properly
EXPECT_EQ(pbr->LightMapTexCoordSet(), 1);
// \todo(iche033) Lightmaps are disabled for glb meshes
// due to upstream bug
// EXPECT_EQ(pbr->LightMapTexCoordSet(), 1);
#endif
EXPECT_NE(pbr->LightMapData(), nullptr);

// \todo(iche033) Lightmaps are disabled for glb meshes
// due to upstream bug
// EXPECT_NE(pbr->LightMapData(), nullptr);

// Mesh has 3 animations
auto skel = mesh->MeshSkeleton();
Expand Down
Loading