Integrating latest 47acbe8

Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp

@@ -11,9 +11,11 @@
 */
 
 #include <SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h>
+#include <AzCore/IO/FileIO.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/StringFunc/StringFunc.h>
 #include <AzToolsFramework/Debug/TraceContext.h>
 #include <SceneAPI/FbxSceneBuilder/Importers/FbxImporterUtilities.h>
 #include <SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h>
@@ -54,6 +56,8 @@ namespace AZ
                 }
 
                 Events::ProcessingResultCombiner combinedMaterialImportResults;
+
+                AZStd::unordered_map<int, AZStd::shared_ptr<SceneData::GraphData::MaterialData>> materialMap;
                 for (int idx = 0; idx < context.m_sourceNode.m_assImpNode->mNumMeshes; ++idx)
                 {
                     int meshIndex = context.m_sourceNode.m_assImpNode->mMeshes[idx];
@@ -62,8 +66,6 @@ namespace AZ
                     int materialIndex = assImpMesh->mMaterialIndex;
                     AZ_TraceContext("Material Index", materialIndex);
 
-                    AZStd::unordered_map<int, AZStd::shared_ptr<SceneData::GraphData::MaterialData>> materialMap;
-
                     auto matFound = materialMap.find(materialIndex);
 
                     AZStd::shared_ptr<SceneData::GraphData::MaterialData> material;
@@ -82,19 +84,58 @@ namespace AZ
 
                         material->SetMaterialName(assImpMaterial->GetName());
                         material->SetTexture(DataTypes::IMaterialData::TextureMapType::Diffuse,
-                            assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Diffuse).c_str());
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Diffuse)).c_str());
                         material->SetTexture(DataTypes::IMaterialData::TextureMapType::Specular,
-                            assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Specular).c_str());
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Specular)).c_str());
                         material->SetTexture(DataTypes::IMaterialData::TextureMapType::Bump,
-                            assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Bump).c_str());
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Bump)).c_str());
                         material->SetTexture(DataTypes::IMaterialData::TextureMapType::Normal,
-                            assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Normal).c_str());
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Normal)).c_str());
                         material->SetUniqueId(assImpMaterial->GetUniqueId());
                         material->SetDiffuseColor(assImpMaterial->GetDiffuseColor());
                         material->SetSpecularColor(assImpMaterial->GetSpecularColor());
                         material->SetEmissiveColor(assImpMaterial->GetEmissiveColor());
                         material->SetShininess(assImpMaterial->GetShininess());
 
+                        material->SetUseColorMap(assImpMaterial->GetUseColorMap());
+                        material->SetBaseColor(assImpMaterial->GetBaseColor());
+
+                        material->SetUseMetallicMap(assImpMaterial->GetUseMetallicMap());
+                        material->SetMetallicFactor(assImpMaterial->GetMetallicFactor());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Metallic,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Metallic).c_str()));
+
+                        material->SetUseRoughnessMap(assImpMaterial->GetUseRoughnessMap());
+                        material->SetRoughnessFactor(assImpMaterial->GetRoughnessFactor());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Roughness,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Roughness).c_str()));
+
+                        material->SetUseEmissiveMap(assImpMaterial->GetUseEmissiveMap());
+                        material->SetEmissiveIntensity(assImpMaterial->GetEmissiveIntensity());
+
+                        material->SetUseAOMap(assImpMaterial->GetUseAOMap());
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::AmbientOcclusion,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::AmbientOcclusion).c_str()));
+
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::Emissive,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::Emissive).c_str()));
+
+                        material->SetTexture(
+                            DataTypes::IMaterialData::TextureMapType::BaseColor,
+                            ResolveTexturePath(context.m_sourceScene.GetSceneFileName(),
+                                assImpMaterial->GetTextureFileName(SDKMaterial::MaterialWrapper::MaterialMapType::BaseColor).c_str()));
 
                         AZ_Assert(material, "Failed to allocate scene material data.");
                         if (!material)
@@ -135,6 +176,39 @@ namespace AZ
 
                 return combinedMaterialImportResults.GetResult();
             }
+
+            AZStd::string AssImpMaterialImporter::ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const
+            {
+                if (textureFilePath.empty())
+                {
+                    return textureFilePath;
+                }
+
+
+                AZStd::string texturePathRelativeToScene;
+                AZStd::string cleanedUpSceneFilePath(sceneFilePath);
+                AZ::StringFunc::Path::StripFullName(cleanedUpSceneFilePath);
+                AZ::StringFunc::Path::Join(cleanedUpSceneFilePath.c_str(), textureFilePath.c_str(), texturePathRelativeToScene);
+
+                // If the texture did start with marker to change directories upward, then it's relative to the FBX file,
+                // and that path needs to be resolved. It can't be resolved later. This was handled internally by FBX SDK,
+                // but is not handled by AssImp.
+                if (textureFilePath.starts_with(".."))
+                {
+                    // Not checking for the file existing because it may not be there yet.
+                    return texturePathRelativeToScene;
+                }
+
+                // The engine only supports relative paths to scan folders.
+                // FBX files may have paths to textures, relative to the FBX file. Check for those, first.
+                if (AZ::IO::FileIOBase::GetInstance()->Exists(texturePathRelativeToScene.c_str()))
+                {
+                    return texturePathRelativeToScene;
+                }
+
+
+                return textureFilePath;
+            }
         } // namespace FbxSceneBuilder
     } // namespace SceneAPI
 } // namespace AZ