birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes for Gems

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:51:12 -07:00
parent 9245a31196
commit ea2f74dc0f
66 changed files with 62 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAssetRef.h
-1
View File
@@ -135,7 +135,6 @@ namespace ScriptEvents
AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, m_asset.GetId());
if (assetInfo.m_assetId.IsValid())
{
const AZ::Data::AssetType assetTypeId = azrtti_typeid<ScriptEventsAsset>();
auto& assetManager = AZ::Data::AssetManager::Instance();
m_asset = assetManager.GetAsset(m_asset.GetId(), azrtti_typeid<ScriptEventsAsset>(), m_asset.GetAutoLoadBehavior());
Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp
-20
View File
@@ -406,26 +406,6 @@ namespace ScriptEventsTests
EXPECT_TRUE(behaviorEbus->m_destroyHandler->Invoke(handler));
auto onReady = [&assetData, &scriptEventName]() {
const char* renamedMethod = "__METHOD__1__";
ScriptEvents::ScriptEventsAsset* loadedScriptAsset = assetData.GetAs<ScriptEvents::ScriptEventsAsset>();
EXPECT_TRUE(loadedScriptAsset);
const ScriptEvents::ScriptEvent& loadedDefinition = loadedScriptAsset->m_definition;
EXPECT_EQ(loadedDefinition.GetVersion(), 0);
EXPECT_STREQ(loadedDefinition.GetName().data(), scriptEventName.c_str());
ScriptEvents::Method method;
bool foundMethod = loadedDefinition.FindMethod(renamedMethod, method);
EXPECT_TRUE(foundMethod);
EXPECT_EQ(method.GetNameProperty().GetVersion(), 1);
assetData = {};
};
AssetEventHandler assetHandler2(assetId, []() {}, []() {});
assetHandler2.BusConnect(assetId);