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

Remove dead backend code

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-07-08 16:12:45 -07:00
parent b1ced46b62
commit 45b024bed1
21 changed files with 6 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
-16
View File
@@ -58,16 +58,6 @@ namespace ScriptCanvasEditor
required.push_back(AZ_CRC("ScriptCanvasService", 0x41fd58f3));
}
ScriptCanvas::Grammar::Context* EditorAssetSystemComponent::GetGrammarContext()
{
return &m_grammarContext;
}
ScriptCanvas::Translation::Context* EditorAssetSystemComponent::GetTranslationContext()
{
return &m_translationContext;
}
void EditorAssetSystemComponent::Init()
{
}
@@ -79,16 +69,10 @@ namespace ScriptCanvasEditor
AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
EditorAssetConversionBus::Handler::BusConnect();
ScriptCanvas::Translation::RequestBus::Handler::BusConnect();
ScriptCanvas::Grammar::RequestBus::Handler::BusConnect();
}
void EditorAssetSystemComponent::Deactivate()
{
ScriptCanvas::Translation::RequestBus::Handler::BusDisconnect();
ScriptCanvas::Grammar::RequestBus::Handler::BusDisconnect();
EditorAssetConversionBus::Handler::BusDisconnect();
AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
m_editorAssetRegistry.Unregister();
Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.h
+1 -18
View File
@@ -12,11 +12,6 @@
#include "EditorAssetConversionBus.h"
#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
#include <ScriptCanvas/Asset/AssetRegistry.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <ScriptCanvas/Translation/TranslationContext.h>
#include <ScriptCanvas/Translation/TranslationContextBus.h>
#include <ScriptCanvas/Translation/Translation.h>
namespace ScriptCanvasEditor
@@ -26,8 +21,6 @@ namespace ScriptCanvasEditor
class EditorAssetSystemComponent
: public AZ::Component
, public EditorAssetConversionBus::Handler
, public ScriptCanvas::Grammar::RequestBus::Handler
, public ScriptCanvas::Translation::RequestBus::Handler
, private AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
{
public:
@@ -60,20 +53,10 @@ namespace ScriptCanvasEditor
AZ::Outcome<ScriptCanvas::Translation::LuaAssetResult, AZStd::string> CreateLuaAsset(const AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset>& editAsset, AZStd::string_view graphPathForRawLuaFile) override;
//////////////////////////////////////////////////////////////////////////
// ScriptCanvas::Grammar::RequestBus::Handler...
ScriptCanvas::Grammar::Context* GetGrammarContext() override;
// ScriptCanvas::Translation::RequestBus::Handler...
ScriptCanvas::Translation::Context* GetTranslationContext() override;
ScriptCanvas::AssetRegistry& GetAssetRegistry();
private:
ScriptCanvas::AssetRegistry m_editorAssetRegistry;
ScriptCanvas::Translation::Context m_translationContext;
ScriptCanvas::Grammar::Context m_grammarContext;
ScriptCanvas::AssetRegistry m_editorAssetRegistry;
EditorAssetSystemComponent(const EditorAssetSystemComponent&) = delete;
};
}
Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
-15
View File
@@ -104,9 +104,6 @@ namespace ScriptCanvasBuilder
m_sharedHandlers = HandleAssetTypes();
AssetHandlers workerHandlers(m_sharedHandlers);
m_scriptCanvasBuilder.Activate(workerHandlers);
ScriptCanvas::Translation::RequestBus::Handler::BusConnect();
ScriptCanvas::Grammar::RequestBus::Handler::BusConnect();
}
void PluginComponent::Deactivate()
@@ -116,18 +113,6 @@ namespace ScriptCanvasBuilder
AzToolsFramework::ToolsAssetSystemBus::Broadcast(&AzToolsFramework::ToolsAssetSystemRequests::UnregisterSourceAssetType, azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>());
m_scriptCanvasBuilder.BusDisconnect();
m_sharedHandlers.DeleteOwnedHandlers();
ScriptCanvas::Translation::RequestBus::Handler::BusDisconnect();
ScriptCanvas::Grammar::RequestBus::Handler::BusDisconnect();
}
ScriptCanvas::Grammar::Context* PluginComponent::GetGrammarContext()
{
return &m_grammarContext;
}
ScriptCanvas::Translation::Context* PluginComponent::GetTranslationContext()
{
return &m_translationContext;
}
void PluginComponent::Reflect(AZ::ReflectContext* context)
Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.h
-17
View File
@@ -12,18 +12,11 @@
#include <AssetBuilderSDK/AssetBuilderSDK.h>
#include "ScriptCanvasBuilderWorker.h"
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <ScriptCanvas/Translation/TranslationContext.h>
#include <ScriptCanvas/Translation/TranslationContextBus.h>
namespace ScriptCanvasBuilder
{
//! ScriptCanvasBuilder is responsible for turning editor ScriptCanvas Assets into runtime script canvas assets
class PluginComponent
: public AZ::Component
, public ScriptCanvas::Grammar::RequestBus::Handler
, public ScriptCanvas::Translation::RequestBus::Handler
{
public:
AZ_COMPONENT(PluginComponent, "{F8286B21-E751-4745-8BC4-512F190215FF}")
@@ -42,19 +35,9 @@ namespace ScriptCanvasBuilder
void Deactivate() override;
//////////////////////////////////////////////////////////////////////////
// ScriptCanvas::Grammar::RequestBus::Handler
ScriptCanvas::Grammar::Context* GetGrammarContext() override;
// ScriptCanvas::Translation::RequestBus::Handler
ScriptCanvas::Translation::Context* GetTranslationContext() override;
private:
PluginComponent(const PluginComponent&) = delete;
SharedHandlers m_sharedHandlers;
Worker m_scriptCanvasBuilder;
ScriptCanvas::Translation::Context m_translationContext;
ScriptCanvas::Grammar::Context m_grammarContext;
};
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
-2
View File
@@ -28,8 +28,6 @@
#include <ScriptCanvas/Debugger/API.h>
#include <ScriptCanvas/Utils/NodeUtils.h>
#include <ScriptCanvas/Grammar/Primitives.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationEvents.h>
// Version Conversion includes
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
-2
View File
@@ -9,8 +9,6 @@
#include <AzCore/Serialization/SerializeContext.h>
#include <ScriptCanvas/Core/SubgraphInterface.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
namespace NodeableOutCpp
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNode.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <AzCore/Serialization/Utils.h>
#include <AzCore/Serialization/IdUtils.h>
#include <ScriptCanvas/Core/Attributes.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <ScriptCanvas/Libraries/Core/Method.h>
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp
-2
View File
@@ -12,8 +12,6 @@
#include <AzCore/Serialization/Utils.h>
#include <AzCore/Serialization/IdUtils.h>
#include <ScriptCanvas/Core/Attributes.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <ScriptCanvas/Libraries/Core/Method.h>
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
-1
View File
@@ -32,7 +32,6 @@
#include "AbstractCodeModel.h"
#include "ExecutionTraversalListeners.h"
#include "GrammarContextBus.h"
#include "ParsingUtilities.h"
#include "Primitives.h"
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
-1
View File
@@ -27,7 +27,6 @@
#include <ScriptCanvas/Variable/VariableData.h>
#include "ExecutionTraversalListeners.h"
#include "GrammarContextBus.h"
#include "ParsingUtilities.h"
#include "Primitives.h"
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.cpp
-25
View File
@@ -1,25 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "GrammarContext.h"
namespace ScriptCanvas
{
namespace Grammar
{
const SubgraphInterfaceSystem& Context::GetExecutionMapSystem() const
{
return m_executionMapSystem;
}
SubgraphInterfaceSystem& Context::ModExecutionMapSystem()
{
return m_executionMapSystem;
}
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContext.h
-37
View File
@@ -1,37 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Memory/Memory.h>
#include <AzCore/Memory/SystemAllocator.h>
#include <ScriptCanvas/Core/SubgraphInterface.h>
namespace ScriptCanvas
{
namespace Grammar
{
class Context
{
public:
AZ_CLASS_ALLOCATOR(Context, AZ::SystemAllocator, 0);
Context() = default;
~Context() = default;
const SubgraphInterfaceSystem& GetExecutionMapSystem() const;
SubgraphInterfaceSystem& ModExecutionMapSystem();
private:
SubgraphInterfaceSystem m_executionMapSystem;
// put grammatical state globals in here, things that can be useful across several parses of graphs
};
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/GrammarContextBus.h
-35
View File
@@ -1,35 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
namespace ScriptCanvas
{
namespace Grammar
{
class Context;
struct RequestTraits : public AZ::EBusTraits
{
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
virtual Context* GetGrammarContext() = 0;
};
using RequestBus = AZ::EBus<RequestTraits>;
struct EventTraits : public AZ::EBusTraits
{
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
// add stuff here to speed up parsing across separate graphs
};
using EventBus = AZ::EBus<EventTraits>;
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+3 -7
View File
@@ -24,8 +24,6 @@
#include <ScriptCanvas/Grammar/PrimitivesExecution.h>
#include "GraphToLuaUtility.h"
#include "TranslationContext.h"
#include "TranslationContextBus.h"
namespace GraphToLuaCpp
{
@@ -92,9 +90,7 @@ namespace ScriptCanvas
{
SystemRequestBus::BroadcastResult(m_systemConfiguration, &SystemRequests::GetSystemComponentConfiguration);
MarkTranslationStart();
RequestBus::BroadcastResult(m_context, &RequestTraits::GetTranslationContext);
AZ_Assert(m_context, "Nothing is possible without the context");
m_tableName = GraphToLuaCpp::FileNameToTableName(m_model.GetSource().m_name);
m_tableName += m_configuration.m_suffix;
@@ -138,12 +134,12 @@ namespace ScriptCanvas
const AZStd::string& GraphToLua::FindAbbreviation(AZStd::string_view dependency) const
{
return m_context->FindAbbreviation(dependency);
return m_context.FindAbbreviation(dependency);
}
const AZStd::string& GraphToLua::FindLibrary(AZStd::string_view dependency) const
{
return m_context->FindLibrary(dependency);
return m_context.FindLibrary(dependency);
}
AZStd::string_view GraphToLua::GetOperatorString(Grammar::ExecutionTreeConstPtr execution)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.h
+2 -1
View File
@@ -16,6 +16,7 @@
#include <ScriptCanvas/Core/ScriptCanvasBus.h>
#include "GraphToX.h"
#include "TranslationContext.h"
#include "TranslationResult.h"
#include "TranslationUtilities.h"
@@ -60,7 +61,7 @@ namespace ScriptCanvas
RuntimeInputs m_runtimeInputs;
BuildConfiguration m_executionConfig = BuildConfiguration::Release;
FunctionBlockConfig m_functionBlockConfig = FunctionBlockConfig::Ignored;
const Context* m_context = nullptr;
Context m_context;
AZStd::string m_tableName;
Writer m_dotLua;
SystemComponentConfiguration m_systemConfiguration;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContext.h
-1
View File
@@ -10,7 +10,6 @@
#include <AzCore/Memory/Memory.h>
#include <AzCore/Memory/SystemAllocator.h>
#include "Translation.h"
#include "TranslationContextBus.h"
namespace ScriptCanvas
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationContextBus.h
-38
View File
@@ -1,38 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/EBus/EBus.h>
#include "Translation.h"
namespace ScriptCanvas
{
namespace Translation
{
class Context;
struct RequestTraits : public AZ::EBusTraits
{
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
virtual Context* GetTranslationContext() = 0;
};
using RequestBus = AZ::EBus<RequestTraits>;
struct EventTraits : public AZ::EBusTraits
{
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
};
using EventBus = AZ::EBus<EventTraits>;
}
}
Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
-4
View File
@@ -101,7 +101,6 @@ set(FILES
Include/ScriptCanvas/Translation/Translation.cpp
Include/ScriptCanvas/Translation/TranslationContext.h
Include/ScriptCanvas/Translation/TranslationContext.cpp
Include/ScriptCanvas/Translation/TranslationContextBus.h
Include/ScriptCanvas/Translation/TranslationResult.h
Include/ScriptCanvas/Translation/TranslationResult.cpp
Include/ScriptCanvas/Translation/TranslationUtilities.h
@@ -196,9 +195,6 @@ set(FILES
Include/ScriptCanvas/Grammar/DebugMap.cpp
Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h
Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp
Include/ScriptCanvas/Grammar/GrammarContext.h
Include/ScriptCanvas/Grammar/GrammarContext.cpp
Include/ScriptCanvas/Grammar/GrammarContextBus.h
Include/ScriptCanvas/Grammar/ParsingMetaData.h
Include/ScriptCanvas/Grammar/ParsingMetaData.cpp
Include/ScriptCanvas/Grammar/ParsingUtilities.h
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestNodes.cpp
-2
View File
@@ -11,8 +11,6 @@
#include <ScriptCanvas/Core/Core.h>
#include <ScriptCanvas/Core/Graph.h>
#include <ScriptCanvas/Core/SlotConfigurationDefaults.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <gtest/gtest.h>
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_RuntimeInterpreted.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <ScriptCanvas/Core/Nodeable.h>
#include <ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h>
#include <ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <Source/Framework/ScriptCanvasTestFixture.h>
#include <Source/Framework/ScriptCanvasTestNodes.h>
#include <Source/Framework/ScriptCanvasTestUtilities.h>
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_VM.cpp
-2
View File
@@ -14,8 +14,6 @@
#include <ScriptCanvas/Core/Nodeable.h>
#include <ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h>
#include <ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h>
#include <ScriptCanvas/Grammar/GrammarContext.h>
#include <ScriptCanvas/Grammar/GrammarContextBus.h>
#include <Source/Framework/ScriptCanvasTestFixture.h>
#include <Source/Framework/ScriptCanvasTestNodes.h>
#include <Source/Framework/ScriptCanvasTestUtilities.h>