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

initial compile of detailed path of change to regular sc files

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-10-29 16:23:20 -07:00
committed by Chris Burel
parent c5cd854172
commit bc342df6b4
26 changed files with 388 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Settings.cpp
+22 -18
View File
@@ -92,13 +92,11 @@ namespace ScriptCanvasEditor
// WorkspaceAssetSaveData
EditorWorkspace::WorkspaceAssetSaveData::WorkspaceAssetSaveData()
: m_assetType(azrtti_typeid<ScriptCanvasAsset>())
{
}
EditorWorkspace::WorkspaceAssetSaveData::WorkspaceAssetSaveData(const AZ::Data::AssetId& assetId)
EditorWorkspace::WorkspaceAssetSaveData::WorkspaceAssetSaveData(SourceHandle assetId)
: m_assetId(assetId)
, m_assetType(azrtti_typeid<ScriptCanvasAsset>())
{
}
@@ -108,24 +106,31 @@ namespace ScriptCanvasEditor
{
AZStd::vector<WorkspaceAssetSaveData> assetSaveData;
AZStd::vector<AZ::Data::AssetId> assetIds;
auto subElement = rootDataElementNode.FindSubElement(AZ_CRC("ActiveAssetIds", 0xe445268a));
auto subElement = rootDataElementNode.FindSubElement(AZ_CRC_CE("ActiveAssetIds"));
if (subElement)
{
if (subElement->GetData(assetIds))
{
assetSaveData.reserve(assetIds.size());
for (const AZ::Data::AssetId& assetId : assetIds)
{
assetSaveData.emplace_back(assetId);
}
}
// #sc_editor_asset
// if (subElement->GetData(assetIds))
// {
// assetSaveData.reserve(assetIds.size());
// for (const AZ::Data::AssetId& assetId : assetIds)
// {
// assetSaveData.emplace_back(assetId);
// }
// }
}
rootDataElementNode.RemoveElementByName(AZ_CRC("ActiveAssetIds", 0xe445268a));
rootDataElementNode.RemoveElementByName(AZ_CRC_CE("ActiveAssetIds"));
rootDataElementNode.AddElementWithData(context, "ActiveAssetData", assetSaveData);
}
if (rootDataElementNode.GetVersion() < 4)
{
rootDataElementNode.RemoveElementByName(AZ_CRC_CE("ActiveAssetIds"));
rootDataElementNode.RemoveElementByName(AZ_CRC_CE("FocusedAssetId"));
}
return true;
}
@@ -135,13 +140,12 @@ namespace ScriptCanvasEditor
if (serialize)
{
serialize->Class<WorkspaceAssetSaveData>()
->Version(1)
->Version(2)
->Field("AssetId", &WorkspaceAssetSaveData::m_assetId)
->Field("AssetType", &WorkspaceAssetSaveData::m_assetType)
;
serialize->Class<EditorWorkspace>()
->Version(3, &EditorWorkspace::VersionConverter)
->Version(4, &EditorWorkspace::VersionConverter)
->Field("m_storedWindowState", &EditorWorkspace::m_storedWindowState)
->Field("m_windowGeometry", &EditorWorkspace::m_windowGeometry)
->Field("FocusedAssetId", &EditorWorkspace::m_focusedAssetId)
@@ -150,13 +154,13 @@ namespace ScriptCanvasEditor
}
}
void EditorWorkspace::ConfigureActiveAssets(AZ::Data::AssetId focussedAssetId, const AZStd::vector< WorkspaceAssetSaveData >& activeAssetData)
void EditorWorkspace::ConfigureActiveAssets(SourceHandle focussedAssetId, const AZStd::vector< WorkspaceAssetSaveData >& activeAssetData)
{
m_focusedAssetId = focussedAssetId;
m_activeAssetData = activeAssetData;
}
AZ::Data::AssetId EditorWorkspace::GetFocusedAssetId() const
SourceHandle EditorWorkspace::GetFocusedAssetId() const
{
return m_focusedAssetId;
}