Removes MethodUtility.cpp/h from Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
#include <AzCore/Serialization/IdUtils.h>
|
||||
#include <ScriptCanvas/Core/Attributes.h>
|
||||
#include <ScriptCanvas/Libraries/Core/Method.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace NodeableNodeCpp
|
||||
{
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#include <AzCore/Serialization/IdUtils.h>
|
||||
#include <ScriptCanvas/Core/Attributes.h>
|
||||
#include <ScriptCanvas/Libraries/Core/Method.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace NodeableNodeOverloadedCpp
|
||||
{
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include "SubgraphInterfaceUtility.h"
|
||||
|
||||
#include <AzCore/RTTI/BehaviorContext.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace SubgraphInterfaceUtilityCpp
|
||||
{
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
*/
|
||||
#include <ScriptCanvas/Internal/Nodes/BaseTimerNode.h>
|
||||
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
namespace Nodes
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include <ScriptCanvas/Libraries/Core/ExtractProperty.h>
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
#include <ScriptCanvas/Libraries/Core/ForEach.h>
|
||||
#include <ScriptCanvas/Utils/VersionConverters.h>
|
||||
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
namespace Nodes
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#include <ScriptCanvas/Core/SlotNames.h>
|
||||
#include <ScriptCanvas/Core/SubgraphInterfaceUtility.h>
|
||||
#include <ScriptCanvas/Execution/RuntimeComponent.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Utils/VersionConverters.h>
|
||||
#include <ScriptCanvas/Variable/GraphVariableManagerComponent.h>
|
||||
#include <ScriptCanvas/Variable/VariableBus.h>
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#include "GetVariable.h"
|
||||
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/ScriptCanvasBus.h>
|
||||
#include <ScriptCanvas/Grammar/ParsingUtilities.h>
|
||||
#include <ScriptCanvas/Translation/GraphToLuaUtility.h>
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <AzCore/Serialization/Utils.h>
|
||||
#include <Core/SlotConfigurationDefaults.h>
|
||||
#include <Core/SlotExecutionMap.h>
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Utils/BehaviorContextUtils.h>
|
||||
#include <AzCore/StringFunc/StringFunc.h>
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include <AzCore/RTTI/BehaviorContext.h>
|
||||
#include <AzCore/RTTI/BehaviorContextUtilities.h>
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MethodOverloadContract.h>
|
||||
#include <ScriptCanvas/Core/SlotConfigurations.h>
|
||||
#include <ScriptCanvas/Utils/BehaviorContextUtils.h>
|
||||
|
||||
@@ -1,87 +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 <AzCore/std/containers/map.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Libraries/Core/Method.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethodsFromResult(const AZ::BehaviorMethod& method)
|
||||
{
|
||||
if (method.HasResult())
|
||||
{
|
||||
if (const AZ::BehaviorParameter* result = method.GetResult())
|
||||
{
|
||||
return GetTupleGetMethods(result->m_typeId);
|
||||
}
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethods(const AZ::TypeId& typeId)
|
||||
{
|
||||
AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> tupleGetMethodMap;
|
||||
|
||||
AZ::BehaviorContext* behaviorContext{};
|
||||
AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
|
||||
auto bcClassIterator = behaviorContext->m_typeToClassMap.find(typeId);
|
||||
const AZ::BehaviorClass* behaviorClass = bcClassIterator != behaviorContext->m_typeToClassMap.end() ? bcClassIterator->second : nullptr;
|
||||
|
||||
if (behaviorClass)
|
||||
{
|
||||
for (auto& methodPair : behaviorClass->m_methods)
|
||||
{
|
||||
const AZ::BehaviorMethod* behaviorMethod = methodPair.second;
|
||||
if (AZ::Attribute* attribute = FindAttribute(AZ::ScriptCanvasAttributes::TupleGetFunctionIndex, behaviorMethod->m_attributes))
|
||||
{
|
||||
AZ::AttributeReader tupleGetFuncAttrReader(nullptr, attribute);
|
||||
int tupleGetFuncIndex = -1;
|
||||
if (tupleGetFuncAttrReader.Read<int>(tupleGetFuncIndex))
|
||||
{
|
||||
[[maybe_unused]] auto insertIter = tupleGetMethodMap.emplace(tupleGetFuncIndex, behaviorMethod);
|
||||
AZ_Error("Script Canvas", insertIter.second, "Multiple methods with the same TupleGetFunctionIndex attribute"
|
||||
"has been registered for the class name: %s with typeid: %s",
|
||||
behaviorClass->m_name.data(), behaviorClass->m_typeId.ToString<AZStd::string>().data())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return tupleGetMethodMap;
|
||||
}
|
||||
|
||||
AZ::Outcome<const AZ::BehaviorMethod*, void> GetTupleGetMethod(const AZ::TypeId& typeId, size_t index)
|
||||
{
|
||||
const AZ::BehaviorContext* behaviorContext{};
|
||||
AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext);
|
||||
auto bcClassIterator = behaviorContext->m_typeToClassMap.find(typeId);
|
||||
const AZ::BehaviorClass* behaviorClass = bcClassIterator != behaviorContext->m_typeToClassMap.end() ? bcClassIterator->second : nullptr;
|
||||
|
||||
if (behaviorClass)
|
||||
{
|
||||
for (auto methodPair : behaviorClass->m_methods)
|
||||
{
|
||||
const AZ::BehaviorMethod* behaviorMethod = methodPair.second;
|
||||
if (AZ::Attribute* attribute = FindAttribute(AZ::ScriptCanvasAttributes::TupleGetFunctionIndex, behaviorMethod->m_attributes))
|
||||
{
|
||||
AZ::AttributeReader tupleGetFuncAttrReader(nullptr, attribute);
|
||||
int tupleGetFuncIndex = -1;
|
||||
if (tupleGetFuncAttrReader.Read<int>(tupleGetFuncIndex) && index == tupleGetFuncIndex)
|
||||
{
|
||||
return AZ::Success(behaviorMethod);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return AZ::Failure();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,28 +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 <ScriptCanvas/Core/Graph.h>
|
||||
#include <ScriptCanvas/Core/Node.h>
|
||||
#include <AzCore/RTTI/BehaviorContext.h>
|
||||
#include <AzCore/std/containers/map.h>
|
||||
|
||||
namespace ScriptCanvas::Grammar
|
||||
{
|
||||
struct FunctionPrototype;
|
||||
}
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethodsFromResult(const AZ::BehaviorMethod& method);
|
||||
|
||||
AZStd::unordered_map<size_t, const AZ::BehaviorMethod*> GetTupleGetMethods(const AZ::TypeId& typeId);
|
||||
|
||||
AZ::Outcome<const AZ::BehaviorMethod*, void> GetTupleGetMethod(const AZ::TypeId& typeID, size_t index);
|
||||
}
|
||||
@@ -9,7 +9,6 @@
|
||||
#include <ScriptCanvas/Libraries/Core/Repeater.h>
|
||||
#include <ScriptCanvas/Libraries/Core/RepeaterNodeable.h>
|
||||
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Utils/SerializationUtils.h>
|
||||
#include <ScriptCanvas/Utils/VersionConverters.h>
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <AzCore/Asset/AssetManager.h>
|
||||
|
||||
#include <ScriptCanvas/Core/SlotNames.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
|
||||
#include <ScriptEvents/ScriptEventsBus.h>
|
||||
|
||||
|
||||
@@ -8,8 +8,9 @@
|
||||
|
||||
#include "SetVariable.h"
|
||||
|
||||
#include <AzCore/std/sort.h>
|
||||
|
||||
#include <Core/ExecutionNotificationsBus.h>
|
||||
#include <Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/ScriptCanvasBus.h>
|
||||
#include <ScriptCanvas/Debugger/ValidationEvents/DataValidation/DataValidationIds.h>
|
||||
#include <ScriptCanvas/Grammar/ParsingUtilities.h>
|
||||
|
||||
-1
@@ -9,7 +9,6 @@
|
||||
#include "OperatorAt.h"
|
||||
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -9,7 +9,6 @@
|
||||
#include "OperatorBack.h"
|
||||
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -9,7 +9,6 @@
|
||||
#include "OperatorClear.h"
|
||||
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
#include <ScriptCanvas/Utils/SerializationUtils.h>
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorEmpty.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
|
||||
#include <ScriptCanvas/Utils/SerializationUtils.h>
|
||||
|
||||
-1
@@ -9,7 +9,6 @@
|
||||
#include "OperatorErase.h"
|
||||
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -9,7 +9,6 @@
|
||||
#include "OperatorFront.h"
|
||||
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorInsert.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorPushBack.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorSize.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
|
||||
#include <ScriptCanvas/Utils/SerializationUtils.h>
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorAdd.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
#include <ScriptCanvas/Data/NumericData.h>
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorArithmetic.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorDiv.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
#include <ScriptCanvas/Data/NumericData.h>
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorDivideByNumber.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
#include <ScriptCanvas/Data/NumericData.h>
|
||||
|
||||
-1
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorLength.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorMul.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
#include <ScriptCanvas/Data/NumericData.h>
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
*/
|
||||
|
||||
#include "OperatorSub.h"
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
#include <ScriptCanvas/Core/Contracts/MathOperatorContract.h>
|
||||
#include <AzCore/Math/MathUtils.h>
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
#include <ScriptCanvas/Core/Contracts/ConnectionLimitContract.h>
|
||||
#include <ScriptCanvas/Core/Contracts/SupportsMethodContract.h>
|
||||
|
||||
#include <ScriptCanvas/Libraries/Core/MethodUtility.h>
|
||||
|
||||
#include <ScriptCanvas/Data/Data.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
|
||||
@@ -105,7 +105,6 @@ set(FILES
|
||||
Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/Method.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/Nodeling.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
|
||||
Include/ScriptCanvas/Libraries/Core/Repeater.cpp
|
||||
|
||||
@@ -155,7 +155,6 @@ set(FILES
|
||||
Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml
|
||||
Include/ScriptCanvas/Libraries/Core/Method.h
|
||||
Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h
|
||||
Include/ScriptCanvas/Libraries/Core/MethodUtility.h
|
||||
Include/ScriptCanvas/Libraries/Core/Nodeling.h
|
||||
Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml
|
||||
Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h
|
||||
|
||||
Reference in New Issue
Block a user