Fixed model loading issue due to recent fbx product name change. (#639)

Signed-off-by: VickyAtAZ <[email protected]>

Gem/Code/Source/AreaLightExampleComponent.h

@@ -80,7 +80,7 @@ namespace AtomSampleViewer
         struct Configuration
         {
             LightType m_lightType = Point;
-            AZStd::string m_modelAssetPath = "objects/test/area_light_test_sphere.azmodel";
+            AZStd::string m_modelAssetPath = "objects/test/area_light_test_sphere.fbx.azmodel";
             uint32_t m_count = 1;
 
             float m_intensity = 30.0f;

Gem/Code/Source/AssetLoadTestComponent.cpp

@@ -66,9 +66,9 @@ namespace AtomSampleViewer
 
         const AZStd::vector<AZStd::string> defaultModelAllowist =
         {
-            "Objects/bunny.azmodel",
-            "Objects/Shaderball_simple.azmodel",
-            "Objects/suzanne.azmodel",
+            "Objects/bunny.fbx.azmodel",
+            "Objects/Shaderball_simple.fbx.azmodel",
+            "Objects/suzanne.fbx.azmodel",
         };
         m_modelBrowser.SetDefaultPinnedAssets(defaultModelAllowist);
     }
@@ -226,7 +226,7 @@ namespace AtomSampleViewer
         }
         else
         {
-            return AZ::RPI::AssetUtils::GetAssetIdForProductPath("testdata/objects/cube/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
+            return AZ::RPI::AssetUtils::GetAssetIdForProductPath("testdata/objects/cube/cube.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
         }
     }
 

Gem/Code/Source/BakedShaderVariantExampleComponent.cpp

@@ -38,7 +38,7 @@ namespace AtomSampleViewer
     {
         namespace Products
         {
-            static constexpr const char ModelFilePath[] = "objects/plane.azmodel";
+            static constexpr const char ModelFilePath[] = "objects/plane.fbx.azmodel";
         } // namespace Products
     } // namespace
 

Gem/Code/Source/CheckerboardExampleComponent.cpp

@@ -44,7 +44,7 @@ namespace AtomSampleViewer
     void CheckerboardExampleComponent::Activate()
     {
         AZ::RPI::AssetUtils::TraceLevel traceLevel = AZ::RPI::AssetUtils::TraceLevel::Assert;
-        auto meshAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/shaderball_simple.azmodel", traceLevel);
+        auto meshAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/shaderball_simple.fbx.azmodel", traceLevel);
         auto materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>(DefaultPbrMaterialPath, traceLevel);
         auto materialInstance = AZ::RPI::Material::FindOrCreate(materialAsset);
 

Gem/Code/Source/CullingAndLodExampleComponent.cpp

@@ -169,8 +169,8 @@ namespace AtomSampleViewer
 
         ClearMeshes();
 
-        const char objectModelFilename[] = "Objects/sphere_5lods.azmodel";
-        const char planeModelFilename[] = "Objects/plane.azmodel";
+        const char objectModelFilename[] = "Objects/sphere_5lods.fbx.azmodel";
+        const char planeModelFilename[] = "Objects/plane.fbx.azmodel";
         Data::Asset<RPI::ModelAsset> objectModelAsset = RPI::AssetUtils::LoadAssetByProductPath<RPI::ModelAsset>(
             objectModelFilename, RPI::AssetUtils::TraceLevel::Assert);
         Data::Asset<RPI::ModelAsset> planeModelAsset = RPI::AssetUtils::LoadAssetByProductPath<RPI::ModelAsset>(

Gem/Code/Source/DecalExampleComponent.cpp

@@ -29,7 +29,7 @@ namespace AtomSampleViewer
 {
     namespace
     {
-        static constexpr const char* TargetMeshName = "objects/plane.azmodel";
+        static constexpr const char* TargetMeshName = "objects/plane.fbx.azmodel";
         static constexpr const char* TargetMaterialName = "materials/defaultpbr.azmaterial";
     }
 
@@ -54,7 +54,7 @@ namespace AtomSampleViewer
 
         // List of all assets this example needs.
         AZStd::vector<AZ::AssetCollectionAsyncLoader::AssetToLoadInfo> assetList = {
-            {"objects/plane.azmodel", azrtti_typeid<AZ::RPI::ModelAsset>()}, // The model
+            { TargetMeshName, azrtti_typeid<AZ::RPI::ModelAsset>() }, // The model
         };
 
         ScriptRunnerRequestBus::Broadcast(&ScriptRunnerRequests::PauseScript);

Gem/Code/Source/DepthOfFieldExampleComponent.cpp

@@ -44,7 +44,7 @@ namespace AtomSampleViewer
         m_directionalLightFeatureProcessor = m_scene->GetFeatureProcessor<Render::DirectionalLightFeatureProcessorInterface>();
 
         // Create the assets
-        m_bunnyModelAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>("objects/bunny.azmodel", RPI::AssetUtils::TraceLevel::Assert);
+        m_bunnyModelAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>("objects/bunny.fbx.azmodel", RPI::AssetUtils::TraceLevel::Assert);
         m_materialAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::MaterialAsset>(DefaultPbrMaterialPath, RPI::AssetUtils::TraceLevel::Assert);
 
         CreateMeshes();

Gem/Code/Source/DiffuseGIExampleComponent.cpp

@@ -157,11 +157,11 @@ namespace AtomSampleViewer
     {
         // load plane and cube models
         // all geometry in the CornellBox is created from planes and boxes
-        static constexpr const char PlaneModelPath[] = "objects/plane.azmodel";
+        static constexpr const char PlaneModelPath[] = "objects/plane.fbx.azmodel";
         AZ::Data::AssetId planeAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(PlaneModelPath, AZ::RPI::AssetUtils::TraceLevel::Error);
         m_planeModelAsset.Create(planeAssetId);
 
-        static constexpr const char CubeModelPath[] = "objects/cube.azmodel";
+        static constexpr const char CubeModelPath[] = "objects/cube.fbx.azmodel";
         AZ::Data::AssetId cubeAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(CubeModelPath, AZ::RPI::AssetUtils::TraceLevel::Error);
         m_cubeModelAsset.Create(cubeAssetId);
 
@@ -187,7 +187,7 @@ namespace AtomSampleViewer
         m_whiteMaterialAsset.Create(whiteMaterialAssetId);
 
         // Sponza models
-        static constexpr const char InteriorModelPath[] = "objects/sponza.azmodel";
+        static constexpr const char InteriorModelPath[] = "objects/sponza.fbx.azmodel";
         AZ::Data::AssetId interiorAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(InteriorModelPath, AZ::RPI::AssetUtils::TraceLevel::Error);
         m_sponzaModelAsset.Create(interiorAssetId);
 

Gem/Code/Source/DynamicMaterialTestComponent.cpp

@@ -71,7 +71,7 @@ namespace AtomSampleViewer
     
     void DynamicMaterialTestComponent::PrepareCreateLatticeInstances(uint32_t instanceCount)
     {
-        const char* modelPath = "objects/shaderball_simple.azmodel";
+        const char* modelPath = "objects/shaderball_simple.fbx.azmodel";
 
         Data::AssetId modelAssetId;
         Data::AssetCatalogRequestBus::BroadcastResult(

Gem/Code/Source/ExposureExampleComponent.cpp

@@ -112,7 +112,7 @@ namespace AtomSampleViewer
     {
         using namespace AZ;
 
-        const char* sponzaPath = "objects/sponza.azmodel";
+        const char* sponzaPath = "objects/sponza.fbx.azmodel";
         Data::Asset<RPI::ModelAsset> modelAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>(sponzaPath, RPI::AssetUtils::TraceLevel::Assert);
         Data::Asset<RPI::MaterialAsset> materialAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::MaterialAsset>(DefaultPbrMaterialPath, RPI::AssetUtils::TraceLevel::Assert);
         m_meshHandle = GetMeshFeatureProcessor()->AcquireMesh(Render::MeshHandleDescriptor{ modelAsset }, AZ::RPI::Material::FindOrCreate(materialAsset));

Gem/Code/Source/EyeMaterialExampleComponent.cpp

@@ -19,7 +19,7 @@
 
 namespace AtomSampleViewer
 {
-    static const char* MeshPath = "objects/eye.azmodel";
+    static const char* MeshPath = "objects/eye.fbx.azmodel";
     static const char* MaterialPath = "materials/eye/001_EyeBasic.azmaterial";
     static const float DefaultCameraHeading = 40.0f;
     static const float DefaultCameraDistance = 2.0f;

Gem/Code/Source/LightCullingExampleComponent.cpp

@@ -44,9 +44,9 @@ namespace AtomSampleViewer
     using namespace AZ::Render;
     using namespace AZ::RPI;
 
-    static const char* WorldModelName = "Objects/Sponza.azmodel";
+    static const char* WorldModelName = "Objects/Sponza.fbx.azmodel";
 
-    static const char* TransparentModelName = "Objects/ShaderBall_simple.azmodel";
+    static const char* TransparentModelName = "Objects/ShaderBall_simple.fbx.azmodel";
     static const char* TransparentMaterialName = "materials/DefaultPBRTransparent.azmaterial";
 
     static const char* DecalMaterialPath = "materials/Decal/airship_tail_01_decal.azmaterial";

Gem/Code/Source/MSAA_RPI_ExampleComponent.cpp

@@ -160,15 +160,15 @@ namespace AtomSampleViewer
         switch (m_modelType)
         {
         case 0:
-            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cylinder.azmodel", traceLevel);
+            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cylinder.fbx.azmodel", traceLevel);
         case 1:
-            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.azmodel", traceLevel);
+            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.fbx.azmodel", traceLevel);
         case 2:
-            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/shaderball_simple.azmodel", traceLevel);
+            return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/shaderball_simple.fbx.azmodel", traceLevel);
         }
 
         AZ_Warning("MSAA_RPI_ExampleComponent", false, "Unsupported model type");
-        return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cylinder.azmodel", traceLevel);
+        return AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cylinder.fbx.azmodel", traceLevel);
     }
 
     void MSAA_RPI_ExampleComponent::ActivateModel()

Gem/Code/Source/MeshExampleComponent.cpp

@@ -238,7 +238,7 @@ namespace AtomSampleViewer
 
         AZ::Data::Asset<AZ::RPI::MaterialAsset> groundPlaneMaterialAsset = AZ::RPI::AssetUtils::LoadAssetByProductPath<AZ::RPI::MaterialAsset>(DefaultPbrMaterialPath, AZ::RPI::AssetUtils::TraceLevel::Error);
         m_groundPlaneMaterial = AZ::RPI::Material::FindOrCreate(groundPlaneMaterialAsset);
-        m_groundPlaneModelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+        m_groundPlaneModelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
 
         AZ::TickBus::Handler::BusConnect();
         AZ::Render::Bootstrap::DefaultWindowNotificationBus::Handler::BusConnect();

Gem/Code/Source/ParallaxMappingExampleComponent.cpp

@@ -73,8 +73,8 @@ namespace AtomSampleViewer
     void ParallaxMappingExampleComponent::Activate()
     {
         // Asset
-        m_planeAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
-        m_boxAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+        m_planeAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+        m_boxAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_parallaxMaterialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("testdata/materials/parallaxrock.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_defaultMaterialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("materials/defaultpbr.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_parallaxMaterial = AZ::RPI::Material::Create(m_parallaxMaterialAsset);

Gem/Code/Source/Performance/HighInstanceExampleComponent.cpp

@@ -68,19 +68,19 @@ namespace AtomSampleViewer
 
         m_expandedModelList =
         {
-            "materialeditor/viewportmodels/cone.azmodel",
-            "materialeditor/viewportmodels/cube.azmodel",
-            "materialeditor/viewportmodels/cylinder.azmodel",
-            "materialeditor/viewportmodels/platonicsphere.azmodel",
-            "materialeditor/viewportmodels/polarsphere.azmodel",
-            "materialeditor/viewportmodels/quadsphere.azmodel",
-            "materialeditor/viewportmodels/torus.azmodel",
-            "objects/cube.azmodel",
-            "objects/cylinder.azmodel",
+            "materialeditor/viewportmodels/cone.fbx.azmodel",
+            "materialeditor/viewportmodels/cube.fbx.azmodel",
+            "materialeditor/viewportmodels/cylinder.fbx.azmodel",
+            "materialeditor/viewportmodels/platonicsphere.fbx.azmodel",
+            "materialeditor/viewportmodels/polarsphere.fbx.azmodel",
+            "materialeditor/viewportmodels/quadsphere.fbx.azmodel",
+            "materialeditor/viewportmodels/torus.fbx.azmodel",
+            "objects/cube.fbx.azmodel",
+            "objects/cylinder.fbx.azmodel",
         };
         m_simpleModelList =
         {
-            "objects/cube.azmodel"
+            "objects/cube.fbx.azmodel"
         };
         m_modelBrowser.SetDefaultPinnedAssets(m_simpleModelList);
     }
@@ -289,7 +289,7 @@ namespace AtomSampleViewer
         }
         else
         {
-            return AZ::RPI::AssetUtils::GetAssetIdForProductPath("testdata/objects/cube/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
+            return AZ::RPI::AssetUtils::GetAssetIdForProductPath("testdata/objects/cube/cube.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
         }
     }
 

Gem/Code/Source/Platform/Android/SSRExampleComponent_Traits_Platform.h

@@ -9,4 +9,4 @@
 // Mali devices have a memory limitation of vertex buffer (180MB), so low resolution mesh model is needed.
 // https://community.arm.com/developer/tools-software/graphics/b/blog/posts/memory-limits-with-vulkan-on-mali-gpus
 // [ATOM-14947]
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_low.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_low.fbx.azmodel"

Gem/Code/Source/Platform/Linux/SSRExampleComponent_Traits_Platform.h

@@ -6,4 +6,4 @@
  *
  */
 
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.fbx.azmodel"

Gem/Code/Source/Platform/Mac/SSRExampleComponent_Traits_Platform.h

@@ -6,4 +6,4 @@
  *
  */
 
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.fbx.azmodel"

Gem/Code/Source/Platform/Windows/SSRExampleComponent_Traits_Platform.h

@@ -6,4 +6,4 @@
  *
  */
 
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_high.fbx.azmodel"

Gem/Code/Source/Platform/iOS/SSRExampleComponent_Traits_Platform.h

@@ -6,4 +6,4 @@
  *
  */
 
-#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_low.azmodel"
+#define ATOMSAMPLEVIEWER_TRAIT_SSR_SAMPLE_HERMANUBIS_MODEL_NAME "objects/hermanubis/hermanubis_low.fbx.azmodel"

Gem/Code/Source/RHI/AsyncComputeExampleComponent.cpp

@@ -286,7 +286,7 @@ namespace AtomSampleViewer
     void AsyncComputeExampleComponent::LoadModel()
     {
         // Load the asset
-        auto modelAsset = m_assetLoadManager->GetAsset<AZ::RPI::ModelAsset>("objects/shaderball_simple.azmodel");
+        auto modelAsset = m_assetLoadManager->GetAsset<AZ::RPI::ModelAsset>("objects/shaderball_simple.fbx.azmodel");
         AZ_Assert(modelAsset.IsReady(), "The model asset is supposed to be ready.");
 
         m_model = AZ::RPI::Model::FindOrCreate(modelAsset);
@@ -534,7 +534,7 @@ namespace AtomSampleViewer
             {"Shaders/RHI/AsyncComputeLuminanceMap.azshader", azrtti_typeid<RPI::ShaderAsset>()},     // Vertex + Fragment
             {"Shaders/RHI/AsyncComputeLuminanceReduce.azshader", azrtti_typeid<RPI::ShaderAsset>()},  // Compute
             {"Shaders/RHI/AsyncComputeTonemapping.azshader", azrtti_typeid<RPI::ShaderAsset>()},    // Compute
-            {"objects/shaderball_simple.azmodel", azrtti_typeid<AZ::RPI::ModelAsset>()}, // The model
+            {"objects/shaderball_simple.fbx.azmodel", azrtti_typeid<AZ::RPI::ModelAsset>()}, // The model
         };
 
 

Gem/Code/Source/RHI/BindlessPrototypeExampleComponent.cpp

@@ -473,7 +473,7 @@ namespace AtomSampleViewer
 
         // Load the Model 
         {
-            const char* modelPath = "objects/shaderball_simple.azmodel";
+            const char* modelPath = "objects/shaderball_simple.fbx.azmodel";
 
             Data::AssetId modelAssetId;
             Data::AssetCatalogRequestBus::BroadcastResult(

Gem/Code/Source/RHI/SubpassExampleComponent.cpp

@@ -148,10 +148,10 @@ namespace AtomSampleViewer
     {
         const char* modelsPath[ModelType_Count] =
         {
-            "objects/plane.azmodel",
-            "objects/shaderball_simple.azmodel",
-            "objects/bunny.azmodel",
-            "objects/suzanne.azmodel",
+            "objects/plane.fbx.azmodel",
+            "objects/shaderball_simple.fbx.azmodel",
+            "objects/bunny.fbx.azmodel",
+            "objects/suzanne.fbx.azmodel",
         };
 
         for (uint32_t i = 0; i < AZ_ARRAY_SIZE(modelsPath); ++i)

Gem/Code/Source/RootConstantsExampleComponent.cpp

@@ -64,9 +64,9 @@ namespace AtomSampleViewer
         {
             const char* modelsPath[] =
             {
-                "objects/shaderball_simple.azmodel",
-                "objects/bunny.azmodel",
-                "testdata/objects/cube/cube.azmodel"
+                "objects/shaderball_simple.fbx.azmodel",
+                "objects/bunny.fbx.azmodel",
+                "testdata/objects/cube/cube.fbx.azmodel"
             };
 
             for (uint32_t i = 0; i < AZ_ARRAY_SIZE(modelsPath); ++i)

Gem/Code/Source/SSRExampleComponent.cpp

@@ -93,7 +93,7 @@ namespace AtomSampleViewer
         // cube
         {
             AZ::Data::Asset<AZ::RPI::MaterialAsset> materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("materials/ssrexample/cube.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
             AZ::Transform transform = AZ::Transform::CreateIdentity();
             transform.SetTranslation(-4.5f, 0.0f, 0.49f);
 
@@ -104,7 +104,7 @@ namespace AtomSampleViewer
         // shader ball
         {
             AZ::Data::Asset<AZ::RPI::MaterialAsset> materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("Materials/Presets/PBR/default_grid.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/ShaderBall_simple.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/ShaderBall_simple.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
             AZ::Transform transform = AZ::Transform::CreateIdentity();
             transform *= AZ::Transform::CreateRotationZ(AZ::Constants::Pi);
             transform.SetTranslation(4.5f, 0.0f, 0.89f);
@@ -144,7 +144,7 @@ namespace AtomSampleViewer
         m_groundMaterialAsset.Create(groundMaterialAssetId);
 
         // load mesh
-        AZ::Data::Asset<AZ::RPI::ModelAsset> planeModel = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
+        AZ::Data::Asset<AZ::RPI::ModelAsset> planeModel = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
         m_groundMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ planeModel }, AZ::RPI::Material::FindOrCreate(m_groundMaterialAsset));
 
         AZ::Transform transform = AZ::Transform::CreateIdentity();

Gem/Code/Source/SampleComponentConfig.h

@@ -17,9 +17,9 @@
 namespace AtomSampleViewer
 {
     static constexpr const char DefaultPbrMaterialPath[] = "materials/defaultpbr.azmaterial";    
-    static constexpr const char BunnyModelFilePath[] = "objects/bunny.azmodel";
-    static constexpr const char ShaderBallModelFilePath[] = "objects/shaderball_simple.azmodel";
-    static constexpr const char CubeModelFilePath[] = "testdata/objects/cube/cube.azmodel";
+    static constexpr const char BunnyModelFilePath[] = "objects/bunny.fbx.azmodel";
+    static constexpr const char ShaderBallModelFilePath[] = "objects/shaderball_simple.fbx.azmodel";
+    static constexpr const char CubeModelFilePath[] = "testdata/objects/cube/cube.fbx.azmodel";
 
     class SampleComponentConfig
         : public AZ::ComponentConfig

Gem/Code/Source/SceneReloadSoakTestComponent.cpp

@@ -76,7 +76,7 @@ namespace AtomSampleViewer
         m_meshHandles.reserve(instanceCount);
 
         const char* materialPath = DefaultPbrMaterialPath;
-        const char* modelPath = "objects/shaderball_simple.azmodel";
+        const char* modelPath = "objects/shaderball_simple.fbx.azmodel";
 
         Data::AssetCatalogRequestBus::BroadcastResult(
             m_materialAssetId, &Data::AssetCatalogRequestBus::Events::GetAssetIdByPath,

Gem/Code/Source/ShadowedSponzaExampleComponent.cpp

@@ -210,7 +210,7 @@ namespace AtomSampleViewer
     {
         using namespace AZ;
 
-        const char* modelPath = "objects/sponza.azmodel";
+        const char* modelPath = "objects/sponza.fbx.azmodel";
         Data::Asset<RPI::ModelAsset> modelAsset =
             RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>(modelPath, RPI::AssetUtils::TraceLevel::Assert);
         Data::Asset<RPI::MaterialAsset> materialAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::MaterialAsset>(DefaultPbrMaterialPath, RPI::AssetUtils::TraceLevel::Assert);

Gem/Code/Source/SkinnedMeshExampleComponent.cpp

@@ -52,7 +52,7 @@ namespace AtomSampleViewer
 
     void SkinnedMeshExampleComponent::CreatePlaneObject()
     {
-        auto meshAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel");
+        auto meshAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.fbx.azmodel");
         m_planeMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ meshAsset });
         GetMeshFeatureProcessor()->SetTransform(m_planeMeshHandle, AZ::Transform::CreateIdentity());
     }

Gem/Code/Source/SponzaBenchmarkComponent.cpp

@@ -106,7 +106,7 @@ namespace AtomSampleViewer
     {
         auto traceLevel = AZ::RPI::AssetUtils::TraceLevel::Assert;
         m_sponzaInteriorAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>
-            ("Objects/Sponza.azmodel", traceLevel);
+            ("Objects/Sponza.fbx.azmodel", traceLevel);
 
         m_sponzaInteriorMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ m_sponzaInteriorAsset });
 

Gem/Code/Source/SsaoExampleComponent.cpp

@@ -95,7 +95,7 @@ namespace AtomSampleViewer
 
     void SsaoExampleComponent::ActivateModel()
     {
-        const char* modelPath = "objects/sponza.azmodel";
+        const char* modelPath = "objects/sponza.fbx.azmodel";
 
         // Get Model and Material asset
         Data::Asset<RPI::ModelAsset> modelAsset = RPI::AssetUtils::GetAssetByProductPath<RPI::ModelAsset>(modelPath, RPI::AssetUtils::TraceLevel::Assert);

Gem/Code/Source/TransparencyExampleComponent.cpp

@@ -19,7 +19,7 @@ namespace AtomSampleViewer
 {
     static const int NumOfMeshes = 10;
     static const float MeshSpacing = 1.0f;
-    static const char* MeshPath = "objects/plane.azmodel";
+    static const char* MeshPath = "objects/plane.fbx.azmodel";
     static const char* MaterialPath = "materials/transparentdoubleside.azmaterial";
     static const char* ColorPropertyName = "baseColor.color";
     static const float DefaultCameraDistance = 2.0f;

Gem/Code/Source/XRRPIExampleComponent.cpp

@@ -100,7 +100,7 @@ namespace AtomSampleViewer
         // cube
         {
             AZ::Data::Asset<AZ::RPI::MaterialAsset> materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("materials/ssrexample/cube.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
             AZ::Transform transform = AZ::Transform::CreateIdentity();
             transform.SetTranslation(-4.5f, 0.0f, 0.49f);
 
@@ -111,7 +111,7 @@ namespace AtomSampleViewer
         // shader ball
         {
             AZ::Data::Asset<AZ::RPI::MaterialAsset> materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("Materials/Presets/PBR/default_grid.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/ShaderBall_simple.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/ShaderBall_simple.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
             AZ::Transform transform = AZ::Transform::CreateIdentity();
             transform *= AZ::Transform::CreateRotationZ(AZ::Constants::Pi);
             transform.SetTranslation(4.5f, 0.0f, 0.89f);
@@ -123,7 +123,7 @@ namespace AtomSampleViewer
         // controller meshes
         {
             AZ::Data::Asset<AZ::RPI::MaterialAsset> materialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("Materials/XR/XR_Hand_Controller_ControlerMAT.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
-            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/left_hand_controller.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+            AZ::Data::Asset<AZ::RPI::ModelAsset> modelAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/left_hand_controller.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
             AZ::Transform transform = AZ::Transform::CreateIdentity();
 
             m_leftControllerMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ modelAsset }, AZ::RPI::Material::FindOrCreate(materialAsset));
@@ -163,7 +163,7 @@ namespace AtomSampleViewer
         m_groundMaterialAsset.Create(groundMaterialAssetId);
 
         // load mesh
-        AZ::Data::Asset<AZ::RPI::ModelAsset> planeModel = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
+        AZ::Data::Asset<AZ::RPI::ModelAsset> planeModel = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.fbx.azmodel", AZ::RPI::AssetUtils::TraceLevel::Error);
         m_groundMeshHandle = GetMeshFeatureProcessor()->AcquireMesh(AZ::Render::MeshHandleDescriptor{ planeModel }, AZ::RPI::Material::FindOrCreate(m_groundMaterialAsset));
 
         AZ::Transform transform = AZ::Transform::CreateIdentity();

scripts/MaterialScreenshotTests.bv.lua

@@ -11,15 +11,15 @@
 
 RunScript("scripts/TestEnvironment.luac")
 
-g_shaderballModel = 'materialeditor/viewportmodels/shaderball.azmodel'
-g_cubeModel = 'materialeditor/viewportmodels/cube.azmodel'
-g_beveledCubeModel = 'materialeditor/viewportmodels/beveledcube.azmodel'
-g_modelWithoutLayerMask = 'objects/bunny.azmodel'
-g_modelWithLayerMask = 'testdata/objects/paintedplane.azmodel'
-g_modelHermanubis = 'materialeditor/viewportmodels/hermanubis.azmodel'
-g_modelTube = 'testdata/objects/tube.azmodel'
-g_modelGrass = 'objects/grass_tile_large.azmodel'
-g_reflectionProbe = 'models/reflectionprobesphere.azmodel'
+g_shaderballModel = 'materialeditor/viewportmodels/shaderball.fbx.azmodel'
+g_cubeModel = 'materialeditor/viewportmodels/cube.fbx.azmodel'
+g_beveledCubeModel = 'materialeditor/viewportmodels/beveledcube.fbx.azmodel'
+g_modelWithoutLayerMask = 'objects/bunny.fbx.azmodel'
+g_modelWithLayerMask = 'testdata/objects/paintedplane.fbx.azmodel'
+g_modelHermanubis = 'materialeditor/viewportmodels/hermanubis.fbx.azmodel'
+g_modelTube = 'testdata/objects/tube.fbx.azmodel'
+g_modelGrass = 'objects/grass_tile_large.fbx.azmodel'
+g_reflectionProbe = 'models/reflectionprobesphere.fbx.azmodel'
 
 function GenerateMaterialScreenshot(imageComparisonThresholdLevel, materialName, options)
     if options == nil then options = {} end

scripts/PassTree.bv.lua

@@ -32,7 +32,7 @@ ResizeViewport(800, 600)
 SelectImageComparisonToleranceLevel("Level G")
 
 -- choose model, material and lighting
-SetImguiValue('Models/##Available', 'objects/shaderball_simple.azmodel')
+SetImguiValue('Models/##Available', 'objects/shaderball_simple.fbx.azmodel')
 SetImguiValue('Enable Material Override', true)
 SetImguiValue('Materials/##Available', 'materials/defaultpbr.azmaterial')
 SetImguiValue('Lighting Preset##SampleBase/Thumbnail', true)

scripts/ReadbackTest.bv.lua

@@ -23,7 +23,7 @@ SetShowImGui(false)
 ResizeViewport(512, 512)
 SetImguiValue('Width', 512)
 SetImguiValue('Height', 512)
-IdleFrames(1)
+IdleFrames(3)
 SetImguiValue('Readback', true)
 IdleFrames(5)
 CaptureScreenshot(g_testCaseFolder .. '/screenshot_1.png')