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

basic refactor of assets (#6467)

Browse Source 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2021-12-17 12:36:05 -08:00
committed by GitHub
parent 2ddf55474e
commit 9c7a558ccb
19 changed files with 75 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp
+5 -5
View File
@@ -261,11 +261,11 @@ namespace ScriptCanvas
, const ScriptCanvas::Grammar::FunctionSourceId& sourceId
, const SlotExecution::Map& previousMap)
{
const Grammar::SubgraphInterface& subgraphInterface = runtimeAsset.Get()->m_runtimeData.m_interface;
const Grammar::SubgraphInterface& subgraphInterface = runtimeAsset.Get()->m_interfaceData.m_interface;
if (subgraphInterface.IsUserNodeable() && Grammar::IsFunctionSourceIdNodeable(sourceId) && subgraphInterface.HasIn(sourceId))
{
m_prettyName = runtimeAsset.Get()->m_runtimeData.m_name;
m_prettyName = runtimeAsset.Get()->m_interfaceData.m_name;
BuildUserNodeableNode(subgraphInterface, previousMap);
}
else if ((!Grammar::IsFunctionSourceIdNodeable(sourceId)) && subgraphInterface.HasIn(sourceId))
@@ -477,7 +477,7 @@ namespace ScriptCanvas
return true;
}
const Grammar::SubgraphInterface* latestAssetInterface = asset ? &asset.Get()->GetData().m_interface : nullptr;
const Grammar::SubgraphInterface* latestAssetInterface = asset ? &asset.Get()->m_interfaceData.m_interface : nullptr;
if (!latestAssetInterface)
{
AZ_Warning("ScriptCanvas", false, "FunctionCallNode %s failed to load latest interface from the source asset.", m_prettyName.data());
@@ -517,7 +517,7 @@ namespace ScriptCanvas
DataSlotMap dataSlotMap;
if (m_slotExecutionMap.IsEmpty())
{
const Grammar::SubgraphInterface& subgraphInterface = assetData.Get()->m_runtimeData.m_interface;
const Grammar::SubgraphInterface& subgraphInterface = assetData.Get()->m_interfaceData.m_interface;
RemoveInsFromInterface(subgraphInterface.GetIns(), executionSlotMap, dataSlotMap, k_DoNotRemoveConnections, k_DoNotWarnOnMissingDataSlots);
RemoveOutsFromInterface(subgraphInterface.GetLatentOuts(), executionSlotMap, dataSlotMap, k_DoNotRemoveConnections, k_DoNotWarnOnMissingDataSlots);
}
@@ -806,7 +806,7 @@ namespace ScriptCanvas
return;
}
m_prettyName = assetData.Get()->m_runtimeData.m_name;
m_prettyName = assetData.Get()->m_interfaceData.m_name;
}
}
}