Fix finding PBR materials (#575)

Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
gazebosim · Jul 23, 2021 · 892d71e · 892d71e
1 parent 5d224b8
commit 892d71e
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/rendering/SceneManager.cc b/src/rendering/SceneManager.cc
@@ -482,7 +482,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string roughnessMap = metal->RoughnessMap();
  if (!roughnessMap.empty())
  {
- std::string fullPath = common::findFile(roughnessMap);
+ std::string fullPath = common::findFile(
+ asFullPath(roughnessMap, _material.FilePath()));
  if (!fullPath.empty())
  material->SetRoughnessMap(fullPath);
  else
@@ -493,7 +494,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string metalnessMap = metal->MetalnessMap();
  if (!metalnessMap.empty())
  {
- std::string fullPath = common::findFile(metalnessMap);
+ std::string fullPath = common::findFile(
+ asFullPath(metalnessMap, _material.FilePath()));
  if (!fullPath.empty())
  material->SetMetalnessMap(fullPath);
  else
@@ -511,7 +513,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string albedoMap = workflow->AlbedoMap();
  if (!albedoMap.empty())
  {
- std::string fullPath = common::findFile(albedoMap);
+ std::string fullPath = common::findFile(
+ asFullPath(albedoMap, _material.FilePath()));
  if (!fullPath.empty())
  {
  material->SetTexture(fullPath);
@@ -524,7 +527,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string normalMap = workflow->NormalMap();
  if (!normalMap.empty())
  {
- std::string fullPath = common::findFile(normalMap);
+ std::string fullPath = common::findFile(
+ asFullPath(normalMap, _material.FilePath()));
  if (!fullPath.empty())
  material->SetNormalMap(fullPath);
  else
@@ -536,7 +540,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string environmentMap = workflow->EnvironmentMap();
  if (!environmentMap.empty())
  {
- std::string fullPath = common::findFile(environmentMap);
+ std::string fullPath = common::findFile(
+ asFullPath(environmentMap, _material.FilePath()));
  if (!fullPath.empty())
  material->SetEnvironmentMap(fullPath);
  else
@@ -547,7 +552,8 @@ rendering::MaterialPtr SceneManager::LoadMaterial(
  std::string emissiveMap = workflow->EmissiveMap();
  if (!emissiveMap.empty())
  {
- std::string fullPath = common::findFile(emissiveMap);
+ std::string fullPath = common::findFile(
+ asFullPath(emissiveMap, _material.FilePath()));
  if (!fullPath.empty())
  material->SetEmissiveMap(fullPath);
  else