Add asset picker support to spawn SC node and thread safety measures

Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl

@@ -123,6 +123,7 @@ namespace AZ
 
             const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
             const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
+            const static AZ::Crc32 HideProductFilesInAssetPicker = AZ_CRC_CE("HideProductFilesInAssetPicker");
             const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
             //! Container attribute that is used to override labels for its elements given the index of the element
             const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);

Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp

@@ -10,6 +10,7 @@
 *
 */
 
+#include <AzCore/Casting/lossy_cast.h>
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/std/string/string.h>
 #include <AzFramework/Spawnable/Spawnable.h>
@@ -88,4 +89,10 @@ namespace AzFramework
     {
         extensions.push_back(Spawnable::FileExtension);
     }
+
+    uint32_t SpawnableAssetHandler::BuildSubId(AZStd::string_view id)
+    {
+        AZ::Uuid subIdHash = AZ::Uuid::CreateData(id.data(), id.size());
+        return azlossy_caster(subIdHash.GetHash());
+    }
 } // namespace AzFramework

Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.h

@@ -47,6 +47,7 @@ namespace AzFramework
         const char* GetGroup() const override;
         const char* GetBrowserIcon() const override;
         void GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions) override;
+        static uint32_t BuildSubId(AZStd::string_view id);
         
     protected:
         LoadResult LoadAssetData(

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.cpp

@@ -10,7 +10,7 @@
  *
  */
 
-#include <AzCore/Casting/lossy_cast.h>
+#include <AzFramework/Spawnable/SpawnableAssetHandler.h>
 #include <AzToolsFramework/Prefab/Spawnable/ProcesedObjectStore.h>
 
 namespace AzToolsFramework::Prefab::PrefabConversionUtils
@@ -73,8 +73,7 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
 
     uint32_t ProcessedObjectStore::BuildSubId(AZStd::string_view id)
     {
-        AZ::Uuid subIdHash = AZ::Uuid::CreateData(id.data(), id.size());
-        return azlossy_caster(subIdHash.GetHash());
+        return AzFramework::SpawnableAssetHandler::BuildSubId(id);
     }
 
     const AZStd::string& ProcessedObjectStore::GetId() const

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

@@ -777,6 +777,23 @@ namespace AzToolsFramework
             selection.SetDefaultDirectory(defaultDirectory);
         }
 
+        if (m_hideProductFilesInAssetPicker)
+        {
+            FilterConstType displayFilter = selection.GetDisplayFilter();
+
+            EntryTypeFilter* productsFilter = new EntryTypeFilter();
+            productsFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Product);
+
+            InverseFilter* noProductsFilter = new InverseFilter();
+            noProductsFilter->SetFilter(FilterConstType(productsFilter));
+
+            CompositeFilter* compFilter = new CompositeFilter(CompositeFilter::LogicOperatorType::AND);
+            compFilter->AddFilter(FilterConstType(displayFilter));
+            compFilter->AddFilter(FilterConstType(noProductsFilter));
+
+            selection.SetDisplayFilter(FilterConstType(compFilter));
+        }
+
         AssetBrowserComponentRequestBus::Broadcast(&AssetBrowserComponentRequests::PickAssets, selection, parentWidget());
         if (selection.IsValid())
         {
@@ -785,7 +802,16 @@ namespace AzToolsFramework
             AZ_Assert(product || folder, "Incorrect entry type selected. Expected product or folder.");
             if (product)
             {
-                SetSelectedAssetID(product->GetAssetId());
+                AZ::Data::AssetId selectedAssetId = product->GetAssetId();
+
+                // If we hid the product files a source asset was picked
+                // Clear the sub id as a source could have N products with different sub ids
+                if (m_hideProductFilesInAssetPicker)
+                {
+                    selectedAssetId.m_subId = 0;
+                }
+
+                SetSelectedAssetID(selectedAssetId);
             }
             else if (folder)
             {
@@ -1172,6 +1198,16 @@ namespace AzToolsFramework
         return m_showProductAssetName;
     }
 
+    void PropertyAssetCtrl::SetHideProductFilesInAssetPicker(bool hide)
+    {
+        m_hideProductFilesInAssetPicker = hide;
+    }
+
+    bool PropertyAssetCtrl::GetHideProductFilesInAssetPicker() const
+    {
+        return m_hideProductFilesInAssetPicker;
+    }
+
     void PropertyAssetCtrl::SetShowThumbnail(bool enable)
     {
         m_showThumbnail = enable;
@@ -1297,6 +1333,14 @@ namespace AzToolsFramework
                 GUI->SetShowProductAssetName(showProductAssetName);
             }
         }
+        else if(attrib == AZ::Edit::Attributes::HideProductFilesInAssetPicker)
+        {
+            bool hideProductFilesInAssetPicker = false;
+            if (attrValue->Read<bool>(hideProductFilesInAssetPicker))
+            {
+                GUI->SetHideProductFilesInAssetPicker(hideProductFilesInAssetPicker);
+            }
+        }
         else if (attrib == AZ::Edit::Attributes::ClearNotify)
         {
             PropertyAssetCtrl::ClearCallbackType* func = azdynamic_cast<PropertyAssetCtrl::ClearCallbackType*>(attrValue->GetAttribute());

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

@@ -158,6 +158,10 @@ namespace AzToolsFramework
         //! Assets can be either source or product assets generated from source assets. By default, source assets are shown in the property asset. You can override that with this flag.
         bool m_showProductAssetName = true;
 
+        //! Assets can be either source or product assets generated from source assets.
+        //! By default the asset picker shows both on an AZ::Asset<> property. You can hide product assets with this flag.
+        bool m_hideProductFilesInAssetPicker = false;
+
         bool m_showThumbnail = false;
         bool m_showThumbnailDropDownButton = false;
         EditCallbackType* m_thumbnailCallback = nullptr;
@@ -211,6 +215,9 @@ namespace AzToolsFramework
         void SetShowProductAssetName(bool enable);
         bool GetShowProductAssetName() const;
 
+        void SetHideProductFilesInAssetPicker(bool hide);
+        bool GetHideProductFilesInAssetPicker() const;
+
         void SetShowThumbnail(bool enable);
         bool GetShowThumbnail() const;
         void SetShowThumbnailDropDownButton(bool enable);