Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE

Barlev/gitflow 211028 O3DE

Code/Framework/AzFramework/AzFramework/Physics/Configuration/JointConfiguration.cpp

@@ -10,6 +10,7 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
 
 namespace AzPhysics
 {
@@ -28,6 +29,71 @@ namespace AzPhysics
                 ->Field("ChildLocalPosition", &JointConfiguration::m_childLocalPosition)
                 ->Field("StartSimulationEnabled", &JointConfiguration::m_startSimulationEnabled)
                 ;
+
+            if (auto* editContext = serializeContext->GetEditContext())
+            {
+                editContext->Class<JointConfiguration>("Joint Configuration", "Joint configuration.")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_parentLocalRotation,
+                        "Parent local rotation", "Parent joint frame relative to parent body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetParentLocalRotationVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_parentLocalPosition,
+                        "Parent local position", "Joint position relative to parent body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetParentLocalPositionVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_childLocalRotation,
+                        "Child local rotation", "Child joint frame relative to child body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetChildLocalRotationVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_childLocalPosition,
+                        "Child local position", "Joint position relative to child body.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetChildLocalPositionVisibility)
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &JointConfiguration::m_startSimulationEnabled,
+                        "Start simulation enabled", "When active, the joint will be enabled when the simulation begins.")
+                    ->Attribute(AZ::Edit::Attributes::Visibility, &JointConfiguration::GetStartSimulationEnabledVisibility)
+                    ;
+            }
         }
     }
-}
+
+    AZ::Crc32 JointConfiguration::GetPropertyVisibility(JointConfiguration::PropertyVisibility property) const
+    {
+        return (m_propertyVisibilityFlags & property) != 0 ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
+    }
+
+    void JointConfiguration::SetPropertyVisibility(JointConfiguration::PropertyVisibility property, bool isVisible)
+    {
+        if (isVisible)
+        {
+            m_propertyVisibilityFlags |= property;
+        }
+        else
+        {
+            m_propertyVisibilityFlags &= ~property;
+        }
+    }
+
+    AZ::Crc32 JointConfiguration::GetParentLocalRotationVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ParentLocalRotation);
+    }
+
+    AZ::Crc32 JointConfiguration::GetParentLocalPositionVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ParentLocalPosition);
+    }
+
+    AZ::Crc32 JointConfiguration::GetChildLocalRotationVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ChildLocalRotation);
+    }
+
+    AZ::Crc32 JointConfiguration::GetChildLocalPositionVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::ChildLocalPosition);
+    }
+
+    AZ::Crc32 JointConfiguration::GetStartSimulationEnabledVisibility() const
+    {
+        return GetPropertyVisibility(JointConfiguration::PropertyVisibility::StartSimulationEnabled);
+    }
+} // namespace AzPhysics

Code/Framework/AzFramework/AzFramework/Physics/Configuration/JointConfiguration.h

@@ -31,6 +31,25 @@ namespace AzPhysics
         JointConfiguration() = default;
         virtual ~JointConfiguration() = default;
 
+        // Visibility helpers for use in the Editor when reflected.
+        enum PropertyVisibility : AZ::u8
+        {
+            ParentLocalRotation = 1 << 0, //!< Whether the parent local rotation is visible.
+            ParentLocalPosition = 1 << 1, //!< Whether the parent local position is visible.
+            ChildLocalRotation = 1 << 2, //!< Whether the child local rotation is visible.
+            ChildLocalPosition = 1 << 3, //!< Whether the child local position is visible.
+            StartSimulationEnabled = 1 << 4 //!< Whether the start simulation enabled setting is visible.
+        };
+
+        AZ::Crc32 GetPropertyVisibility(PropertyVisibility property) const;
+        void SetPropertyVisibility(PropertyVisibility property, bool isVisible);
+
+        AZ::Crc32 GetParentLocalRotationVisibility() const;
+        AZ::Crc32 GetParentLocalPositionVisibility() const;
+        AZ::Crc32 GetChildLocalRotationVisibility() const;
+        AZ::Crc32 GetChildLocalPositionVisibility() const;
+        AZ::Crc32 GetStartSimulationEnabledVisibility() const;
+
         // Entity/object association.
         void* m_customUserData = nullptr;
 
@@ -40,8 +59,11 @@ namespace AzPhysics
         AZ::Quaternion m_childLocalRotation = AZ::Quaternion::CreateIdentity(); ///< Child joint frame relative to child body.
         AZ::Vector3 m_childLocalPosition = AZ::Vector3::CreateZero(); ///< Joint position relative to child body.
         bool m_startSimulationEnabled = true;
-        
+
         // For debugging/tracking purposes only.
         AZStd::string m_debugName;
+
+        // Default all visibility settings to invisible, since most joint configurations don't need to display these.
+        AZ::u8 m_propertyVisibilityFlags = 0;
     };
 }

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -1387,7 +1387,10 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
-                    GUI->SetBrowseButtonIcon(pixmap);
+                    if (!pixmap.isNull())
+                    {
+                        GUI->SetBrowseButtonIcon(pixmap);
+                    }
                 }
             }
         }
@@ -1417,6 +1420,8 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("ThumbnailIcon"))
         {
+            GUI->SetCustomThumbnailEnabled(false);
+
             AZStd::string iconPath;
             if (attrValue->Read<AZStd::string>(iconPath) && !iconPath.empty())
             {
@@ -1434,8 +1439,11 @@ namespace AzToolsFramework
                     QDataStream stream(&pixmapBytes, QIODevice::ReadOnly);
                     QPixmap pixmap;
                     stream >> pixmap;
-                    GUI->SetCustomThumbnailEnabled(true);
-                    GUI->SetCustomThumbnailPixmap(pixmap);
+                    if (!pixmap.isNull())
+                    {
+                        GUI->SetCustomThumbnailEnabled(true);
+                        GUI->SetCustomThumbnailPixmap(pixmap);
+                    }
                 }
             }
         }

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp

@@ -67,16 +67,9 @@ namespace AzToolsFramework
 
     void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName)
     {
-        if (m_customThumbnailEnabled)
-        {
-            ClearThumbnail();
-        }
-        else
-        {
-            m_key = key;
-            m_thumbnail->SetThumbnailKey(m_key, contextName);
-            m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
-        }
+        m_key = key;
+        m_thumbnail->SetThumbnailKey(m_key, contextName);
+        m_thumbnailEnlarged->SetThumbnailKey(m_key, contextName);
         UpdateVisibility();
     }
 

Code/Tools/AssetBundler/CMakeLists.txt

@@ -47,6 +47,10 @@ ly_add_target(
             AZ::AssetBundlerBatch.Static
 )
 
+# Adds a specialized .setreg to identify gems enabled in the active project.
+# This associates the AssetBundlerBatch target with the .Builders gem variants.
+ly_set_gem_variant_to_load(TARGETS AssetBundlerBatch VARIANTS Builders)
+
 # AssetBundler - Qt GUI Application
 ly_add_target(
     NAME AssetBundler ${PAL_TRAIT_BUILD_ASSETBUNDLER_APPLICATION_TYPE}
@@ -73,6 +77,10 @@ ly_add_target(
             ${additional_dependencies}
 )
 
+# Adds a specialized .setreg to identify gems enabled in the active project.
+# This associates the AssetBundler target with the .Builders gem variants.
+ly_set_gem_variant_to_load(TARGETS AssetBundler VARIANTS Builders)
+
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
 
     ly_add_target(

Code/Tools/AssetBundler/source/utils/applicationManager.cpp

@@ -54,7 +54,12 @@ namespace AssetBundler
     bool ApplicationManager::Init()
     {
         AZ::Debug::TraceMessageBus::Handler::BusConnect();
-        Start(AzFramework::Application::Descriptor());
+
+        ComponentApplication::StartupParameters startupParameters;
+        // The AssetBundler does not need to load gems
+        startupParameters.m_loadDynamicModules = false;
+        Start(AzFramework::Application::Descriptor(), startupParameters);
+
         AZ::SerializeContext* context;
         EBUS_EVENT_RESULT(context, AZ::ComponentApplicationBus, GetSerializeContext);
         AZ_Assert(context, "No serialize context");

Code/Tools/AssetBundler/tests/applicationManagerTests.cpp

@@ -71,7 +71,11 @@ namespace AssetBundler
 
 
             m_data->m_applicationManager.reset(aznew MockApplicationManagerTest(0, 0));
-            m_data->m_applicationManager->Start(AzFramework::Application::Descriptor());
+
+            AZ::ComponentApplication::StartupParameters startupParameters;
+            // The AssetBundler does not need to load gems
+            startupParameters.m_loadDynamicModules = false;
+            m_data->m_applicationManager->Start(AzFramework::Application::Descriptor(), startupParameters);
 
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp

@@ -145,10 +145,11 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void GemCatalogScreen::OnGemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies) 
+    void GemCatalogScreen::OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies) 
     {
         if (m_notificationsEnabled)
         {
+            QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName);
             bool added = GemModel::IsAdded(modelIndex);
             bool dependency = GemModel::IsAddedDependency(modelIndex);
 
@@ -233,7 +234,11 @@ namespace O3DE::ProjectManager
                 const QVector<GemInfo> allRepoGemInfos = allRepoGemInfosResult.GetValue();
                 for (const GemInfo& gemInfo : allRepoGemInfos)
                 {
-                    m_gemModel->AddGem(gemInfo);
+                    // do not add gems that have already been downloaded
+                    if (!m_gemModel->FindIndexByNameString(gemInfo.m_name).isValid())
+                    {
+                        m_gemModel->AddGem(gemInfo);
+                    }
                 }
             }
             else
@@ -257,7 +262,8 @@ namespace O3DE::ProjectManager
                         GemModel::SetWasPreviouslyAdded(*m_gemModel, modelIndex, true);
                         GemModel::SetIsAdded(*m_gemModel, modelIndex, true);
                     }
-                    else
+                    // ${Name} is a special name used in templates and is not really an error
+                    else if (enabledGemName != "${Name}")
                     {
                         AZ_Warning("ProjectManager::GemCatalog", false,
                             "Cannot find entry for gem with name '%s'. The CMake target name probably does not match the specified name in the gem.json.",

Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h

@@ -46,7 +46,7 @@ namespace O3DE::ProjectManager
         DownloadController* GetDownloadController() const { return m_downloadController; }
 
     public slots:
-        void OnGemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies);
+        void OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
         void OnAddGemClicked();
 
     protected:

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp

@@ -27,6 +27,14 @@ namespace O3DE::ProjectManager
 
     void GemModel::AddGem(const GemInfo& gemInfo)
     {
+        if (FindIndexByNameString(gemInfo.m_name).isValid())
+        {
+            // do not add gems with duplicate names
+            // this can happen by mistake or when a gem repo has a gem with the same name as a local gem
+            AZ_TracePrintf("GemModel", "Ignoring duplicate gem: %s", gemInfo.m_name.toUtf8().constData());
+            return;
+        }
+
         QStandardItem* item = new QStandardItem();
 
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -276,9 +284,11 @@ namespace O3DE::ProjectManager
 
     void GemModel::SetIsAdded(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded)
     {
+        // get the gemName first, because the modelIndex data change after adding because of filters
+        QString gemName = modelIndex.data(RoleName).toString();
         model.setData(modelIndex, isAdded, RoleIsAdded);
 
-        UpdateDependencies(model, modelIndex);
+        UpdateDependencies(model, gemName, isAdded);
     }
 
     bool GemModel::HasDependentGems(const QModelIndex& modelIndex) const
@@ -294,15 +304,17 @@ namespace O3DE::ProjectManager
         return false;
     }
 
-    void GemModel::UpdateDependencies(QAbstractItemModel& model, const QModelIndex& modelIndex)
+    void GemModel::UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded)
     {
         GemModel* gemModel = GetSourceModel(&model);
         AZ_Assert(gemModel, "Failed to obtain GemModel");
 
+        QModelIndex modelIndex = gemModel->FindIndexByNameString(gemName);
+
         QVector<QModelIndex> dependencies = gemModel->GatherGemDependencies(modelIndex);
         uint32_t numChangedDependencies = 0;
 
-        if (IsAdded(modelIndex))
+        if (isAdded)
         {
             for (const QModelIndex& dependency : dependencies)
             {
@@ -324,7 +336,7 @@ namespace O3DE::ProjectManager
             bool hasDependentGems = gemModel->HasDependentGems(modelIndex);
             if (IsAddedDependency(modelIndex) != hasDependentGems)
             {
-                SetIsAddedDependency(model, modelIndex, hasDependentGems);
+                SetIsAddedDependency(*gemModel, modelIndex, hasDependentGems);
             }
 
             for (const QModelIndex& dependency : dependencies)
@@ -343,7 +355,7 @@ namespace O3DE::ProjectManager
             }
         }
 
-        gemModel->emit gemStatusChanged(modelIndex, numChangedDependencies);
+        gemModel->emit gemStatusChanged(gemName, numChangedDependencies);
     }
 
     void GemModel::SetIsAddedDependency(QAbstractItemModel& model, const QModelIndex& modelIndex, bool isAdded)

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h

@@ -64,7 +64,7 @@ namespace O3DE::ProjectManager
         static bool NeedsToBeAdded(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool NeedsToBeRemoved(const QModelIndex& modelIndex, bool includeDependencies = false);
         static bool HasRequirement(const QModelIndex& modelIndex);
-        static void UpdateDependencies(QAbstractItemModel& model, const QModelIndex& modelIndex);
+        static void UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded);
         static void SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status);
 
         bool DoGemsToBeAddedHaveRequirements() const;
@@ -78,7 +78,7 @@ namespace O3DE::ProjectManager
         int TotalAddedGems(bool includeDependencies = false) const;
 
     signals:
-        void gemStatusChanged(const QModelIndex& modelIndex, uint32_t numChangedDependencies);
+        void gemStatusChanged(const QString& gemName, uint32_t numChangedDependencies);
 
     private:
         void FindGemDisplayNamesByNameStrings(QStringList& inOutGemNames);

Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Material/MaterialAssignment.h

@@ -78,5 +78,10 @@ namespace AZ
         //! Find an assignment id corresponding to the lod and label substring filters
         MaterialAssignmentId FindMaterialAssignmentIdInModel(
             const Data::Instance<AZ::RPI::Model>& model, const MaterialAssignmentLodIndex lodFilter, const AZStd::string& labelFilter);
+
+        //! Special case handling to convert script values to supported types
+        AZ::RPI::MaterialPropertyValue ConvertMaterialPropertyValueFromScript(
+            const AZ::RPI::MaterialPropertyDescriptor* propertyDescriptor, const AZStd::any& value);
+
     } // namespace Render
 } // namespace AZ

Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp

@@ -12,7 +12,7 @@
 
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
 #include <Atom/RPI.Public/Pass/PassFilter.h>
-#include <Atom/RPI.Public/Pass/RenderPass.h>
+#include <Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h>
 #include <Atom/RPI.Public/Pass/Specific/SwapChainPass.h>
 #include <Atom/RPI.Public/ViewportContextManager.h>
 

Gems/Atom/Feature/Common/Code/Source/Material/MaterialAssignment.cpp

@@ -143,28 +143,34 @@ namespace AZ
                     {
                         bool wasRenamed = false;
                         Name newName;
-                        RPI::MaterialPropertyIndex materialPropertyIndex = m_materialInstance->FindPropertyIndex(propertyPair.first, &wasRenamed, &newName);
+                        RPI::MaterialPropertyIndex materialPropertyIndex =
+                            m_materialInstance->FindPropertyIndex(propertyPair.first, &wasRenamed, &newName);
 
-                        // FindPropertyIndex will have already reported a message about what the old and new names are. Here we just add some extra info to help the user resolve it.
-                        AZ_Warning("MaterialAssignment", !wasRenamed,
+                        // FindPropertyIndex will have already reported a message about what the old and new names are. Here we just add
+                        // some extra info to help the user resolve it.
+                        AZ_Warning(
+                            "MaterialAssignment", !wasRenamed,
                             "Consider running \"Apply Automatic Property Updates\" to use the latest property names.",
-                            propertyPair.first.GetCStr(),
-                            newName.GetCStr());
+                            propertyPair.first.GetCStr(), newName.GetCStr());
 
                         if (wasRenamed && m_propertyOverrides.find(newName) != m_propertyOverrides.end())
                         {
                             materialPropertyIndex.Reset();
-                            
-                            AZ_Warning("MaterialAssignment", false,
-                                "Material property '%s' has been renamed to '%s', and a property override exists for both. The one with the old name will be ignored.",
-                                propertyPair.first.GetCStr(),
-                                newName.GetCStr());
+
+                            AZ_Warning(
+                                "MaterialAssignment", false,
+                                "Material property '%s' has been renamed to '%s', and a property override exists for both. The one with "
+                                "the old name will be ignored.",
+                                propertyPair.first.GetCStr(), newName.GetCStr());
                         }
 
                         if (!materialPropertyIndex.IsNull())
                         {
+                            const auto propertyDescriptor =
+                                m_materialInstance->GetMaterialPropertiesLayout()->GetPropertyDescriptor(materialPropertyIndex);
+
                             m_materialInstance->SetPropertyValue(
-                                materialPropertyIndex, AZ::RPI::MaterialPropertyValue::FromAny(propertyPair.second));
+                                materialPropertyIndex, ConvertMaterialPropertyValueFromScript(propertyDescriptor, propertyPair.second));
                         }
                     }
                 }
@@ -284,5 +290,58 @@ namespace AZ
 
             return MaterialAssignmentId();
         }
+
+        template<typename T>
+        AZ::RPI::MaterialPropertyValue ConvertMaterialPropertyValueNumericType(const AZStd::any& value)
+        {
+            if (value.is<int32_t>())
+            {
+                return aznumeric_cast<T>(AZStd::any_cast<int32_t>(value));
+            }
+            if (value.is<uint32_t>())
+            {
+                return aznumeric_cast<T>(AZStd::any_cast<uint32_t>(value));
+            }
+            if (value.is<float>())
+            {
+                return aznumeric_cast<T>(AZStd::any_cast<float>(value));
+            }
+            if (value.is<double>())
+            {
+                return aznumeric_cast<T>(AZStd::any_cast<double>(value));
+            }
+
+            return AZ::RPI::MaterialPropertyValue::FromAny(value);
+        }
+
+        AZ::RPI::MaterialPropertyValue ConvertMaterialPropertyValueFromScript(
+            const AZ::RPI::MaterialPropertyDescriptor* propertyDescriptor, const AZStd::any& value)
+        {
+            switch (propertyDescriptor->GetDataType())
+            {
+            case AZ::RPI::MaterialPropertyDataType::Enum:
+                if (value.is<AZ::Name>())
+                {
+                    return propertyDescriptor->GetEnumValue(AZStd::any_cast<AZ::Name>(value));
+                }
+                if (value.is<AZStd::string>())
+                {
+                    return propertyDescriptor->GetEnumValue(AZ::Name(AZStd::any_cast<AZStd::string>(value)));
+                }
+                return ConvertMaterialPropertyValueNumericType<uint32_t>(value);
+            case AZ::RPI::MaterialPropertyDataType::Int:
+                return ConvertMaterialPropertyValueNumericType<int32_t>(value);
+            case AZ::RPI::MaterialPropertyDataType::UInt:
+                return ConvertMaterialPropertyValueNumericType<uint32_t>(value);
+            case AZ::RPI::MaterialPropertyDataType::Float:
+                return ConvertMaterialPropertyValueNumericType<float>(value);
+            case AZ::RPI::MaterialPropertyDataType::Bool:
+                return ConvertMaterialPropertyValueNumericType<bool>(value);
+            default:
+                break;
+            }
+
+            return AZ::RPI::MaterialPropertyValue::FromAny(value);
+        }
     } // namespace Render
 } // namespace AZ

Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Pass.h

@@ -12,6 +12,7 @@
 #include <Atom/RPI.Public/GpuQuery/GpuQuerySystemInterface.h>
 #include <Atom/RPI.Reflect/Image/Image.h>
 #include <Atom/RPI.Public/Image/AttachmentImage.h>
+#include <Atom/RPI.Public/Image/AttachmentImage.h>
 #include <Atom/RPI.Public/Pass/PassAttachment.h>
 #include <Atom/RPI.Public/Pass/PassDefines.h>
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
@@ -59,6 +60,7 @@ namespace AZ
         struct PassRequest;
         struct PassValidationResults;
         class AttachmentReadback;
+        class ImageAttachmentCopy;
 
         using SortedPipelineViewTags = AZStd::set<PipelineViewTag, AZNameSortAscending>;
         using PassesByDrawList = AZStd::map<RHI::DrawListTag, const Pass*>;
@@ -94,6 +96,8 @@ namespace AZ
         {
             AZ_RPI_PASS(Pass);
 
+            friend class ImageAttachmentPreviewPass;
+
         public:
             using ChildPassIndex = RHI::Handle<uint32_t, class ChildPass>;
 
@@ -369,6 +373,9 @@ namespace AZ
 
             void UpdateReadbackAttachment(FramePrepareParams params, bool beforeAddScopes);
 
+            // Setup ImageAttachmentCopy
+            void UpdateAttachmentCopy(FramePrepareParams params);
+
             // --- Protected Members ---
 
             const Name PassNameThis{"This"};
@@ -466,6 +473,9 @@ namespace AZ
             AZStd::shared_ptr<AttachmentReadback> m_attachmentReadback;
             PassAttachmentReadbackOption m_readbackOption;
 
+            // For image attachment preview
+            AZStd::weak_ptr<ImageAttachmentCopy> m_attachmentCopy;
+
         private:
             // Return the Timestamp result of this pass
             virtual TimestampResult GetTimestampResultInternal() const;

Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/RenderPass.h

@@ -13,9 +13,7 @@
 #include <Atom/RHI/DrawList.h>
 #include <Atom/RHI/ScopeProducer.h>
 
-#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/Pass.h>
-#include <Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h>
 #include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
 
 namespace AZ
@@ -29,7 +27,6 @@ namespace AZ
 
     namespace RPI
     {
-        class ImageAttachmentCopy;
         class RenderPass;
         class Query;
 
@@ -41,8 +38,6 @@ namespace AZ
         {
             AZ_RPI_PASS(RenderPass);
 
-            friend class ImageAttachmentPreviewPass;
-
             using ScopeQuery = AZStd::array<RHI::Ptr<Query>, static_cast<size_t>(ScopeQueryType::Count)>;
 
         public:
@@ -143,8 +138,6 @@ namespace AZ
             // Readback the results from the ScopeQueries
             void ReadbackScopeQueryResults();
 
-            AZStd::weak_ptr<ImageAttachmentCopy> m_attachmentCopy;
-
             // Readback results from the Timestamp queries
             TimestampResult m_timestampResult;
             // Readback results from the PipelineStatistics queries

Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h

@@ -78,7 +78,7 @@ namespace AZ
             ~ImageAttachmentPreviewPass();
             
             //! Preview the PassAttachment of a pass' PassAttachmentBinding
-            void PreviewImageAttachmentForPass(RenderPass* pass, const PassAttachment* passAttachment);
+            void PreviewImageAttachmentForPass(Pass* pass, const PassAttachment* passAttachment);
 
             //! Set the output color attachment for this pass
             void SetOutputColorAttachment(RHI::Ptr<PassAttachment> outputImageAttachment);

Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp

@@ -26,6 +26,7 @@
 #include <Atom/RPI.Public/Pass/PassLibrary.h>
 #include <Atom/RPI.Public/Pass/PassDefines.h>
 #include <Atom/RPI.Public/Pass/PassSystemInterface.h>
+#include <Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h>
 #include <Atom/RPI.Public/RenderPipeline.h>
 
 #include <Atom/RPI.Reflect/Image/AttachmentImageAsset.h>
@@ -1215,6 +1216,12 @@ namespace AZ
             m_queueState = PassQueueState::NoQueue;
 
             InitializeInternal();
+            
+            // Need to recreate the dest attachment because the source attachment might be changed
+            if (!m_attachmentCopy.expired())
+            {
+                m_attachmentCopy.lock()->InvalidateDestImage();
+            }
 
             m_state = PassState::Initialized;
         }
@@ -1301,6 +1308,9 @@ namespace AZ
             // readback attachment with output state
             UpdateReadbackAttachment(params, false);
 
+            // update attachment copy for preview
+            UpdateAttachmentCopy(params);
+
             UpdateConnectedOutputBindings();
         }
 
@@ -1489,6 +1499,14 @@ namespace AZ
             }
         }
 
+        void Pass::UpdateAttachmentCopy(FramePrepareParams params)
+        {
+            if (!m_attachmentCopy.expired())
+            {
+                m_attachmentCopy.lock()->FrameBegin(params);
+            }
+        }
+
         bool Pass::IsTimestampQueryEnabled() const
         {
             return m_flags.m_timestampQueryEnabled;

Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp

@@ -177,12 +177,6 @@ namespace AZ
                     }
                 }
             }
-
-            // Need to recreate the dest attachment because the source attachment might be changed
-            if (!m_attachmentCopy.expired())
-            {
-                m_attachmentCopy.lock()->InvalidateDestImage();
-            }
         }
 
         void RenderPass::FrameBeginInternal(FramePrepareParams params)
@@ -196,11 +190,7 @@ namespace AZ
 
             // Read back the ScopeQueries submitted from previous frames
             ReadbackScopeQueryResults();
-             
-            if (!m_attachmentCopy.expired())
-            {
-                m_attachmentCopy.lock()->FrameBegin(params);
-            }
+
             CollectSrgs();
 
             PassSystemInterface::Get()->IncrementFrameRenderPassCount();

Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.cpp

@@ -14,7 +14,7 @@
 #include <Atom/RPI.Public/Buffer/Buffer.h>
 #include <Atom/RPI.Public/Image/AttachmentImagePool.h>
 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
-#include <Atom/RPI.Public/Pass/RenderPass.h>
+#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
 #include <Atom/RPI.Public/Pass/Specific/ImageAttachmentPreviewPass.h>
 #include <Atom/RPI.Public/Pass/ParentPass.h>
 #include <Atom/RPI.Public/RenderPipeline.h>
@@ -131,7 +131,7 @@ namespace AZ
             Data::AssetBus::Handler::BusDisconnect();
         }
 
-        void ImageAttachmentPreviewPass::PreviewImageAttachmentForPass(RenderPass* pass, const PassAttachment* passAttachment)
+        void ImageAttachmentPreviewPass::PreviewImageAttachmentForPass(Pass* pass, const PassAttachment* passAttachment)
         {
             if (passAttachment->GetAttachmentType() != RHI::AttachmentType::Image)
             {

Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.h

@@ -39,6 +39,8 @@ namespace AZ
             bool m_showAttachments = false;
 
             AZ::RPI::Pass* m_selectedPass = nullptr;
+            AZ::RPI::Pass* m_lastSelectedPass = nullptr;
+            AZ::Name m_selectedPassPath;
             AZ::RHI::AttachmentId m_attachmentId;
             AZ::Name m_slotName;
             bool m_selectedChanged = false;

Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiPassTree.inl

@@ -31,7 +31,7 @@
 
 namespace AZ::Render
 {
-    inline AZ::RPI::PassAttachment* FindPassAttachment(AZ::RPI::RenderPass* pass, AZ::RHI::AttachmentId attachmentId)
+    inline AZ::RPI::PassAttachment* FindPassAttachment(AZ::RPI::Pass* pass, AZ::RHI::AttachmentId attachmentId)
     {
         for (auto& binding : pass->GetAttachmentBindings())
         {
@@ -47,6 +47,10 @@ namespace AZ::Render
     {
         using namespace AZ;
 
+        // always set m_selectedPass to empty and use m_selectedPassPath to find it when render the pass tree
+        m_selectedPass = nullptr;
+        bool needSaveAttachment = false;
+
         ImGui::SetNextWindowSize(ImVec2(200.f, 200.f), ImGuiCond_FirstUseEver);
         if (ImGui::Begin("PassTree View", &draw, ImGuiWindowFlags_None))
         {
@@ -83,60 +87,16 @@ namespace AZ::Render
 
             if (Scriptable_ImGui::Button("Save Attachment"))
             {
-                m_attachmentReadbackInfo = "";
-                if (!m_readback)
-                {
-                    m_readback = AZStd::make_shared<AZ::RPI::AttachmentReadback>(AZ::RHI::ScopeId{ "AttachmentReadback" });
-                    m_readback->SetCallback(AZStd::bind(&ImGuiPassTree::ReadbackCallback, this, AZStd::placeholders::_1));
-                }
-
-                if (m_selectedPass && !m_slotName.IsEmpty())
-                {
-                    bool readbackResult = m_selectedPass->ReadbackAttachment(m_readback, m_slotName);
-                    if (!readbackResult)
-                    {
-                        AZ_Error("ImGuiPassTree", false, "Failed to readback attachment from pass [%s] slot [%s]", m_selectedPass->GetName().GetCStr(), m_slotName.GetCStr());
-                    }
-                }
+                needSaveAttachment = true;
             }
 
             ImGui::TextWrapped("%s", m_attachmentReadbackInfo.c_str());
         }
 
-        if (m_previewAttachment && m_selectedChanged)
-        {
-            m_selectedChanged = false;
-            if (!m_attachmentId.IsEmpty() && m_selectedPass)
-            {
-                AZ::RPI::RenderPass* renderPass = azrtti_cast<AZ::RPI::RenderPass*>(m_selectedPass);
-                if (renderPass)
-                {
-                    if (!m_previewPass->GetParent())
-                    {
-                        RPI::PassSystemInterface::Get()->GetRootPass()->AddChild(m_previewPass);
-                    }
-                    AZ::RPI::PassAttachment* attachment = FindPassAttachment(renderPass, m_attachmentId);
-                    if (attachment)
-                    {
-                        // Reset output attachment to empty so the preview will use pass's owner render pipeline's output
-                        m_previewPass->SetOutputColorAttachment(nullptr);
-                        m_previewPass->PreviewImageAttachmentForPass(renderPass, attachment);
-                    }
-                }
-                else
-                {
-                    m_previewPass->ClearPreviewAttachment();
-                    if (m_previewPass->GetParent())
-                    {
-                        m_previewPass->QueueForRemoval();
-                    }
-                }
-            }
-        }
-
         ImGui::End();
 
         // Draw the hierarchical view
+        // It will assign m_seletedPass if there is a pass matches m_seletedPassPath
         ImGui::SetNextWindowPos(ImVec2(300, 60), ImGuiCond_FirstUseEver);
         ImGui::SetNextWindowSize(ImVec2(300, 500), ImGuiCond_FirstUseEver);
         if (ImGui::Begin("PassTree", nullptr, ImGuiWindowFlags_None))
@@ -144,6 +104,63 @@ namespace AZ::Render
             DrawTreeView(rootPass);
         }
         ImGui::End();
+
+        // It's possible that the pass pointer changed but selected pass path wasn't changed
+        if (m_selectedPass != m_lastSelectedPass)
+        {
+            m_selectedChanged = true;
+            if (m_selectedPass == nullptr)
+            {
+                m_selectedPassPath = AZ::Name{};
+            }
+        }
+        m_lastSelectedPass = m_selectedPass;
+
+        if (m_previewAttachment && m_selectedChanged)
+        {
+            m_selectedChanged = false;
+            if (!m_attachmentId.IsEmpty() && m_selectedPass)
+            {
+                if (!m_previewPass->GetParent())
+                {
+                    RPI::PassSystemInterface::Get()->GetRootPass()->AddChild(m_previewPass);
+                }
+                AZ::RPI::PassAttachment* attachment = FindPassAttachment(m_selectedPass, m_attachmentId);
+                if (attachment)
+                {
+                    // Reset output attachment to empty so the preview will use pass's owner render pipeline's output
+                    m_previewPass->SetOutputColorAttachment(nullptr);
+                    m_previewPass->PreviewImageAttachmentForPass(m_selectedPass, attachment);
+                }
+            }
+            else
+            {
+                m_previewPass->ClearPreviewAttachment();
+                if (m_previewPass->GetParent())
+                {
+                    m_previewPass->QueueForRemoval();
+                }
+            }
+        }
+
+        if (needSaveAttachment)
+        {            
+            m_attachmentReadbackInfo = "";
+            if (!m_readback)
+            {
+                m_readback = AZStd::make_shared<AZ::RPI::AttachmentReadback>(AZ::RHI::ScopeId{ "AttachmentReadback" });
+                m_readback->SetCallback(AZStd::bind(&ImGuiPassTree::ReadbackCallback, this, AZStd::placeholders::_1));
+            }
+
+            if (m_selectedPass && !m_slotName.IsEmpty())
+            {
+                bool readbackResult = m_selectedPass->ReadbackAttachment(m_readback, m_slotName);
+                if (!readbackResult)
+                {
+                    AZ_Error("ImGuiPassTree", false, "Failed to readback attachment from pass [%s] slot [%s]", m_selectedPass->GetName().GetCStr(), m_slotName.GetCStr());
+                }
+            }
+        }
     }
         
     inline void ImGuiPassTree::DrawPassAttachments(AZ::RPI::Pass* pass)
@@ -202,6 +219,7 @@ namespace AZ::Render
 
                 if (Scriptable_ImGui::Selectable(label.c_str(), m_attachmentId == binding.m_attachment->GetAttachmentId()))
                 {
+                    m_selectedPassPath = pass->GetPathName();
                     m_selectedPass = pass;
                     m_attachmentId = binding.m_attachment->GetAttachmentId();
                     m_slotName = binding.m_name;
@@ -232,9 +250,9 @@ namespace AZ::Render
             if (!m_showAttachments)
             {
                 // Only draw the leaf pass as selectable if we are not showing attachments as its children
-                if (Scriptable_ImGui::Selectable(pass->GetName().GetCStr(), m_selectedPass == pass))
+                if (Scriptable_ImGui::Selectable(pass->GetName().GetCStr(), m_selectedPassPath == pass->GetPathName()))
                 {
-                    m_selectedPass = pass;
+                    m_selectedPassPath = pass->GetPathName();
                     m_attachmentId = AZ::RHI::AttachmentId{};
                     m_slotName = AZ::Name{};
                     m_selectedChanged = true;
@@ -244,13 +262,13 @@ namespace AZ::Render
             {
                 // Draw the pass as a tree node which has attachments as its children
                 ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_DefaultOpen
-                    | ((m_selectedPass == pass) ? ImGuiTreeNodeFlags_Selected : 0);
+                    | ((m_selectedPassPath == pass->GetPathName()) ? ImGuiTreeNodeFlags_Selected : 0);
 
                 bool nodeOpen = Scriptable_ImGui::TreeNodeEx(pass->GetName().GetCStr(), flags);
 
                 if (ImGui::IsItemClicked())
                 {
-                    m_selectedPass = pass;
+                    m_selectedPassPath = pass->GetPathName();
                     m_attachmentId = AZ::RHI::AttachmentId{};
                     m_slotName = AZ::Name{};
                     m_selectedChanged = true;
@@ -259,7 +277,6 @@ namespace AZ::Render
                 if (nodeOpen)
                 {
                     DrawPassAttachments(pass);
-
                     Scriptable_ImGui::TreePop();
                 }
             }
@@ -268,13 +285,13 @@ namespace AZ::Render
         {
             // For a ParentPasse, draw it as a tree node 
             ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_DefaultOpen
-                | ((m_selectedPass == pass) ? ImGuiTreeNodeFlags_Selected : 0);
+                | ((m_selectedPassPath == pass->GetPathName()) ? ImGuiTreeNodeFlags_Selected : 0);
 
             bool nodeOpen = ImGui::TreeNodeEx(pass->GetName().GetCStr(), flags);
 
             if (ImGui::IsItemClicked())
             {
-                m_selectedPass = pass;
+                m_selectedPassPath = pass->GetPathName();
                 m_attachmentId = AZ::RHI::AttachmentId{};
                 m_slotName = AZ::Name{};
                 m_selectedChanged = true;
@@ -282,7 +299,10 @@ namespace AZ::Render
 
             if (nodeOpen)
             {
-                DrawPassAttachments(pass);
+                if (m_showAttachments)
+                {
+                    DrawPassAttachments(pass);
+                }
                 for (const auto& child : asParent->GetChildren())
                 {
                     DrawTreeView(child.get());
@@ -296,6 +316,12 @@ namespace AZ::Render
         {
             ImGui::PopStyleColor();
         }
+
+        // set m_selectedPass if pass path matches
+        if (pass->GetPathName() == m_selectedPassPath)
+        {
+            m_selectedPass = pass;
+        }
     }
 
     inline void ImGuiPassTree::ReadbackCallback(const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
@@ -364,7 +390,9 @@ namespace AZ::Render
         m_previewAttachment = false;
         m_showAttachments = false;
 
+        m_selectedPassPath = AZ::Name{};
         m_selectedPass = nullptr;
+        m_lastSelectedPass = nullptr;
         m_attachmentId = AZ::RHI::AttachmentId{};
          m_slotName = AZ::Name{};
         m_selectedChanged = false;

Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h

@@ -60,52 +60,8 @@ namespace AZ
             virtual void ClearMaterialOverride(const MaterialAssignmentId& materialAssignmentId) = 0;
             //! Set a material property override value wrapped by an AZStd::any
             virtual void SetPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZStd::any& value) = 0;
-            //! Set a material property override value to a bool
-            virtual void SetPropertyOverrideBool(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const bool& value) = 0;
-            //! Set a material property override value to a integer
-            virtual void SetPropertyOverrideInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const int32_t& value) = 0;
-            //! Set a material property override value to a unsigned integer
-            virtual void SetPropertyOverrideUInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const uint32_t& value) = 0;
-            //! Set a material property override value to a float
-            virtual void SetPropertyOverrideFloat(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const float& value) = 0;
-            //! Set a material property override value to a Vector2
-            virtual void SetPropertyOverrideVector2(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector2& value) = 0;
-            //! Set a material property override value to a Vector3
-            virtual void SetPropertyOverrideVector3(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector3& value) = 0;
-            //! Set a material property override value to a Vector4
-            virtual void SetPropertyOverrideVector4(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector4& value) = 0;
-            //! Set a material property override value to a color
-            virtual void SetPropertyOverrideColor(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Color& value) = 0;
-            //! Set a material property override value to an image asset
-            virtual void SetPropertyOverrideImageAsset(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Data::Asset<AZ::RPI::ImageAsset>& value) = 0;
-            //! Set a material property override value to an image instance
-            virtual void SetPropertyOverrideImageInstance(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Data::Instance<AZ::RPI::Image>& value) = 0;
-            //! Set a material property override value to a string
-            virtual void SetPropertyOverrideString(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZStd::string& value) = 0;
             //! Get a material property override value wrapped by an AZStd::any
             virtual AZStd::any GetPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a bool
-            virtual bool GetPropertyOverrideBool(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as an integer
-            virtual int32_t GetPropertyOverrideInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as an unsigned integer
-            virtual uint32_t GetPropertyOverrideUInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a float
-            virtual float GetPropertyOverrideFloat(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a Vector2
-            virtual AZ::Vector2 GetPropertyOverrideVector2(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a Vector3
-            virtual AZ::Vector3 GetPropertyOverrideVector3(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a Vector4
-            virtual AZ::Vector4 GetPropertyOverrideVector4(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a Color
-            virtual AZ::Color GetPropertyOverrideColor(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as an image asset
-            virtual AZ::Data::Asset<AZ::RPI::ImageAsset> GetPropertyOverrideImageAsset(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as an image instance
-            virtual AZ::Data::Instance<AZ::RPI::Image> GetPropertyOverrideImageInstance(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
-            //! Get a material property override value as a string
-            virtual AZStd::string GetPropertyOverrideString(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const = 0;
             //! Clear property override for a specific material assignment
             virtual void ClearPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) = 0;
             //! Clear property overrides for a specific material assignment
@@ -122,6 +78,21 @@ namespace AZ
                 const MaterialAssignmentId& materialAssignmentId, const AZ::RPI::MaterialModelUvOverrideMap& modelUvOverrides) = 0;
             //! Get Model UV overrides for a specific material assignment
             virtual AZ::RPI::MaterialModelUvOverrideMap GetModelUvOverrides(const MaterialAssignmentId& materialAssignmentId) const = 0;
+
+            //! Set material property override value with a specific type
+            template<typename T>
+            void SetPropertyOverrideT(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const T& value)
+            {
+                SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
+            }
+
+            //! Get material property override value with a specific type
+            template<typename T>
+            T GetPropertyOverrideT(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
+            {
+                const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
+                return !value.empty() && value.is<T>() ? AZStd::any_cast<T>(value) : T{};
+            }
         };
         using MaterialComponentRequestBus = EBus<MaterialComponentRequests>;
 

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp

@@ -54,29 +54,29 @@ namespace AZ
                     ->Event("GetMaterialOverride", &MaterialComponentRequestBus::Events::GetMaterialOverride)
                     ->Event("ClearMaterialOverride", &MaterialComponentRequestBus::Events::ClearMaterialOverride)
                     ->Event("SetPropertyOverride", &MaterialComponentRequestBus::Events::SetPropertyOverride)
-                    ->Event("SetPropertyOverrideBool", &MaterialComponentRequestBus::Events::SetPropertyOverrideBool)
-                    ->Event("SetPropertyOverrideInt32", &MaterialComponentRequestBus::Events::SetPropertyOverrideInt32)
-                    ->Event("SetPropertyOverrideUInt32", &MaterialComponentRequestBus::Events::SetPropertyOverrideUInt32)
-                    ->Event("SetPropertyOverrideFloat", &MaterialComponentRequestBus::Events::SetPropertyOverrideFloat)
-                    ->Event("SetPropertyOverrideVector2", &MaterialComponentRequestBus::Events::SetPropertyOverrideVector2)
-                    ->Event("SetPropertyOverrideVector3", &MaterialComponentRequestBus::Events::SetPropertyOverrideVector3)
-                    ->Event("SetPropertyOverrideVector4", &MaterialComponentRequestBus::Events::SetPropertyOverrideVector4)
-                    ->Event("SetPropertyOverrideColor", &MaterialComponentRequestBus::Events::SetPropertyOverrideColor)
-                    ->Event("SetPropertyOverrideImageAsset", &MaterialComponentRequestBus::Events::SetPropertyOverrideImageAsset)
-                    ->Event("SetPropertyOverrideImageInstance", &MaterialComponentRequestBus::Events::SetPropertyOverrideImageInstance)
-                    ->Event("SetPropertyOverrideString", &MaterialComponentRequestBus::Events::SetPropertyOverrideString)
+                    ->Event("SetPropertyOverrideBool", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<bool>)
+                    ->Event("SetPropertyOverrideInt32", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<int32_t>)
+                    ->Event("SetPropertyOverrideUInt32", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<uint32_t>)
+                    ->Event("SetPropertyOverrideFloat", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<float>)
+                    ->Event("SetPropertyOverrideVector2", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZ::Vector2>)
+                    ->Event("SetPropertyOverrideVector3", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZ::Vector3>)
+                    ->Event("SetPropertyOverrideVector4", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZ::Vector4>)
+                    ->Event("SetPropertyOverrideColor", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZ::Color>)
+                    ->Event("SetPropertyOverrideImage", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZ::Data::AssetId>)
+                    ->Event("SetPropertyOverrideString", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<AZStd::string>)
+                    ->Event("SetPropertyOverrideEnum", &MaterialComponentRequestBus::Events::SetPropertyOverrideT<uint32_t>)
                     ->Event("GetPropertyOverride", &MaterialComponentRequestBus::Events::GetPropertyOverride)
-                    ->Event("GetPropertyOverrideBool", &MaterialComponentRequestBus::Events::GetPropertyOverrideBool)
-                    ->Event("GetPropertyOverrideInt32", &MaterialComponentRequestBus::Events::GetPropertyOverrideInt32)
-                    ->Event("GetPropertyOverrideUInt32", &MaterialComponentRequestBus::Events::GetPropertyOverrideUInt32)
-                    ->Event("GetPropertyOverrideFloat", &MaterialComponentRequestBus::Events::GetPropertyOverrideFloat)
-                    ->Event("GetPropertyOverrideVector2", &MaterialComponentRequestBus::Events::GetPropertyOverrideVector2)
-                    ->Event("GetPropertyOverrideVector3", &MaterialComponentRequestBus::Events::GetPropertyOverrideVector3)
-                    ->Event("GetPropertyOverrideVector4", &MaterialComponentRequestBus::Events::GetPropertyOverrideVector4)
-                    ->Event("GetPropertyOverrideColor", &MaterialComponentRequestBus::Events::GetPropertyOverrideColor)
-                    ->Event("GetPropertyOverrideImageAsset", &MaterialComponentRequestBus::Events::GetPropertyOverrideImageAsset)
-                    ->Event("GetPropertyOverrideImageInstance", &MaterialComponentRequestBus::Events::GetPropertyOverrideImageInstance)
-                    ->Event("GetPropertyOverrideString", &MaterialComponentRequestBus::Events::GetPropertyOverrideString)
+                    ->Event("GetPropertyOverrideBool", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<bool>)
+                    ->Event("GetPropertyOverrideInt32", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<int32_t>)
+                    ->Event("GetPropertyOverrideUInt32", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<uint32_t>)
+                    ->Event("GetPropertyOverrideFloat", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<float>)
+                    ->Event("GetPropertyOverrideVector2", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZ::Vector2>)
+                    ->Event("GetPropertyOverrideVector3", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZ::Vector3>)
+                    ->Event("GetPropertyOverrideVector4", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZ::Vector4>)
+                    ->Event("GetPropertyOverrideColor", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZ::Color>)
+                    ->Event("GetPropertyOverrideImage", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZ::Data::AssetId>)
+                    ->Event("GetPropertyOverrideString", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<AZStd::string>)
+                    ->Event("GetPropertyOverrideEnum", &MaterialComponentRequestBus::Events::GetPropertyOverrideT<uint32_t>)
                     ->Event("ClearPropertyOverride", &MaterialComponentRequestBus::Events::ClearPropertyOverride)
                     ->Event("ClearPropertyOverrides", &MaterialComponentRequestBus::Events::ClearPropertyOverrides)
                     ->Event("ClearAllPropertyOverrides", &MaterialComponentRequestBus::Events::ClearAllPropertyOverrides)
@@ -121,8 +121,13 @@ namespace AZ
             MaterialComponentRequestBus::Handler::BusDisconnect();
             MaterialReceiverNotificationBus::Handler::BusDisconnect();
             TickBus::Handler::BusDisconnect();
+
             ReleaseMaterials();
 
+            // Sending notification to wipe any previously assigned material overrides
+            MaterialComponentNotificationBus::Event(
+                m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, MaterialAssignmentMap());
+
             m_queuedMaterialUpdateNotification = false;
             m_entityId = AZ::EntityId(AZ::EntityId::InvalidEntityId);
         }
@@ -221,6 +226,11 @@ namespace AZ
             if (!anyQueued)
             {
                 ReleaseMaterials();
+
+                // If no other materials were loaded, the notification must still be sent in case there are externally managed material
+                // instances in the configuration
+                MaterialComponentNotificationBus::Event(
+                    m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, m_configuration.m_materials);
             }
         }
 
@@ -268,8 +278,6 @@ namespace AZ
             {
                 materialPair.second.Release();
             }
-
-            MaterialComponentNotificationBus::Event(m_entityId, &MaterialComponentNotifications::OnMaterialsUpdated, m_configuration.m_materials);
         }
 
         MaterialAssignmentMap MaterialComponentController::GetOriginalMaterialAssignments() const
@@ -499,76 +507,6 @@ namespace AZ
             QueuePropertyChanges(materialAssignmentId);
         }
 
-        void MaterialComponentController::SetPropertyOverrideBool(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const bool& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideInt32(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const int32_t& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideUInt32(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const uint32_t& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideFloat(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const float& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideVector2(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector2& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideVector3(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector3& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideVector4(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector4& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideColor(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Color& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideImageAsset(
-            const MaterialAssignmentId& materialAssignmentId,
-            const AZStd::string& propertyName,
-            const AZ::Data::Asset<AZ::RPI::ImageAsset>& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideImageInstance(
-            const MaterialAssignmentId& materialAssignmentId,
-            const AZStd::string& propertyName,
-            const AZ::Data::Instance<AZ::RPI::Image>& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
-        void MaterialComponentController::SetPropertyOverrideString(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZStd::string& value)
-        {
-            SetPropertyOverride(materialAssignmentId, propertyName, AZStd::any(value));
-        }
-
         AZStd::any MaterialComponentController::GetPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
         {
             const auto materialIt = m_configuration.m_materials.find(materialAssignmentId);
@@ -586,83 +524,6 @@ namespace AZ
             return propertyIt->second;
         }
 
-        bool MaterialComponentController::GetPropertyOverrideBool(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<bool>() ? AZStd::any_cast<bool>(value) : false;
-        }
-
-        int32_t MaterialComponentController::GetPropertyOverrideInt32(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<int32_t>() ? AZStd::any_cast<int32_t>(value) : 0;
-        }
-
-        uint32_t MaterialComponentController::GetPropertyOverrideUInt32(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<uint32_t>() ? AZStd::any_cast<uint32_t>(value) : 0;
-        }
-
-        float MaterialComponentController::GetPropertyOverrideFloat(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<float>() ? AZStd::any_cast<float>(value) : 0.0f;
-        }
-
-        AZ::Vector2 MaterialComponentController::GetPropertyOverrideVector2(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Vector2>() ? AZStd::any_cast<AZ::Vector2>(value) : AZ::Vector2::CreateZero();
-        }
-
-        AZ::Vector3 MaterialComponentController::GetPropertyOverrideVector3(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Vector3>() ? AZStd::any_cast<AZ::Vector3>(value) : AZ::Vector3::CreateZero();
-        }
-
-        AZ::Vector4 MaterialComponentController::GetPropertyOverrideVector4(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Vector4>() ? AZStd::any_cast<AZ::Vector4>(value) : AZ::Vector4::CreateZero();
-        }
-
-        AZ::Color MaterialComponentController::GetPropertyOverrideColor(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Color>() ? AZStd::any_cast<AZ::Color>(value) : AZ::Color::CreateZero();
-        }
-
-        AZ::Data::Asset<AZ::RPI::ImageAsset> MaterialComponentController::GetPropertyOverrideImageAsset(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Data::Asset<AZ::RPI::ImageAsset>>() ? AZStd::any_cast<AZ::Data::Asset<AZ::RPI::ImageAsset>>(value) : AZ::Data::Asset<AZ::RPI::ImageAsset>();
-        }
-
-        AZ::Data::Instance<AZ::RPI::Image> MaterialComponentController::GetPropertyOverrideImageInstance(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZ::Data::Instance<AZ::RPI::Image>>() ? AZStd::any_cast<AZ::Data::Instance<AZ::RPI::Image>>(value) : AZ::Data::Instance<AZ::RPI::Image>();
-        }
-
-        AZStd::string MaterialComponentController::GetPropertyOverrideString(
-            const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const
-        {
-            const AZStd::any& value = GetPropertyOverride(materialAssignmentId, propertyName);
-            return !value.empty() && value.is<AZStd::string>() ? AZStd::any_cast<AZStd::string>(value) : AZStd::string();
-        }
-
         void MaterialComponentController::ClearPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName)
         {
             auto materialIt = m_configuration.m_materials.find(materialAssignmentId);

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.h

@@ -65,33 +65,8 @@ namespace AZ
             void SetMaterialOverride(const MaterialAssignmentId& materialAssignmentId, const AZ::Data::AssetId& materialAssetId) override;
             AZ::Data::AssetId GetMaterialOverride(const MaterialAssignmentId& materialAssignmentId) const override;
             void ClearMaterialOverride(const MaterialAssignmentId& materialAssignmentId) override;
-
             void SetPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZStd::any& value) override;
-            void SetPropertyOverrideBool(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const bool& value) override;
-            void SetPropertyOverrideInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const int32_t& value) override;
-            void SetPropertyOverrideUInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const uint32_t& value) override;
-            void SetPropertyOverrideFloat(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const float& value) override;
-            void SetPropertyOverrideVector2(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector2& value) override;
-            void SetPropertyOverrideVector3(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector3& value) override;
-            void SetPropertyOverrideVector4(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Vector4& value) override;
-            void SetPropertyOverrideColor(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Color& value) override;
-            void SetPropertyOverrideImageAsset(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Data::Asset<AZ::RPI::ImageAsset>& value) override;
-            void SetPropertyOverrideImageInstance(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZ::Data::Instance<AZ::RPI::Image>& value) override;
-            void SetPropertyOverrideString(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName, const AZStd::string& value) override;
-
             AZStd::any GetPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            bool GetPropertyOverrideBool(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            int32_t GetPropertyOverrideInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            uint32_t GetPropertyOverrideUInt32(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            float GetPropertyOverrideFloat(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Vector2 GetPropertyOverrideVector2(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Vector3 GetPropertyOverrideVector3(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Vector4 GetPropertyOverrideVector4(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Color GetPropertyOverrideColor(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Data::Asset<AZ::RPI::ImageAsset> GetPropertyOverrideImageAsset(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZ::Data::Instance<AZ::RPI::Image> GetPropertyOverrideImageInstance(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-            AZStd::string GetPropertyOverrideString(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) const override;
-
             void ClearPropertyOverride(const MaterialAssignmentId& materialAssignmentId, const AZStd::string& propertyName) override;
             void ClearPropertyOverrides(const MaterialAssignmentId& materialAssignmentId) override;
             void ClearAllPropertyOverrides() override;

Gems/EMotionFX/Code/EMotionFX/CommandSystem/Source/RagdollCommands.cpp

@@ -105,6 +105,8 @@ namespace EMotionFX
                     *jointTypeId, parentBindRotationWorld, nodeBindRotationWorld, boneDirection, exampleRotationsLocal);
 
                 AZ_Assert(jointLimitConfig, "Could not create joint limit configuration.");
+                jointLimitConfig->SetPropertyVisibility(AzPhysics::JointConfiguration::PropertyVisibility::ParentLocalRotation, true);
+                jointLimitConfig->SetPropertyVisibility(AzPhysics::JointConfiguration::PropertyVisibility::ChildLocalRotation, true);
                 return jointLimitConfig;
             }
         }

Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp

@@ -45,6 +45,7 @@ namespace Multiplayer
     void NetworkHierarchyChildComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("NetworkHierarchyChildComponent"));
+        provided.push_back(AZ_CRC_CE("MultiplayerInputDriver"));
     }
 
     void NetworkHierarchyChildComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)

Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp

@@ -53,6 +53,7 @@ namespace Multiplayer
     void NetworkHierarchyRootComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("NetworkHierarchyRootComponent"));
+        provided.push_back(AZ_CRC_CE("MultiplayerInputDriver"));
     }
 
     void NetworkHierarchyRootComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)

Gems/PhysX/Code/CMakeLists.txt

@@ -17,6 +17,7 @@ if(PAL_TRAIT_PHYSX_SUPPORTED)
     set(physx_dependency 3rdParty::PhysX)
     set(physx_files physx_files.cmake)
     set(physx_shared_files physx_shared_files.cmake)
+    set(physx_mock_files physx_mocks_files.cmake)
     set(physx_editor_files physx_editor_files.cmake)
 else()
     set(physx_files physx_unsupported_files.cmake)
@@ -151,6 +152,17 @@ endif()
 # Tests
 ################################################################################
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+    ly_add_target(
+        NAME PhysX.Mocks HEADERONLY
+        NAMESPACE Gem
+        OUTPUT_NAME PhysX.Mocks.Gem
+        FILES_CMAKE
+            physx_mocks_files.cmake
+        INCLUDE_DIRECTORIES
+            INTERFACE
+                Mocks
+    )
+
     ly_add_target(
         NAME PhysX.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
         NAMESPACE Gem
@@ -213,6 +225,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzTest
                     AZ::AzToolsFrameworkTestCommon
                     Gem::PhysX.Static
+                    Gem::PhysX.Mocks
                     Gem::PhysX.Editor.Static
             RUNTIME_DEPENDENCIES
                 Gem::LmbrCentral.Editor

Gems/PhysX/Code/Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#pragma once
+
+#include <gmock/gmock.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/Component/Component.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzFramework/Physics/HeightfieldProviderBus.h>
+
+namespace UnitTest
+{
+    class MockPhysXHeightfieldProviderComponent
+        : public AZ::Component
+    {
+    public:
+        AZ_COMPONENT(MockPhysXHeightfieldProviderComponent, "{C5F7CCCF-FDB2-40DF-992D-CF028F4A1B59}");
+
+        static void Reflect([[maybe_unused]] AZ::ReflectContext* context)
+        {
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            {
+                serializeContext->Class<MockPhysXHeightfieldProviderComponent, AZ::Component>()
+                    ->Version(1);
+            }
+        }
+
+        void Activate() override
+        {
+        }
+
+        void Deactivate() override
+        {
+        }
+
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+        {
+            provided.push_back(AZ_CRC_CE("PhysicsHeightfieldProviderService"));
+        }
+
+    };
+
+    class MockPhysXHeightfieldProvider
+        : protected Physics::HeightfieldProviderRequestsBus::Handler
+    {
+    public:
+        MockPhysXHeightfieldProvider(AZ::EntityId entityId)
+        {
+            Physics::HeightfieldProviderRequestsBus::Handler::BusConnect(entityId);
+        }
+
+        ~MockPhysXHeightfieldProvider()
+        {
+            Physics::HeightfieldProviderRequestsBus::Handler::BusDisconnect();
+        }
+
+        MOCK_CONST_METHOD0(GetHeightsAndMaterials, AZStd::vector<Physics::HeightMaterialPoint>());
+        MOCK_CONST_METHOD0(GetHeightfieldGridSpacing, AZ::Vector2());
+        MOCK_CONST_METHOD2(GetHeightfieldGridSize, void(int32_t&, int32_t&));
+        MOCK_CONST_METHOD2(GetHeightfieldHeightBounds, void(float&, float&));
+        MOCK_CONST_METHOD0(GetHeightfieldTransform, AZ::Transform());
+        MOCK_CONST_METHOD0(GetMaterialList, AZStd::vector<Physics::MaterialId>());
+        MOCK_CONST_METHOD0(GetHeights, AZStd::vector<float>());
+        MOCK_CONST_METHOD1(UpdateHeights, AZStd::vector<float>(const AZ::Aabb& dirtyRegion));
+        MOCK_CONST_METHOD1(UpdateHeightsAndMaterials, AZStd::vector<Physics::HeightMaterialPoint>(const AZ::Aabb& dirtyRegion));
+        MOCK_CONST_METHOD0(GetHeightfieldAabb, AZ::Aabb());
+    };
+
+} // namespace UnitTest

Gems/PhysX/Code/Tests/EditorHeightfieldColliderComponentTests.cpp

@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
+#include <AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h>
+#include <Tests/EditorTestUtilities.h>
+#include <EditorHeightfieldColliderComponent.h>
+#include <HeightfieldColliderComponent.h>
+#include <LmbrCentral/Shape/BoxShapeComponentBus.h>
+#include <AzFramework/Physics/HeightfieldProviderBus.h>
+#include <StaticRigidBodyComponent.h>
+#include <RigidBodyStatic.h>
+#include <PhysX/PhysXLocks.h>
+#include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
+#include <PhysX/MockPhysXHeightfieldProviderComponent.h>
+#include <AzCore/Casting/lossy_cast.h>
+
+using ::testing::NiceMock;
+using ::testing::Return;
+
+namespace PhysXEditorTests
+{
+    AZStd::vector<Physics::HeightMaterialPoint> GetSamples()
+    {
+        AZStd::vector<Physics::HeightMaterialPoint> samples{ { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 2.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 1.5f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 0.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight },
+                                                             { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight } };
+        return samples;
+    }
+
+    EntityPtr SetupHeightfieldComponent()
+    {
+        // create an editor entity with a shape collider component and a box shape component
+        EntityPtr editorEntity = CreateInactiveEditorEntity("HeightfieldColliderComponentEditorEntity");
+        editorEntity->CreateComponent<UnitTest::MockPhysXHeightfieldProviderComponent>();
+        editorEntity->CreateComponent(LmbrCentral::EditorAxisAlignedBoxShapeComponentTypeId);
+        editorEntity->CreateComponent<PhysX::EditorHeightfieldColliderComponent>();
+        AZ::ComponentApplicationBus::Broadcast(
+            &AZ::ComponentApplicationRequests::RegisterComponentDescriptor,
+            UnitTest::MockPhysXHeightfieldProviderComponent::CreateDescriptor());
+        return editorEntity;
+    }
+
+    void CleanupHeightfieldComponent()
+    {
+        AZ::ComponentApplicationBus::Broadcast(
+            &AZ::ComponentApplicationRequests::UnregisterComponentDescriptor,
+            UnitTest::MockPhysXHeightfieldProviderComponent::CreateDescriptor());
+    }
+
+    void SetupMockMethods(NiceMock<UnitTest::MockPhysXHeightfieldProvider>& mockShapeRequests)
+    {
+        ON_CALL(mockShapeRequests, GetHeightfieldTransform).WillByDefault(Return(AZ::Transform::CreateTranslation({ 1, 2, 0 })));
+        ON_CALL(mockShapeRequests, GetHeightfieldGridSpacing).WillByDefault(Return(AZ::Vector2(1, 1)));
+        ON_CALL(mockShapeRequests, GetHeightsAndMaterials).WillByDefault(Return(GetSamples()));
+        ON_CALL(mockShapeRequests, GetHeightfieldGridSize)
+            .WillByDefault(
+                [](int32_t& numColumns, int32_t& numRows)
+                {
+                    numColumns = 3;
+                    numRows = 3;
+                });
+        ON_CALL(mockShapeRequests, GetHeightfieldHeightBounds)
+            .WillByDefault(
+                [](float& x, float& y)
+                {
+                    x = -3.0f;
+                    y = 3.0f;
+                });
+    }
+
+    EntityPtr TestCreateActiveGameEntityFromEditorEntity(AZ::Entity* editorEntity)
+    {
+        EntityPtr gameEntity = AZStd::make_unique<AZ::Entity>();
+        AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+            &AzToolsFramework::ToolsApplicationRequests::PreExportEntity, *editorEntity, *gameEntity);
+        gameEntity->Init();
+        return gameEntity;
+    }
+
+
+    TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentDependenciesSatisfiedEntityIsValid)
+    {
+        EntityPtr entity = CreateInactiveEditorEntity("HeightfieldColliderComponentEditorEntity");
+        entity->CreateComponent<PhysX::EditorHeightfieldColliderComponent>();
+        entity->CreateComponent(LmbrCentral::EditorAxisAlignedBoxShapeComponentTypeId);
+        entity->CreateComponent<UnitTest::MockPhysXHeightfieldProviderComponent>()->CreateDescriptor();
+
+        // the entity should be in a valid state because the shape component and
+        // the Terrain Physics Collider Component requirement is satisfied.
+        AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+        EXPECT_TRUE(sortOutcome.IsSuccess());
+    }
+
+    TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentDependenciesMissingEntityIsInvalid)
+    {
+        EntityPtr entity = CreateInactiveEditorEntity("HeightfieldColliderComponentEditorEntity");
+        entity->CreateComponent<PhysX::EditorHeightfieldColliderComponent>();
+
+        // the entity should not be in a valid state because the heightfield collider component requires
+        // a shape component and the Terrain Physics Collider Component
+        AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+        EXPECT_FALSE(sortOutcome.IsSuccess());
+        EXPECT_TRUE(sortOutcome.GetError().m_code == AZ::Entity::DependencySortResult::MissingRequiredService);
+    }
+
+    TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentMultipleHeightfieldColliderComponentsEntityIsInvalid)
+    {
+        EntityPtr entity = CreateInactiveEditorEntity("HeightfieldColliderComponentEditorEntity");
+        entity->CreateComponent<PhysX::EditorHeightfieldColliderComponent>();
+        entity->CreateComponent(LmbrCentral::EditorAxisAlignedBoxShapeComponentTypeId);
+
+        // adding a second heightfield collider component should make the entity invalid
+        entity->CreateComponent<PhysX::EditorHeightfieldColliderComponent>();
+
+        AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
+        EXPECT_FALSE(sortOutcome.IsSuccess());
+        EXPECT_TRUE(sortOutcome.GetError().m_code == AZ::Entity::DependencySortResult::HasIncompatibleServices);
+    }
+
+    TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentHeightfieldColliderWithCorrectComponentsCorrectRuntimeComponents)
+    {
+        EntityPtr editorEntity = SetupHeightfieldComponent();
+        NiceMock<UnitTest::MockPhysXHeightfieldProvider> mockShapeRequests(editorEntity->GetId());
+        SetupMockMethods(mockShapeRequests);
+        editorEntity->Activate();
+
+        EntityPtr gameEntity = TestCreateActiveGameEntityFromEditorEntity(editorEntity.get());
+        NiceMock<UnitTest::MockPhysXHeightfieldProvider> mockShapeRequests2(gameEntity->GetId());
+        SetupMockMethods(mockShapeRequests2);
+        gameEntity->Activate();
+
+        // check that the runtime entity has the expected components
+        EXPECT_TRUE(gameEntity->FindComponent<UnitTest::MockPhysXHeightfieldProviderComponent>() != nullptr);
+        EXPECT_TRUE(gameEntity->FindComponent<PhysX::HeightfieldColliderComponent>() != nullptr);
+        EXPECT_TRUE(gameEntity->FindComponent(LmbrCentral::AxisAlignedBoxShapeComponentTypeId) != nullptr);
+
+        CleanupHeightfieldComponent();
+    }
+
+    TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentHeightfieldColliderWithAABoxCorrectRuntimeGeometry)
+    {
+        EntityPtr editorEntity = SetupHeightfieldComponent();
+        NiceMock<UnitTest::MockPhysXHeightfieldProvider> mockShapeRequests(editorEntity->GetId());
+        SetupMockMethods(mockShapeRequests);
+        editorEntity->Activate();
+
+        EntityPtr gameEntity = TestCreateActiveGameEntityFromEditorEntity(editorEntity.get());
+        NiceMock<UnitTest::MockPhysXHeightfieldProvider> mockShapeRequests2(gameEntity->GetId());
+        SetupMockMethods(mockShapeRequests2);
+        gameEntity->Activate();
+
+        AzPhysics::SimulatedBody* staticBody = nullptr;
+        AzPhysics::SimulatedBodyComponentRequestsBus::EventResult(
+            staticBody, gameEntity->GetId(), &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody);
+        const auto* pxRigidStatic = static_cast<const physx::PxRigidStatic*>(staticBody->GetNativePointer());
+
+        PHYSX_SCENE_READ_LOCK(pxRigidStatic->getScene());
+
+        // there should be a single shape on the rigid body and it should be a heightfield
+        EXPECT_EQ(pxRigidStatic->getNbShapes(), 1);
+
+        physx::PxShape* shape = nullptr;
+        pxRigidStatic->getShapes(&shape, 1, 0);
+        EXPECT_EQ(shape->getGeometryType(), physx::PxGeometryType::eHEIGHTFIELD);
+
+        physx::PxHeightFieldGeometry heightfieldGeometry;
+        shape->getHeightFieldGeometry(heightfieldGeometry);
+
+        physx::PxHeightField* heightfield = heightfieldGeometry.heightField;
+
+        int32_t numRows{ 0 };
+        int32_t numColumns{ 0 };
+        Physics::HeightfieldProviderRequestsBus::Event(
+            gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridSize, numColumns, numRows);
+        EXPECT_EQ(numColumns, heightfield->getNbColumns());
+        EXPECT_EQ(numRows, heightfield->getNbRows());
+
+        for (int sampleRow = 0; sampleRow < numRows; ++sampleRow)
+        {
+            for (int sampleColumn = 0; sampleColumn < numColumns; ++sampleColumn)
+            {
+                float minHeightBounds{ 0.0f };
+                float maxHeightBounds{ 0.0f };
+                Physics::HeightfieldProviderRequestsBus::Event(
+                    gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldHeightBounds, minHeightBounds,
+                    maxHeightBounds);
+
+                AZStd::vector<Physics::HeightMaterialPoint> samples;
+                Physics::HeightfieldProviderRequestsBus::EventResult(
+                    samples, gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials);
+                const float halfBounds{ (maxHeightBounds - minHeightBounds) / 2.0f };
+                const float scaleFactor = (maxHeightBounds <= minHeightBounds) ? 1.0f : AZStd::numeric_limits<int16_t>::max() / halfBounds;
+
+                physx::PxHeightFieldSample samplePhysX = heightfield->getSample(sampleRow, sampleColumn);
+                Physics::HeightMaterialPoint samplePhysics = samples[sampleRow * numColumns + sampleColumn];
+                EXPECT_EQ(samplePhysX.height, azlossy_cast<physx::PxI16>(samplePhysics.m_height * scaleFactor));
+            }
+        }
+        CleanupHeightfieldComponent();
+    }
+
+} // namespace PhysXEditorTests
+

Gems/PhysX/Code/physx_editor_tests_files.cmake

@@ -18,6 +18,7 @@ set(FILES
     Tests/PolygonPrismMeshUtilsTest.cpp
     Tests/PhysXColliderComponentModeTests.cpp
     Tests/ShapeColliderComponentTests.cpp
+    Tests/EditorHeightfieldColliderComponentTests.cpp
     Tests/TestColliderComponent.h
     Tests/SystemComponentTest.cpp
     Tests/RigidBodyComponentTests.cpp

Gems/PhysX/Code/physx_mocks_files.cmake

@@ -0,0 +1,11 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    Mocks/PhysX/MockPhysXHeightfieldProviderComponent.h
+)

Gems/Terrain/Code/Mocks/Terrain/MockTerrain.h

@@ -34,7 +34,8 @@ namespace UnitTest
 
         MOCK_METHOD1(RegisterArea, void(AZ::EntityId areaId));
         MOCK_METHOD1(UnregisterArea, void(AZ::EntityId areaId));
-        MOCK_METHOD1(RefreshArea, void(AZ::EntityId areaId));
+        MOCK_METHOD2(RefreshArea,
+            void(AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask));
     };
 
     class MockTerrainDataNotificationListener : public AzFramework::Terrain::TerrainDataNotificationBus::Handler

Gems/Terrain/Code/Source/Components/TerrainHeightGradientListComponent.cpp

@@ -119,7 +119,9 @@ namespace Terrain
         LmbrCentral::DependencyNotificationBus::Handler::BusDisconnect();
 
         // Since this height data will no longer exist, notify the terrain system to refresh the area.
-        TerrainSystemServiceRequestBus::Broadcast(&TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId());
+        TerrainSystemServiceRequestBus::Broadcast(
+            &TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId(),
+            AzFramework::Terrain::TerrainDataNotifications::HeightData);
     }
 
     bool TerrainHeightGradientListComponent::ReadInConfig(const AZ::ComponentConfig* baseConfig)
@@ -176,7 +178,9 @@ namespace Terrain
     void TerrainHeightGradientListComponent::OnCompositionChanged()
     {
         RefreshMinMaxHeights();
-        TerrainSystemServiceRequestBus::Broadcast(&TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId());
+        TerrainSystemServiceRequestBus::Broadcast(
+            &TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId(),
+            AzFramework::Terrain::TerrainDataNotifications::HeightData);
     }
 
     void TerrainHeightGradientListComponent::RefreshMinMaxHeights()

Gems/Terrain/Code/Source/Components/TerrainLayerSpawnerComponent.cpp

@@ -157,6 +157,12 @@ namespace Terrain
 
     void TerrainLayerSpawnerComponent::RefreshArea()
     {
-        TerrainSystemServiceRequestBus::Broadcast(&TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId());
+        using Terrain = AzFramework::Terrain::TerrainDataNotifications;
+
+        // Notify the terrain system that the entire layer has changed, so both height and surface data can be affected.
+        TerrainSystemServiceRequestBus::Broadcast(
+            &TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId(),
+            static_cast<Terrain::TerrainDataChangedMask>(Terrain::HeightData | Terrain::SurfaceData)
+        );
     }
 }

Gems/Terrain/Code/Source/Components/TerrainSurfaceGradientListComponent.cpp

@@ -184,7 +184,9 @@ namespace Terrain
 
     void TerrainSurfaceGradientListComponent::OnCompositionChanged()
     {
-        TerrainSystemServiceRequestBus::Broadcast(&TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId());
+        TerrainSystemServiceRequestBus::Broadcast(
+            &TerrainSystemServiceRequestBus::Events::RefreshArea, GetEntityId(),
+            AzFramework::Terrain::TerrainDataNotifications::SurfaceData);
     }
 
 } // namespace Terrain

Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp

@@ -218,9 +218,11 @@ namespace Terrain
 
         const AZ::Transform transform = AZ::Transform::CreateTranslation(worldBounds.GetCenter());
         
-        AZ::Vector2 queryResolution = AZ::Vector2(1.0f);
+        AZ::Vector2 queryResolution2D = AZ::Vector2(1.0f);
         AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(
-            queryResolution, &AzFramework::Terrain::TerrainDataRequests::GetTerrainHeightQueryResolution);
+            queryResolution2D, &AzFramework::Terrain::TerrainDataRequests::GetTerrainHeightQueryResolution);
+        // Currently query resolution is multidimensional but the rendering system only supports this changing in one dimension.
+        float queryResolution = queryResolution2D.GetX();
 
         // Sectors need to be rebuilt if the world bounds change in the x/y, or the sample spacing changes.
         m_areaData.m_rebuildSectors = m_areaData.m_rebuildSectors ||
@@ -228,16 +230,11 @@ namespace Terrain
             m_areaData.m_terrainBounds.GetMin().GetY() != worldBounds.GetMin().GetY() ||
             m_areaData.m_terrainBounds.GetMax().GetX() != worldBounds.GetMax().GetX() ||
             m_areaData.m_terrainBounds.GetMax().GetY() != worldBounds.GetMax().GetY() ||
-            m_areaData.m_sampleSpacing != queryResolution.GetX();
+            m_areaData.m_sampleSpacing != queryResolution;
 
         m_areaData.m_transform = transform;
         m_areaData.m_terrainBounds = worldBounds;
-        m_areaData.m_heightmapImageWidth = aznumeric_cast<uint32_t>(worldBounds.GetXExtent() / queryResolution.GetX());
-        m_areaData.m_heightmapImageHeight = aznumeric_cast<uint32_t>(worldBounds.GetYExtent() / queryResolution.GetY());
-        m_areaData.m_updateWidth = aznumeric_cast<uint32_t>(m_dirtyRegion.GetXExtent() / queryResolution.GetX());
-        m_areaData.m_updateHeight = aznumeric_cast<uint32_t>(m_dirtyRegion.GetYExtent() / queryResolution.GetY());
-        // Currently query resolution is multidimensional but the rendering system only supports this changing in one dimension.
-        m_areaData.m_sampleSpacing = queryResolution.GetX();
+        m_areaData.m_sampleSpacing = queryResolution;
         m_areaData.m_heightmapUpdated = true;
     }
 
@@ -778,32 +775,43 @@ namespace Terrain
 
     void TerrainFeatureProcessor::UpdateTerrainData()
     {
-        uint32_t width = m_areaData.m_updateWidth;
-        uint32_t height = m_areaData.m_updateHeight;
-        const AZ::Aabb& worldBounds = m_areaData.m_terrainBounds;
+
         const float queryResolution = m_areaData.m_sampleSpacing;
+        const AZ::Aabb& worldBounds = m_areaData.m_terrainBounds;
 
-        const AZ::RHI::Size worldSize = AZ::RHI::Size(m_areaData.m_heightmapImageWidth, m_areaData.m_heightmapImageHeight, 1);
+        int32_t heightmapImageXStart = aznumeric_cast<int32_t>(AZStd::ceilf(worldBounds.GetMin().GetX() / queryResolution));
+        int32_t heightmapImageXEnd = aznumeric_cast<int32_t>(AZStd::floorf(worldBounds.GetMax().GetX() / queryResolution)) + 1;
+        int32_t heightmapImageYStart = aznumeric_cast<int32_t>(AZStd::ceilf(worldBounds.GetMin().GetY() / queryResolution));
+        int32_t heightmapImageYEnd = aznumeric_cast<int32_t>(AZStd::floorf(worldBounds.GetMax().GetY() / queryResolution)) + 1;
+        uint32_t heightmapImageWidth = heightmapImageXEnd - heightmapImageXStart;
+        uint32_t heightmapImageHeight = heightmapImageYEnd - heightmapImageYStart;
 
-        if (!m_areaData.m_heightmapImage || m_areaData.m_heightmapImage->GetDescriptor().m_size != worldSize)
+        const AZ::RHI::Size heightmapSize = AZ::RHI::Size(heightmapImageWidth, heightmapImageHeight, 1);
+
+        if (!m_areaData.m_heightmapImage || m_areaData.m_heightmapImage->GetDescriptor().m_size != heightmapSize)
         {
-            // World size changed, so the whole world needs updating.
-            width = worldSize.m_width;
-            height = worldSize.m_height;
-            m_dirtyRegion = worldBounds;
-
             const AZ::Data::Instance<AZ::RPI::AttachmentImagePool> imagePool = AZ::RPI::ImageSystemInterface::Get()->GetSystemAttachmentPool();
             AZ::RHI::ImageDescriptor imageDescriptor = AZ::RHI::ImageDescriptor::Create2D(
-                AZ::RHI::ImageBindFlags::ShaderRead, width, height, AZ::RHI::Format::R16_UNORM
+                AZ::RHI::ImageBindFlags::ShaderRead, heightmapSize.m_width, heightmapSize.m_height, AZ::RHI::Format::R16_UNORM
             );
 
             const AZ::Name TerrainHeightmapName = AZ::Name(TerrainHeightmapChars);
             m_areaData.m_heightmapImage = AZ::RPI::AttachmentImage::Create(*imagePool.get(), imageDescriptor, TerrainHeightmapName, nullptr, nullptr);
             AZ_Error(TerrainFPName, m_areaData.m_heightmapImage, "Failed to initialize the heightmap image.");
+            
+            // World size changed, so the whole height map needs updating.
+            m_dirtyRegion = worldBounds;
         }
+        
+        int32_t xStart = aznumeric_cast<int32_t>(AZStd::ceilf(m_dirtyRegion.GetMin().GetX() / queryResolution));
+        int32_t xEnd = aznumeric_cast<int32_t>(AZStd::floorf(m_dirtyRegion.GetMax().GetX() / queryResolution)) + 1;
+        int32_t yStart = aznumeric_cast<int32_t>(AZStd::ceilf(m_dirtyRegion.GetMin().GetY() / queryResolution));
+        int32_t yEnd = aznumeric_cast<int32_t>(AZStd::floorf(m_dirtyRegion.GetMax().GetY() / queryResolution)) + 1;
+        uint32_t updateWidth = xEnd - xStart;
+        uint32_t updateHeight = yEnd - yStart;
 
         AZStd::vector<uint16_t> pixels;
-        pixels.reserve(width * height);
+        pixels.reserve(updateWidth * updateHeight);
 
         {
             // Block other threads from accessing the surface data bus while we are in GetHeightFromFloats (which may call into the SurfaceData bus).
@@ -815,18 +823,17 @@ namespace Terrain
             auto& surfaceDataContext = SurfaceData::SurfaceDataSystemRequestBus::GetOrCreateContext(false);
             typename SurfaceData::SurfaceDataSystemRequestBus::Context::DispatchLockGuard scopeLock(surfaceDataContext.m_contextMutex);
 
-            for (uint32_t y = 0; y < height; y++)
+            for (int32_t y = yStart; y < yEnd; y++)
             {
-                for (uint32_t x = 0; x < width; x++)
+                for (int32_t x = xStart; x < xEnd; x++)
                 {
                     bool terrainExists = true;
                     float terrainHeight = 0.0f;
+                    float xPos = x * queryResolution;
+                    float yPos = y * queryResolution;
                     AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult(
                         terrainHeight, &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats,
-                        (x * queryResolution) + m_dirtyRegion.GetMin().GetX(),
-                        (y * queryResolution) + m_dirtyRegion.GetMin().GetY(),
-                        AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT,
-                        &terrainExists);
+                        xPos, yPos, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists);
 
                     const float clampedHeight = AZ::GetClamp((terrainHeight - worldBounds.GetMin().GetZ()) / worldBounds.GetExtents().GetZ(), 0.0f, 1.0f);
                     const float expandedHeight = AZStd::roundf(clampedHeight * AZStd::numeric_limits<uint16_t>::max());
@@ -839,16 +846,18 @@ namespace Terrain
 
         if (m_areaData.m_heightmapImage)
         {
-            const float left = (m_dirtyRegion.GetMin().GetX() - worldBounds.GetMin().GetX()) / queryResolution;
-            const float top = (m_dirtyRegion.GetMin().GetY() - worldBounds.GetMin().GetY()) / queryResolution;
+            constexpr uint32_t BytesPerPixel = sizeof(uint16_t);
+            const float left = xStart - (worldBounds.GetMin().GetX() / queryResolution);
+            const float top = yStart - (worldBounds.GetMin().GetY() / queryResolution);
+
             AZ::RHI::ImageUpdateRequest imageUpdateRequest;
             imageUpdateRequest.m_imageSubresourcePixelOffset.m_left = aznumeric_cast<uint32_t>(left);
             imageUpdateRequest.m_imageSubresourcePixelOffset.m_top = aznumeric_cast<uint32_t>(top);
-            imageUpdateRequest.m_sourceSubresourceLayout.m_bytesPerRow = width * sizeof(uint16_t);
-            imageUpdateRequest.m_sourceSubresourceLayout.m_bytesPerImage = width * height * sizeof(uint16_t);
-            imageUpdateRequest.m_sourceSubresourceLayout.m_rowCount = height;
-            imageUpdateRequest.m_sourceSubresourceLayout.m_size.m_width = width;
-            imageUpdateRequest.m_sourceSubresourceLayout.m_size.m_height = height;
+            imageUpdateRequest.m_sourceSubresourceLayout.m_bytesPerRow = updateWidth * BytesPerPixel;
+            imageUpdateRequest.m_sourceSubresourceLayout.m_bytesPerImage = updateWidth * updateHeight * BytesPerPixel;
+            imageUpdateRequest.m_sourceSubresourceLayout.m_rowCount = updateHeight;
+            imageUpdateRequest.m_sourceSubresourceLayout.m_size.m_width = updateWidth;
+            imageUpdateRequest.m_sourceSubresourceLayout.m_size.m_height = updateHeight;
             imageUpdateRequest.m_sourceSubresourceLayout.m_size.m_depth = 1;
             imageUpdateRequest.m_sourceData = pixels.data();
             imageUpdateRequest.m_image = m_areaData.m_heightmapImage->GetRHIImage();
@@ -1106,6 +1115,12 @@ namespace Terrain
                 m_areaData.m_heightmapUpdated = false;
                 m_areaData.m_macroMaterialsUpdated = false;
 
+                AZStd::array<float, 2> uvStep =
+                {
+                    1.0f / aznumeric_cast<uint32_t>(m_areaData.m_terrainBounds.GetXExtent() / m_areaData.m_sampleSpacing),
+                    1.0f / aznumeric_cast<uint32_t>(m_areaData.m_terrainBounds.GetYExtent() / m_areaData.m_sampleSpacing),
+                };
+
                 for (SectorData& sectorData : m_sectorData)
                 {
                     ShaderTerrainData terrainDataForSrg;
@@ -1123,11 +1138,7 @@ namespace Terrain
                         ((yPatch + GridMeters) - terrainBounds.GetMin().GetY()) / terrainBounds.GetYExtent()
                     };
 
-                    terrainDataForSrg.m_uvStep =
-                    {
-                        1.0f / m_areaData.m_heightmapImageWidth,
-                        1.0f / m_areaData.m_heightmapImageHeight,
-                    };
+                    terrainDataForSrg.m_uvStep = uvStep;
 
                     AZ::Transform transform = m_areaData.m_transform;
                     transform.SetTranslation(xPatch, yPatch, m_areaData.m_transform.GetTranslation().GetZ());

Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.h

@@ -303,10 +303,6 @@ namespace Terrain
             AZ::Transform m_transform{ AZ::Transform::CreateIdentity() };
             AZ::Aabb m_terrainBounds{ AZ::Aabb::CreateNull() };
             AZ::Data::Instance<AZ::RPI::AttachmentImage> m_heightmapImage;
-            uint32_t m_heightmapImageWidth{ 0 };
-            uint32_t m_heightmapImageHeight{ 0 };
-            uint32_t m_updateWidth{ 0 };
-            uint32_t m_updateHeight{ 0 };
             float m_sampleSpacing{ 0.0f };
             bool m_heightmapUpdated{ true };
             bool m_macroMaterialsUpdated{ true };

Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp

@@ -76,6 +76,7 @@ void TerrainSystem::Activate()
     m_dirtyRegion = AZ::Aabb::CreateNull();
     m_terrainHeightDirty = true;
     m_terrainSettingsDirty = true;
+    m_terrainSurfacesDirty = true;
     m_requestedSettings.m_systemActive = true;
 
     {
@@ -115,6 +116,7 @@ void TerrainSystem::Deactivate()
     m_dirtyRegion = AZ::Aabb::CreateNull();
     m_terrainHeightDirty = true;
     m_terrainSettingsDirty = true;
+    m_terrainSurfacesDirty = true;
     m_requestedSettings.m_systemActive = false;
 
     AzFramework::Terrain::TerrainDataNotificationBus::Broadcast(
@@ -549,6 +551,7 @@ void TerrainSystem::RegisterArea(AZ::EntityId areaId)
     m_registeredAreas[areaId] = aabb;
     m_dirtyRegion.AddAabb(aabb);
     m_terrainHeightDirty = true;
+    m_terrainSurfacesDirty = true;
 }
 
 void TerrainSystem::UnregisterArea(AZ::EntityId areaId)
@@ -567,14 +570,17 @@ void TerrainSystem::UnregisterArea(AZ::EntityId areaId)
             {
                 m_dirtyRegion.AddAabb(aabb);
                 m_terrainHeightDirty = true;
+                m_terrainSurfacesDirty = true;
                 return true;
             }
             return false;
         });
 }
 
-void TerrainSystem::RefreshArea(AZ::EntityId areaId)
+void TerrainSystem::RefreshArea(AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask)
 {
+    using Terrain = AzFramework::Terrain::TerrainDataNotifications;
+
     AZStd::unique_lock<AZStd::shared_mutex> lock(m_areaMutex);
 
     auto areaAabb = m_registeredAreas.find(areaId);
@@ -588,11 +594,18 @@ void TerrainSystem::RefreshArea(AZ::EntityId areaId)
     expandedAabb.AddAabb(newAabb);
 
     m_dirtyRegion.AddAabb(expandedAabb);
-    m_terrainHeightDirty = true;
+
+    // Keep track of which types of data have changed so that we can send out the appropriate notifications later.
+
+    m_terrainHeightDirty = m_terrainHeightDirty || ((changeMask & Terrain::HeightData) == Terrain::HeightData);
+
+    m_terrainSurfacesDirty = m_terrainSurfacesDirty || ((changeMask & Terrain::SurfaceData) == Terrain::SurfaceData);
 }
 
 void TerrainSystem::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
 {
+    using Terrain = AzFramework::Terrain::TerrainDataNotifications;
+
     bool terrainSettingsChanged = false;
 
     if (m_terrainSettingsDirty)
@@ -607,6 +620,7 @@ void TerrainSystem::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
             m_dirtyRegion = m_currentSettings.m_worldBounds;
             m_dirtyRegion.AddAabb(m_requestedSettings.m_worldBounds);
             m_terrainHeightDirty = true;
+            m_terrainSurfacesDirty = true;
             m_currentSettings.m_worldBounds = m_requestedSettings.m_worldBounds;
         }
 
@@ -614,12 +628,13 @@ void TerrainSystem::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
         {
             m_dirtyRegion = AZ::Aabb::CreateNull();
             m_terrainHeightDirty = true;
+            m_terrainSurfacesDirty = true;
         }
 
         m_currentSettings = m_requestedSettings;
     }
 
-    if (terrainSettingsChanged || m_terrainHeightDirty)
+    if (terrainSettingsChanged || m_terrainHeightDirty || m_terrainSurfacesDirty)
     {
         // Block other threads from accessing the surface data bus while we are in GetValue (which may call into the SurfaceData bus).
         // We lock our surface data mutex *before* checking / setting "isRequestInProgress" so that we prevent race conditions
@@ -629,24 +644,27 @@ void TerrainSystem::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint /*time*/)
         auto& surfaceDataContext = SurfaceData::SurfaceDataSystemRequestBus::GetOrCreateContext(false);
         typename SurfaceData::SurfaceDataSystemRequestBus::Context::DispatchLockGuard scopeLock(surfaceDataContext.m_contextMutex);
 
-        AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask =
-            AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask::None;
+        Terrain::TerrainDataChangedMask changeMask = Terrain::TerrainDataChangedMask::None;
 
         if (terrainSettingsChanged)
         {
-            changeMask = static_cast<AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask>(
-                changeMask | AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask::Settings);
+            changeMask = static_cast<Terrain::TerrainDataChangedMask>(changeMask | Terrain::TerrainDataChangedMask::Settings);
         }
         if (m_terrainHeightDirty)
         {
-            changeMask = static_cast<AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask>(
-                changeMask | AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask::HeightData);
+            changeMask = static_cast<Terrain::TerrainDataChangedMask>(changeMask | Terrain::TerrainDataChangedMask::HeightData);
+        }
+
+        if (m_terrainSurfacesDirty)
+        {
+            changeMask = static_cast<Terrain::TerrainDataChangedMask>(changeMask | Terrain::TerrainDataChangedMask::SurfaceData);
         }
 
         // Make sure to set these *before* calling OnTerrainDataChanged, since it's possible that subsystems reacting to that call will
         // cause the data to become dirty again.
         AZ::Aabb dirtyRegion = m_dirtyRegion;
         m_terrainHeightDirty = false;
+        m_terrainSurfacesDirty = false;
         m_dirtyRegion = AZ::Aabb::CreateNull();
 
         AzFramework::Terrain::TerrainDataNotificationBus::Broadcast(

Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h

@@ -47,7 +47,8 @@ namespace Terrain
 
         void RegisterArea(AZ::EntityId areaId) override;
         void UnregisterArea(AZ::EntityId areaId) override;
-        void RefreshArea(AZ::EntityId areaId) override;
+        void RefreshArea(
+            AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask) override;
 
         ///////////////////////////////////////////
         // TerrainDataRequestBus::Handler Impl
@@ -164,6 +165,7 @@ namespace Terrain
 
         bool m_terrainSettingsDirty = true;
         bool m_terrainHeightDirty = false;
+        bool m_terrainSurfacesDirty = false;
         AZ::Aabb m_dirtyRegion;
 
         mutable AZStd::shared_mutex m_areaMutex;

Gems/Terrain/Code/Source/TerrainSystem/TerrainSystemBus.h

@@ -44,7 +44,7 @@ namespace Terrain
         // register an area to override terrain
         virtual void RegisterArea(AZ::EntityId areaId) = 0;
         virtual void UnregisterArea(AZ::EntityId areaId) = 0;
-        virtual void RefreshArea(AZ::EntityId areaId) = 0;
+        virtual void RefreshArea(AZ::EntityId areaId, AzFramework::Terrain::TerrainDataNotifications::TerrainDataChangedMask changeMask) = 0;
     };
 
     using TerrainSystemServiceRequestBus = AZ::EBus<TerrainSystemServiceRequests>;

Gems/Terrain/Code/Tests/LayerSpawnerTests.cpp

@@ -190,7 +190,7 @@ TEST_F(LayerSpawnerComponentTest, LayerSpawnerTransformChangedUpdatesTerrainSyst
     CreateMockTerrainSystem();
 
     // The TransformChanged call should refresh the area.
-    EXPECT_CALL(*m_terrainSystem, RefreshArea(_)).Times(1);
+    EXPECT_CALL(*m_terrainSystem, RefreshArea(_, _)).Times(1);
 
     AddLayerSpawnerAndShapeComponentToEntity();
 
@@ -211,7 +211,7 @@ TEST_F(LayerSpawnerComponentTest, LayerSpawnerShapeChangedUpdatesTerrainSystem)
     CreateMockTerrainSystem();
 
     // The ShapeChanged call should refresh the area.
-    EXPECT_CALL(*m_terrainSystem, RefreshArea(_)).Times(1);
+    EXPECT_CALL(*m_terrainSystem, RefreshArea(_, _)).Times(1);
 
     AddLayerSpawnerAndShapeComponentToEntity();
 

Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp

@@ -93,7 +93,7 @@ TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientRefreshesTer
     // As the TerrainHeightGradientListComponent subscribes to the dependency monitor, RefreshArea will be called twice:
     // once due to OnCompositionChanged being picked up by the the dependency monitor and resending the notification,
     // and once when the HeightGradientListComponent gets the OnCompositionChanged directly through the DependencyNotificationBus.
-    EXPECT_CALL(terrainSystem, RefreshArea(_)).Times(2);
+    EXPECT_CALL(terrainSystem, RefreshArea(_, _)).Times(2);
 
     LmbrCentral::DependencyNotificationBus::Event(m_entity->GetId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
 

Templates/CMakeLists.txt

@@ -9,8 +9,8 @@
 ly_install_directory(
     DIRECTORIES 
         AssetGem
-        CustomTool
-        PythonGem
+        CppToolGem
+        PythonToolGem
         DefaultGem
         DefaultProject
         MinimalProject

Templates/CppToolGem/template.json

@@ -1,12 +1,12 @@
 {
-    "template_name": "CustomTool",
-    "origin": "The primary repo for CustomTool goes here: i.e. http://www.mydomain.com",
-    "license": "What license CustomTool uses goes here: i.e. https://opensource.org/licenses/MIT",
-    "display_name": "CustomTool",
+    "template_name": "CppToolGem",
+    "origin": "The primary repo for CppToolGem goes here: i.e. http://www.mydomain.com",
+    "license": "What license CppToolGem uses goes here: i.e. https://opensource.org/licenses/MIT",
+    "display_name": "CppToolGem",
     "summary": "A gem template for a custom tool in C++ that gets registered with the Editor.",
     "canonical_tags": [],
     "user_tags": [
-        "CustomTool"
+        "CppToolGem"
     ],
     "icon_path": "preview.png",
     "copyFiles": [