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

Merged stabilization/2106 to development; Resolved merge conflicts

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-07-12 10:45:23 -05:00
parent 504201aef2 7cfde884d9
commit e924ed0b86
221 changed files with 2398 additions and 9445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+5 -41
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
@@ -2335,6 +2333,11 @@ namespace ScriptCanvas
}
}
bool Node::CanAcceptNullInput([[maybe_unused]] const Slot& executionSlot, [[maybe_unused]] const Slot& inputSlot) const
{
return true;
}
void Node::CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const
{
for (const Slot& slot : m_slots)
@@ -2949,45 +2952,6 @@ namespace ScriptCanvas
}
}
void Node::SetInput(const Datum& newInput, const SlotId& slotId)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
ModifiableDatumView datumView;
FindModifiableDatumView(slotId, datumView);
if (datumView.IsValid())
{
datumView.AssignToDatum(newInput);
}
}
void Node::SetInput(Datum&& newInput, const SlotId& slotId)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
ModifiableDatumView datumView;
FindModifiableDatumView(slotId, datumView);
if (datumView.IsValid())
{
datumView.AssignToDatum(newInput);
}
}
void Node::SetInput(Node& node, const SlotId& id, const Datum& input)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
node.SetInput(input, id);
}
void Node::SetInput(Node& node, const SlotId& id, Datum&& input)
{
AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::ScriptCanvas, "ScriptCanvas::Node::SetInput");
node.SetInput(AZStd::move(input), id);
}
AZStd::string Node::GetDebugName() const
{
if (GetEntityId().IsValid())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+3 -6
View File
@@ -479,7 +479,10 @@ namespace ScriptCanvas
Node(const Node&); // Needed just for DLL linkage. Does not perform a copy
Node& operator=(const Node&); // Needed just for DLL linkage. Does not perform a copy
virtual bool CanAcceptNullInput(const Slot& executionSlot, const Slot& inputSlot) const;
virtual void CollectVariableReferences(AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const;
virtual bool ContainsReferencesToVariables(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const;
Graph* GetGraph() const;
@@ -841,9 +844,6 @@ namespace ScriptCanvas
void SignalSlotsReordered();
static void SetInput(Node& node, const SlotId& id, const Datum& input);
static void SetInput(Node& node, const SlotId& id, Datum&& input);
// Will ignore any references and return the Datum that the slot represents.
void ModifyUnderlyingSlotDatum(const SlotId& id, ModifiableDatumView& datumView);
@@ -995,9 +995,6 @@ protected:
void SetOwningScriptCanvasId(ScriptCanvasId scriptCanvasId);
void SetGraphEntityId(AZ::EntityId graphEntityId);
virtual void SetInput(const Datum& input, const SlotId& id);
virtual void SetInput(Datum&& input, const SlotId& id);
bool SlotExists(AZStd::string_view name, const SlotDescriptor& slotDescriptor) const;
bool IsTargetInDataFlowPath(const ID& targetNodeId, AZStd::unordered_set<ID>& path) const;
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
+43 -43
View File
@@ -32,7 +32,6 @@
#include "AbstractCodeModel.h"
#include "ExecutionTraversalListeners.h"
#include "GrammarContextBus.h"
#include "ParsingUtilities.h"
#include "Primitives.h"
@@ -670,6 +669,28 @@ namespace ScriptCanvas
return AddVariable(Datum(type), rawName);
}
void AbstractCodeModel::CheckForKnownNullDereference(ExecutionTreeConstPtr execution, const ExecutionInput& input, const Slot& inputSlot)
{
if (Data::IsValueType(inputSlot.GetDataType())
|| !execution->GetId().m_node
|| !execution->GetId().m_slot
|| (input.m_value && !input.m_value->m_datum.Empty()))
{
return;
}
if (!input.m_value)
{
AddError(execution->GetId().m_node->GetEntityId(), nullptr, "Internal Error: CheckForKnownNullDereference called with input with no m_value");
return;
}
if (!execution->GetId().m_node->CanAcceptNullInput(*execution->GetId().m_slot, inputSlot))
{
AddError(execution->GetId().m_node->GetEntityId(), nullptr, ParseErrors::NullInputKnown);
}
}
void AbstractCodeModel::CheckConversion(ConversionByIndex& conversion, VariableConstPtr source, size_t index, const Data::Type& targetType)
{
const Data::Type& sourceType = source->m_datum.GetType();
@@ -698,7 +719,7 @@ namespace ScriptCanvas
}
AZStd::string AbstractCodeModel::CheckUniqueInterfaceNames
(AZStd::string_view candidate
( AZStd::string_view candidate
, AZStd::string_view defaultName
, AZStd::unordered_set<AZStd::string>& uniqueNames
, const AZStd::unordered_set<const ScriptCanvas::Nodes::Core::FunctionDefinitionNode*>& nodelingsOut)
@@ -2422,17 +2443,17 @@ namespace ScriptCanvas
ExecutionTreePtr start = OpenScope(nullptr, startNode, nullptr);
start->SetSymbol(Symbol::FunctionDefinition);
m_start = start; // cache the function definition
if (!m_subgraphStartCalls.empty())
{
m_start = start;
// call OnGraphStart on all the member nodeables first
for (auto node : m_subgraphStartCalls)
{
ExecutionTreePtr childStartCall = CreateChild(start, node, nullptr);
childStartCall->SetSymbol(Symbol::FunctionCall);
childStartCall->SetName(k_OnGraphStartFunctionName);
childStartCall->MarkStart();
childStartCall->MarkStartCall();
auto lexicalScopeOutcome = node->GetFunctionCallLexicalScope(nullptr);
@@ -2478,11 +2499,13 @@ namespace ScriptCanvas
}
}
// ExecutionTreePtr start is now either the last child start() call, or the beginning of the function block,
// either way, parsing can continue from the ExecutionTreePtr start.
if (!outSlots.empty())
{
start->AddChild({ outSlots[0], {}, nullptr });
start->MarkStart();
ParseExecutionMultipleOutSyntaxSugar(start, outNodes, outSlots);
PostParseProcess(start);
PostParseErrorDetect(start);
@@ -2490,24 +2513,10 @@ namespace ScriptCanvas
if (!IsErrorFree())
{
start->Clear();
if (m_start)
{
m_start->Clear();
}
m_start->Clear();
AddError(AZ::EntityId{}, nullptr, ScriptCanvas::ParseErrors::StartNodeFailedToParse);
return;
}
if (!m_start)
{
m_start = start;
}
}
else
{
// add warning or notification on useless start node?
}
if (m_start)
@@ -4297,10 +4306,7 @@ namespace ScriptCanvas
void AbstractCodeModel::ParseInputDatum(ExecutionTreePtr execution, const Slot& input)
{
// \todo look for crossed lines in inferred functions, because sometimes, rather than the input
// being named of the result of the output that emitted it, it will be the name of the inferred function
// parameter ---> make a map of node output to function input names
AZ_Assert(execution->GetSymbol() != Symbol::FunctionDefinition, "Function definition input should have been handled already");
AZ_Assert(execution->GetSymbol() != Symbol::FunctionDefinition, "Function definition input is not handled in AbstractCodeModel::ParseInputDatum");
auto nodes = execution->GetId().m_node->GetConnectedNodes(input);
if (nodes.empty())
@@ -4310,17 +4316,6 @@ namespace ScriptCanvas
execution->AddInput({ &input, variable, DebugDataSource::FromVariable(input.GetId(), input.GetDataType(), variable->m_sourceVariableId) });
CheckConversion(execution->ModConversions(), variable, execution->GetInputCount() - 1, input.GetDataType());
}
// This concept may never actually be possible
// else if (RequiresCreationFunction(input.GetDataType().GetType()))
// {
// AddError(execution, aznew NotYetImplemented(
// "1: finish input created by name when connected to other nodes"
// "2: add the name to the scope"
// "3: and check inputs be re-used, common constructors like zero/1, etc"
// "4: read the variable name if it is present instead of creating it"
// "5: check for entity references to self and other member slice variables"
// "6: mark the variable with RequiredCreationFunction()"));
// }
else
{
auto variableDatum = input.FindDatum();
@@ -4357,26 +4352,30 @@ namespace ScriptCanvas
}
else
{
// we don't support this, yet, but visually we could
// we could support both things, technically...auto-generated inputs, and defaults on the non-connected
// execution thread, or whatever makes possible sense
// \todo send enough information to reveal the data path in the editor
// This isn't supported visually, yet, but technically, it could be.
// One could connect both latent execution and immediate execution to the same code execution path,
// but only one uses connected output, and the other uses defaults.
// It would require us to change the visualization of the shared path, based on which parent was clicked on in the editor.
const auto& targetNode = *execution->GetId().m_node;
const auto& targetSlot = input;
for (auto sourceNodeAndSlot : nodes)
{
AddError(nullptr, aznew ScopedDataConnectionEvent
(execution->GetNodeId()
( execution->GetNodeId()
, targetNode
, targetSlot
, *sourceNodeAndSlot.first
, *sourceNodeAndSlot.second));
}
return;
}
}
// Check for known null reads
CheckForKnownNullDereference(execution, execution->GetInput(execution->GetInputCount() - 1), input);
}
bool AbstractCodeModel::ParseInputThisPointer(ExecutionTreePtr execution)
@@ -4428,6 +4427,7 @@ namespace ScriptCanvas
if (auto eventHandling = GetEBusEventHandling(node))
{
auto variable = AZStd::make_shared<Variable>();
variable->m_isMember = true;
variable->m_datum = Datum(eventHandling->m_handlerName);
execution->MarkInputHasThisPointer();
execution->AddInput({ nullptr, variable, DebugDataSource::FromInternal() });
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.h
+3 -1
View File
@@ -207,8 +207,10 @@ namespace ScriptCanvas
bool CheckCreateRoot(const Node& node);
void CheckForKnownNullDereference(ExecutionTreeConstPtr parent, const ExecutionInput& input, const Slot& inputSlot);
AZStd::string CheckUniqueInterfaceNames
(AZStd::string_view candidate
( AZStd::string_view candidate
, AZStd::string_view defaultName
, AZStd::unordered_set<AZStd::string>& uniqueNames
, const AZStd::unordered_set<const ScriptCanvas::Nodes::Core::FunctionDefinitionNode*>& nodelingsOut);
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/Grammar/PrimitivesExecution.cpp
+4 -4
View File
@@ -354,9 +354,9 @@ namespace ScriptCanvas
return GetRoot()->m_isPure;
}
bool ExecutionTree::IsStart() const
bool ExecutionTree::IsStartCall() const
{
return m_isStart;
return m_isStartCall;
}
void ExecutionTree::MarkDebugEmptyStatement()
@@ -403,9 +403,9 @@ namespace ScriptCanvas
root->m_isLatent = true;
}
void ExecutionTree::MarkStart()
void ExecutionTree::MarkStartCall()
{
m_isStart = true;
m_isStartCall = true;
}
ExecutionChild& ExecutionTree::ModChild(size_t index)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/PrimitivesExecution.h
+3 -3
View File
@@ -199,7 +199,7 @@ namespace ScriptCanvas
bool IsPure() const;
bool IsStart() const;
bool IsStartCall() const;
void MarkDebugEmptyStatement();
@@ -215,7 +215,7 @@ namespace ScriptCanvas
void MarkRootLatent();
void MarkStart();
void MarkStartCall();
ExecutionChild& ModChild(size_t index);
@@ -286,7 +286,7 @@ namespace ScriptCanvas
bool m_isPure = false;
bool m_isStart = false;
bool m_isStartCall = false;
bool m_hasExplicitUserOutCalls = false;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+40 -2
View File
@@ -25,6 +25,7 @@ namespace MethodCPP
Unnamed2,
PluralizeResults,
AddedPrettyNameFieldToSerialization,
StoreInputSlotIdsToSupportNullCheck,
// add your version above
Current,
};
@@ -110,6 +111,37 @@ namespace ScriptCanvas
{
namespace Core
{
bool Method::CanAcceptNullInput([[maybe_unused]] const Slot& executionSlot, const Slot& inputSlot) const
{
if (m_method)
{
auto candidateID = inputSlot.GetId();
auto slotIter = AZStd::find(m_inputSlots.begin(), m_inputSlots.end(), candidateID);
if (slotIter != m_inputSlots.end())
{
const size_t index = slotIter - m_inputSlots.begin();
if (index < m_method->GetNumArguments())
{
const auto* argument = m_method->GetArgument(index);
if (argument->m_traits & (AZ::BehaviorParameter::TR_REFERENCE | AZ::BehaviorParameter::TR_THIS_PTR))
{
// references and this pointers cannot accept null input
return false;
}
if (!(argument->m_traits & AZ::BehaviorParameter::TR_POINTER))
{
// values cannot accept null input
return false;
}
}
}
}
return true;
}
const AZ::BehaviorClass* Method::GetClass() const
{
return m_class;
@@ -232,6 +264,11 @@ namespace ScriptCanvas
if (addedSlot.IsValid())
{
MethodHelper::SetSlotToDefaultValue(*this, addedSlot, config, argIndex);
m_inputSlots.push_back(addedSlot);
}
else
{
AZ_Warning("ScriptCanvas", false, "Failed to add method input slot to Method node: %s-%s", config.m_prettyClassName.c_str(), config.m_method.m_name.c_str());
}
}
}
@@ -520,8 +557,8 @@ namespace ScriptCanvas
if (m_method && m_method->HasResult())
{
if (branchOnResultMethod.GetNumArguments() == 1
&& branchOnResultMethod.HasResult()
&& Data::FromAZType(branchOnResultMethod.GetResult()->m_typeId) == Data::Type::Boolean())
&& branchOnResultMethod.HasResult()
&& Data::FromAZType(branchOnResultMethod.GetResult()->m_typeId) == Data::Type::Boolean())
{
AZ::Uuid methodResultType = m_method->GetResult()->m_typeId;
AZ::Uuid branchOnResultMethodArgType = branchOnResultMethod.GetArgument(0)->m_typeId;
@@ -797,6 +834,7 @@ namespace ScriptCanvas
->Field("className", &Method::m_className)
->Field("namespaces", &Method::m_namespaces)
->Field("resultSlotIDs", &Method::m_resultSlotIDs)
->Field("inputSlots", &Method::m_inputSlots)
->Field("prettyClassName", &Method::m_classNamePretty)
;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
+3 -2
View File
@@ -45,6 +45,8 @@ namespace ScriptCanvas
size_t GenerateFingerprint() const override;
bool CanAcceptNullInput(const Slot& executionSlot, const Slot& inputSlot) const override;
bool GetBranchOnResultCheckName(AZStd::string& exposedName, Grammar::LexicalScope& lexicalScope) const;
virtual bool GetCheckedOperationInfo(AZ::CheckedOperationInfo& checkedInfo, AZStd::string& exposedName, Grammar::LexicalScope& lexicalScope) const;
@@ -149,8 +151,6 @@ namespace ScriptCanvas
bool IsExpectingResult() const;
AZ_INLINE AZStd::vector<SlotId>& ModResultSlotIds() { return m_resultSlotIDs; }
virtual void OnInitializeOutputPost(const MethodOutputConfig&) {}
virtual void OnInitializeOutputPre(MethodOutputConfig&) {}
@@ -176,6 +176,7 @@ namespace ScriptCanvas
NamespacePath m_namespaces;
const AZ::BehaviorMethod* m_method = nullptr;
const AZ::BehaviorClass* m_class = nullptr;
AZStd::vector<SlotId> m_inputSlots;
AZStd::vector<SlotId> m_resultSlotIDs;
AZStd::recursive_mutex m_mutex; // post-serialization
bool m_warnOnMissingFunction = true;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Results/ErrorText.h
+1
View File
@@ -74,6 +74,7 @@ namespace ScriptCanvas
constexpr const char* NotEnoughBranchesForReturn = "Not enough branches for defined out return values.";
constexpr const char* NotEnoughInputForArithmeticOperator = "Not enough input for arithmetic operator";
constexpr const char* NullEntityInGraph = "Null entity pointer in graph";
constexpr const char* NullInputKnown = "The input is known to be null, and the node does not accept it";
constexpr const char* ParseExecutionMultipleOutSyntaxSugarChildExecutionRemovedAndNotReplaced = "ParseExecutionMultipleOutSyntaxSugar: child execution node was removed, and not replaced.";
constexpr const char* ParseExecutionMultipleOutSyntaxSugarMismatchOutSize = "ParseExecutionMultipleOutSyntaxSugar: mismatch in connect nodes vs source slots size";
constexpr const char* ParseExecutionMultipleOutSyntaxSugarNonNullChildExecutionFound = "ParseExecutionMultipleOutSyntaxSugar: non null child execution node";
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+9 -11
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)
@@ -806,7 +802,7 @@ namespace ScriptCanvas
m_dotLua.Write("(");
if (execution->IsStart() && execution->IsPure())
if (execution == m_model.GetStart() && execution->IsPure())
{
m_dotLua.Write(Grammar::k_executionStateVariableName);
@@ -1589,8 +1585,10 @@ namespace ScriptCanvas
break;
}
// #functions2 pure on graph start nodes with dependencies can only be added to the graph as variables
// if (execution->IsStart() && execution->IsPure())
// #functions2 pure on graph start nodes with dependencies can only be added to the graph as variables, which is a work-flow we may never want to support
// as it effectively duplicates the Component-Entity-System. Technically, if this functionality is desired, one could just add another script component
// with the additional graph...
// if (execution->IsStartCall() && execution->IsPure())
// {
// WriteFunctionCallInputOfChildStart(execution);
// }
@@ -1944,7 +1942,7 @@ namespace ScriptCanvas
{
const auto requirement = ParseConstructionRequirement(variable);
if (requirement == Grammar::VariableConstructionRequirement::None || (requirement != Grammar::VariableConstructionRequirement::Static && !execution->IsStart()))
if (requirement == Grammar::VariableConstructionRequirement::None || (requirement != Grammar::VariableConstructionRequirement::Static && !execution->IsStartCall()))
{
m_dotLua.WriteLineIndented("local %s = %s", variable->m_name.data(), ToValueString(variable->m_datum, m_configuration).data());
}
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>;
}
}