Integrating latest 47acbe8

Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp

@@ -44,7 +44,7 @@ namespace ScriptEvents
             m_assetHandler = AZStd::make_unique<ScriptEventsEditor::ScriptEventAssetHandler>(
                 ScriptEvents::ScriptEventsAsset::GetDisplayName(),
                 ScriptEvents::ScriptEventsAsset::GetGroup(),
-                ScriptEvents::ScriptEventsAsset::GetFileExtension(),
+                ScriptEvents::ScriptEventsAsset::GetFileFilter(),
                 AZ::AzTypeInfo<ScriptEventsEditor::ScriptEventEditorSystemComponent>::Uuid());
             AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType);
 
@@ -52,7 +52,7 @@ namespace ScriptEvents
             AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType);
             AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType);
             AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension,
-                ScriptEvents::ScriptEventsAsset::GetFileExtension());
+                ScriptEvents::ScriptEventsAsset::GetFileFilter());
         }
 
         void UnregisterAssetHandler() override

Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp

@@ -24,6 +24,7 @@
 #include <ScriptEvents/ScriptEventsBus.h>
 
 #include <ScriptEvents/ScriptEventSystem.h>
+#include <ScriptEvents/ScriptEvent.h>
 
 #if defined(SCRIPTEVENTS_EDITOR)
 
@@ -55,13 +56,24 @@ namespace ScriptEventsEditor
         return assetPtr;
     }
 
+    void ScriptEventAssetHandler::InitAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadStageSucceeded, bool isReload)
+    {
+        AssetHandler::InitAsset(asset, loadStageSucceeded, isReload);
+
+        if (loadStageSucceeded && !isReload)
+        {
+            const ScriptEvents::ScriptEvent& definition = asset.GetAs<ScriptEvents::ScriptEventsAsset>()->m_definition;
+            AZStd::intrusive_ptr<ScriptEvents::Internal::ScriptEventRegistration> scriptEvent;
+            ScriptEvents::ScriptEventBus::BroadcastResult(scriptEvent, &ScriptEvents::ScriptEventRequests::RegisterScriptEvent, asset.GetId(), definition.GetVersion());
+        }
+    }
+
     AZ::Data::AssetHandler::LoadResult ScriptEventAssetHandler::LoadAssetData(
-        const AZ::Data::Asset<AZ::Data::AssetData>& asset,
+        const AZ::Data::Asset<AZ::Data::AssetData>& asset, 
         AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
         const AZ::Data::AssetFilterCB& assetLoadFilterCB)
     {
-        AZ::Data::AssetHandler::LoadResult loadedData =
-            AzFramework::GenericAssetHandler<ScriptEvents::ScriptEventsAsset>::LoadAssetData(asset, stream, assetLoadFilterCB);
+        AZ::Data::AssetHandler::LoadResult loadedData = loadedData = AzFramework::GenericAssetHandler<ScriptEvents::ScriptEventsAsset>::LoadAssetData(asset, stream, assetLoadFilterCB);
 
         if (loadedData == AZ::Data::AssetHandler::LoadResult::LoadComplete)
         {

Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.h

@@ -46,6 +46,7 @@ namespace ScriptEventsEditor
             const AZ::Data::AssetFilterCB& assetLoadFilterCB) override;
         bool SaveAssetData(const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZ::IO::GenericStream* stream) override;
 
+        void InitAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset, bool loadStageSucceeded, bool isReload) override;
 
         // AssetEditorValidationRequestBus::Handler
         AZ::Outcome<bool, AZStd::string> IsAssetDataValid(const AZ::Data::Asset<AZ::Data::AssetData>& asset) override;
@@ -83,7 +84,7 @@ namespace ScriptEventsEditor
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
 
         ////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
+        // AZ::Component...
         void Init() override {}
         void Activate() override;
         void Deactivate() override;
@@ -92,7 +93,7 @@ namespace ScriptEventsEditor
         AZStd::vector<AZStd::unique_ptr<AzToolsFramework::PropertyHandlerBase>> m_propertyHandlers;
 
         // Script Event Assets
-        AZStd::unordered_map<ScriptEvents::ScriptEventKey, AZStd::intrusive_ptr<ScriptEvents::Internal::ScriptEvent>> m_scriptEvents;
+        AZStd::unordered_map<ScriptEvents::ScriptEventKey, AZStd::intrusive_ptr<ScriptEvents::Internal::ScriptEventRegistration>> m_scriptEvents;
 
     };
 }

Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp

@@ -117,7 +117,7 @@ namespace ScriptEvents
         }
 
         m_assetHandler = AZStd::make_unique<ScriptEventAssetRuntimeHandler>(ScriptEvents::ScriptEventsAsset::GetDisplayName(),
-            ScriptEvents::ScriptEventsAsset::GetGroup(), ScriptEvents::ScriptEventsAsset::GetFileExtension(),
+            ScriptEvents::ScriptEventsAsset::GetGroup(), ScriptEvents::ScriptEventsAsset::GetFileFilter(),
             AZ::AzTypeInfo<ScriptEvents::ScriptEventsSystemComponent>::Uuid());
 
         AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType);
@@ -126,7 +126,7 @@ namespace ScriptEvents
         AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType);
         AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType);
         AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension,
-            ScriptEvents::ScriptEventsAsset::GetFileExtension());
+            ScriptEvents::ScriptEventsAsset::GetFileFilter());
     }
 
     void ScriptEventsSystemComponentRuntimeImpl::UnregisterAssetHandler()

Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.h

@@ -43,14 +43,14 @@ namespace ScriptEvents
     protected:
 
         ////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
+        // AZ::Component...
         void Init() override;
         void Activate() override;
         void Deactivate() override;
         ////////////////////////////////////////////////////////////////////////
 
         // Script Event Assets
-        AZStd::unordered_map<ScriptEventKey, AZStd::intrusive_ptr<ScriptEvents::Internal::ScriptEvent>> m_scriptEvents;
+        AZStd::unordered_map<ScriptEventKey, AZStd::intrusive_ptr<ScriptEvents::Internal::ScriptEventRegistration>> m_scriptEvents;
 
     };