SC Editor serialization update in JSON

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-22 16:04:49 -08:00
parent 1c9c268231
commit 205b2c27ee
15 changed files with 187 additions and 58 deletions
@@ -235,7 +235,7 @@ namespace ScriptCanvasEditor
                if (tabdata.isValid())
                {
                    auto tabAssetId = tabdata.value<GraphTabMetadata>();
-                    if (tabAssetId.m_assetId.IsValid()
+                    if (tabAssetId.m_assetId.IsGraphValid()
                    && tabAssetId.m_assetId.Get()->GetGraphCanvasGraphId() == graphCanvasGraphId)
                    {
                        return tabAssetId.m_assetId.Get()->GetScriptCanvasId();
@@ -251,7 +251,7 @@ namespace ScriptCanvasEditor
                    if (fileState == Tracker::ScriptCanvasFileState::MODIFIED || fileState == Tracker::ScriptCanvasFileState::UNMODIFIED)
                    {
                        ScriptCanvasEditor::SourceHandle sourceId = GetSourceAssetId(assetId);
-                        if (sourceId.IsValid())
+                        if (sourceId.IsGraphValid())
                        {
                            EditorSettings::EditorWorkspace::WorkspaceAssetSaveData assetSaveData;
                            assetSaveData.m_assetId = sourceId;
@@ -267,13 +267,13 @@ namespace ScriptCanvasEditor
                }

                // The assetId needs to be the file AssetId to restore the workspace
-                if (focusedAssetId.IsValid())
+                if (focusedAssetId.IsGraphValid())
                {
                    focusedAssetId = GetSourceAssetId(focusedAssetId);
                }

                // If our currently focused asset won't be restored, just show the first element.
-                if (!focusedAssetId.IsValid())
+                if (!focusedAssetId.IsGraphValid())
                {
                    if (!activeAssets.empty())
                    {
@@ -641,7 +641,7 @@ namespace ScriptCanvasEditor
        QTimer::singleShot(0, [this]() {
            SetDefaultLayout();

-            if (m_activeGraph.IsValid())
+            if (m_activeGraph.IsGraphValid())
            {
                m_queuedFocusOverride = m_activeGraph;
            }
@@ -822,7 +822,7 @@ namespace ScriptCanvasEditor
    void MainWindow::SignalActiveSceneChanged(ScriptCanvasEditor::SourceHandle assetId)
    {
        AZ::EntityId graphId;
-        if (assetId.IsValid())
+        if (assetId.IsGraphValid())
        {
            EditorGraphRequestBus::EventResult(graphId, assetId.Get()->GetScriptCanvasId(), &EditorGraphRequests::GetGraphCanvasGraphId);
        }
@@ -1197,17 +1197,23 @@ namespace ScriptCanvasEditor
            return AZ::Success(outTabIndex);
        }

-        outTabIndex = CreateAssetTab(fileAssetId, fileState);
+        auto loadedGraph = LoadFromFile(fileAssetId.Path().c_str());
+        if (!loadedGraph.IsSuccess())
+        {
+            return AZ::Failure(AZStd::string("Failed to load graph at %s", fileAssetId.Path().c_str()));
+        }
+
+        outTabIndex = CreateAssetTab(loadedGraph.GetValue(), fileState);

        if (!m_isRestoringWorkspace)
        {
-            SetActiveAsset(fileAssetId);
+            SetActiveAsset(loadedGraph.GetValue());
        }

        if (outTabIndex >= 0)
        {
-            AddRecentFile(fileAssetId.Path().c_str());
-            OpenScriptCanvasAssetImplementation(fileAssetId, fileState);
+            AddRecentFile(loadedGraph.GetValue().Path().c_str());
+            OpenScriptCanvasAssetImplementation(loadedGraph.GetValue(), fileState);
            return AZ::Success(outTabIndex);
        }
        else
@@ -1219,12 +1225,12 @@ namespace ScriptCanvasEditor
    AZ::Outcome<int, AZStd::string> MainWindow::OpenScriptCanvasAssetImplementation(const SourceHandle& scriptCanvasAsset, Tracker::ScriptCanvasFileState fileState, int tabIndex)
    {
        const ScriptCanvasEditor::SourceHandle& fileAssetId = scriptCanvasAsset;
-        if (!fileAssetId.IsValid())
+        if (!fileAssetId.IsDescriptionValid())
        {
            return AZ::Failure(AZStd::string("Unable to open asset with invalid asset id"));
        }

-        if (!scriptCanvasAsset.IsValid())
+        if (!scriptCanvasAsset.IsDescriptionValid())
        {
            if (!m_isRestoringWorkspace)
            {
@@ -1280,7 +1286,7 @@ namespace ScriptCanvasEditor

    AZ::Outcome<int, AZStd::string> MainWindow::OpenScriptCanvasAsset(ScriptCanvasEditor::SourceHandle scriptCanvasAssetId, Tracker::ScriptCanvasFileState fileState, int tabIndex)
    {
-        if (scriptCanvasAssetId.IsValid())
+        if (scriptCanvasAssetId.IsGraphValid())
        {
            return OpenScriptCanvasAssetImplementation(scriptCanvasAssetId, fileState, tabIndex);
        }
@@ -1301,7 +1307,7 @@ namespace ScriptCanvasEditor
        m_assetCreationRequests.erase(assetId);
        GeneralAssetNotificationBus::Event(assetId, &GeneralAssetNotifications::OnAssetUnloaded);

-        if (assetId.IsValid())
+        if (assetId.IsGraphValid())
        {
            // Disconnect scene and asset editor buses
            GraphCanvas::SceneNotificationBus::MultiHandler::BusDisconnect(assetId.Get()->GetScriptCanvasId());
@@ -1377,7 +1383,7 @@ namespace ScriptCanvasEditor
    void MainWindow::OpenFile(const char* fullPath)
    {
        auto tabIndex = m_tabBar->FindTabByPath(fullPath);
-        if (tabIndex.IsValid())
+        if (tabIndex.IsGraphValid())
        {
            SetActiveAsset(tabIndex);
            return;
@@ -1697,7 +1703,7 @@ namespace ScriptCanvasEditor

    bool MainWindow::SaveAssetImpl(const ScriptCanvasEditor::SourceHandle& inMemoryAssetId, Save save)
    {
-        if (!inMemoryAssetId.IsValid())
+        if (!inMemoryAssetId.IsGraphValid())
        {
            return false;
        }
@@ -2444,7 +2450,7 @@ namespace ScriptCanvasEditor
    {
        AZ::EntityId graphId{};

-        if (m_activeGraph.IsValid())
+        if (m_activeGraph.IsGraphValid())
        {
            EditorGraphRequestBus::EventResult
                ( graphId, m_activeGraph.Get()->GetScriptCanvasId(), &EditorGraphRequests::GetGraphCanvasGraphId);
@@ -2469,7 +2475,7 @@ namespace ScriptCanvasEditor
    {
        AZ::EntityId graphId{};

-        if (assetId.IsValid())
+        if (assetId.IsGraphValid())
        {
            EditorGraphRequestBus::EventResult
                ( graphId, assetId.Get()->GetScriptCanvasId(), &EditorGraphRequests::GetGraphCanvasGraphId);
@@ -2480,7 +2486,7 @@ namespace ScriptCanvasEditor

    ScriptCanvas::ScriptCanvasId MainWindow::FindScriptCanvasIdByAssetId(const ScriptCanvasEditor::SourceHandle& assetId) const
    {
-        return assetId.IsValid() ? assetId.Get()->GetScriptCanvasId() : ScriptCanvas::ScriptCanvasId{};
+        return assetId.IsGraphValid() ? assetId.Get()->GetScriptCanvasId() : ScriptCanvas::ScriptCanvasId{};
    }

    ScriptCanvas::ScriptCanvasId MainWindow::GetScriptCanvasId(const GraphCanvas::GraphId& graphCanvasGraphId) const
@@ -2546,14 +2552,14 @@ namespace ScriptCanvasEditor
    {
        // Disconnect previous asset
        AZ::EntityId previousScriptCanvasSceneId;
-        if (previousAsset.IsValid())
+        if (previousAsset.IsGraphValid())
        {
            previousScriptCanvasSceneId = previousAsset.Get()->GetScriptCanvasId();
            GraphCanvas::SceneNotificationBus::MultiHandler::BusDisconnect(previousScriptCanvasSceneId);
        }

        AZ::EntityId nextAssetGraphCanvasId;
-        if (nextAsset.IsValid())
+        if (nextAsset.IsGraphValid())
        {
            // Connect the next asset
            EditorGraphRequestBus::EventResult(nextAssetGraphCanvasId, nextAsset.Get()->GetScriptCanvasId(), &EditorGraphRequests::GetGraphCanvasGraphId);
@@ -2581,7 +2587,7 @@ namespace ScriptCanvasEditor

        AssetHelpers::PrintInfo("SetActiveAsset : from: %s to %s", m_activeGraph.ToString().c_str(), fileAssetId.ToString().c_str());

-        if (fileAssetId.IsValid())
+        if (fileAssetId.IsGraphValid())
        {
            if (m_tabBar->FindTab(fileAssetId) >= 0)
            {
@@ -2594,7 +2600,7 @@ namespace ScriptCanvasEditor
            }
        }

-        if (m_activeGraph.IsValid())
+        if (m_activeGraph.IsGraphValid())
        {
            // If we are saving the asset, the Id may have changed from the in-memory to the file asset Id, in that case,
            // there's no need to hide the view or remove the widget
@@ -2607,7 +2613,7 @@ namespace ScriptCanvasEditor
            }
        }

-        if (fileAssetId.IsValid())
+        if (fileAssetId.IsGraphValid())
        {
            ScriptCanvasEditor::SourceHandle previousAssetId = m_activeGraph;
            m_activeGraph = fileAssetId;
@@ -2629,7 +2635,7 @@ namespace ScriptCanvasEditor

    void MainWindow::RefreshActiveAsset()
    {
-        if (m_activeGraph.IsValid())
+        if (m_activeGraph.IsGraphValid())
        {
            AssetHelpers::PrintInfo("RefreshActiveAsset : m_activeGraph (%s)", m_activeGraph.ToString().c_str());
            if (auto view = m_tabBar->ModOrCreateTabView(m_tabBar->FindTab(m_activeGraph)))
@@ -2760,7 +2766,7 @@ namespace ScriptCanvasEditor
        if (m_isClosingTabs)
        {
            if (m_tabBar->count() == 0
-                || (m_tabBar->count() == 1 && m_skipTabOnClose.IsValid()))
+                || (m_tabBar->count() == 1 && m_skipTabOnClose.IsGraphValid()))
            {
                m_isClosingTabs = false;
                m_skipTabOnClose.Clear();
@@ -3001,7 +3007,7 @@ namespace ScriptCanvasEditor
        bool hasCopiableSelection = false;
        bool hasSelection = false;

-        if (m_activeGraph.IsValid())
+        if (m_activeGraph.IsGraphValid())
        {
            if (graphCanvasGraphId.IsValid())
            {
@@ -3394,17 +3400,17 @@ namespace ScriptCanvasEditor
        {
            m_isRestoringWorkspace = false;

-            if (m_queuedFocusOverride.IsValid())
+            if (m_queuedFocusOverride.IsGraphValid())
            {
                SetActiveAsset(m_queuedFocusOverride);
                m_queuedFocusOverride.Clear();
            }
-            else if (lastFocusAsset.IsValid())
+            else if (lastFocusAsset.IsGraphValid())
            {
                SetActiveAsset(lastFocusAsset);
            }

-            if (!m_activeGraph.IsValid())
+            if (!m_activeGraph.IsGraphValid())
            {
                if (m_tabBar->count() > 0)
                {
@@ -3427,7 +3433,7 @@ namespace ScriptCanvasEditor

    void MainWindow::UpdateAssignToSelectionState()
    {
-        bool buttonEnabled = m_activeGraph.IsValid();
+        bool buttonEnabled = m_activeGraph.IsGraphValid();

        if (buttonEnabled)
        {
@@ -3787,7 +3793,7 @@ namespace ScriptCanvasEditor

        OnFileNew();

-        if (m_activeGraph.IsValid())
+        if (m_activeGraph.IsGraphValid())
        {
            graphId = GetActiveGraphCanvasGraphId();
        }
@@ -118,7 +118,7 @@ namespace ScriptCanvasEditor
        SourceHandle Modifier::LoadAsset()
        {
            auto& handle = ModCurrentAsset();
-            if (!handle.IsValid())
+            if (!handle.IsGraphValid())
            {
                auto outcome = LoadFromFile(handle.Path().c_str());
                if (outcome.IsSuccess())
@@ -158,7 +158,7 @@ namespace ScriptCanvasEditor

            ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnUpgradeModificationBegin, m_config, ModCurrentAsset());

-            if (auto asset = LoadAsset(); asset.IsValid())
+            if (auto asset = LoadAsset(); asset.IsGraphValid())
            {
                ModificationNotificationsBus::Handler::BusConnect();
                m_modifyState = ModifyState::InProgress;
@@ -132,7 +132,7 @@ namespace ScriptCanvasEditor
            }
            else
            {
-                if (auto asset = LoadAsset(); asset.IsValid())
+                if (auto asset = LoadAsset(); asset.IsGraphValid())
                {
                    VE_LOG("Scanner: Loaded: %s ", ModCurrentAsset().Path().c_str());
                    FilterAsset(asset);