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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.cpp
+105 -97
View File
@@ -45,14 +45,10 @@ namespace ScriptCanvas
{
switch (scopeType)
{
case Scope::Local:
return "Local";
case Scope::Input:
return "In";
case Scope::Output:
return "Out";
case Scope::InOut:
return "In/Out";
case Scope::Graph:
return "Graph";
case Scope::Function:
return "Function";
default:
return "?";
}
@@ -60,34 +56,22 @@ namespace ScriptCanvas
Scope GetScopeFromLabel(const char* label)
{
if (strcmp("In", label) == 0)
if (strcmp("Function", label) == 0)
{
return Scope::Input;
}
else if (strcmp("Out", label) == 0)
{
return Scope::Output;
}
else if (strcmp("In/Out", label) == 0)
{
return Scope::InOut;
return Scope::Function;
}
return Scope::Local;
return Scope::Graph;
}
const char* GetScopeToolTip(Scope scopeType)
{
switch (scopeType)
{
case Scope::Local:
return "Variable is for use in the local scope only.";
case Scope::Input:
return "Variable will have an initial value set from an external source.";
case Scope::Output:
return "Variable will be used to return values to an external source.";
case Scope::InOut:
return "Variable will be used to receive and return values to an external source.";
case Scope::Graph:
return "Variable is accessible in the entire graph.";
case Scope::Function:
return "Variable is accessible only in the execution path of the function that defined it";
default:
return "?";
}
@@ -111,8 +95,27 @@ namespace ScriptCanvas
}
};
static bool GraphVariableVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
static bool GraphVariableVersionConverter([[maybe_unused]] AZ::SerializeContext& context, [[maybe_unused]] AZ::SerializeContext::DataElementNode& classElement)
{
if (classElement.GetVersion() < 4)
{
enum class DeprecatedScope : AZ::u8
{
Local = 0,
Input = 1,
Output = 2,
InOut = 3
};
DeprecatedScope scope = DeprecatedScope::Local;
classElement.GetChildData<DeprecatedScope>(AZ_CRC_CE("Scope"), scope);
if (scope == DeprecatedScope::Input)
{
classElement.RemoveElementByName(AZ_CRC_CE("Scope"));
classElement.AddElementWithData<VariableFlags::InitialValueSource>(context, "InitialValueSource", VariableFlags::InitialValueSource::Component);
}
}
else
if (classElement.GetVersion() < 3)
{
bool exposeAsInputField = false;
@@ -121,26 +124,26 @@ namespace ScriptCanvas
if (exposeAsInputField)
{
classElement.RemoveElementByName(AZ_CRC("Exposure", 0x398f29cd));
classElement.AddElementWithData<VariableFlags::Scope>(context, "Scope", VariableFlags::Scope::Input);
classElement.AddElementWithData<VariableFlags::Scope>(context, "Scope", VariableFlags::Scope::Graph);
}
else
{
AZ::u8 exposureType = VariableFlags::Deprecated::Exposure::Exp_Local;
classElement.GetChildData<AZ::u8>(AZ_CRC("Exposure", 0x398f29cd), exposureType);
VariableFlags::Scope scope = VariableFlags::Scope::Local;
VariableFlags::Scope scope = VariableFlags::Scope::Graph;
if ((exposureType & VariableFlags::Deprecated::Exposure::Exp_InOut) == VariableFlags::Deprecated::Exposure::Exp_InOut)
{
scope = VariableFlags::Scope::InOut;
scope = VariableFlags::Scope::Graph;
}
else if (exposureType & VariableFlags::Deprecated::Exposure::Exp_Input)
{
scope = VariableFlags::Scope::Input;
scope = VariableFlags::Scope::Graph;
}
else if (exposureType & VariableFlags::Deprecated::Exposure::Exp_Output)
{
scope = VariableFlags::Scope::Output;
scope = VariableFlags::Scope::Function;
}
classElement.AddElementWithData<VariableFlags::Scope>(context, "Scope", scope);
@@ -153,6 +156,12 @@ namespace ScriptCanvas
return true;
}
const char* GraphVariable::s_InitialValueSourceNames[VariableFlags::InitialValueSource::COUNT] =
{
"From Graph",
"From Component"
};
void GraphVariable::Reflect(AZ::ReflectContext* context)
{
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
@@ -166,7 +175,7 @@ namespace ScriptCanvas
serializeContext->Class<GraphVariable>()
->Version(3, &GraphVariableVersionConverter)
->Version(4, &GraphVariableVersionConverter)
->Field("Datum", &GraphVariable::m_datum)
->Field("InputControlVisibility", &GraphVariable::m_inputControlVisibility)
->Field("ExposureCategory", &GraphVariable::m_exposureCategory)
@@ -176,29 +185,48 @@ namespace ScriptCanvas
->Attribute(AZ::Edit::Attributes::IdGeneratorFunction, &VariableId::MakeVariableId)
->Field("VariableName", &GraphVariable::m_variableName)
->Field("Scope", &GraphVariable::m_scope)
->Field("InitialValueSource", &GraphVariable::m_InitialValueSource)
;
if (auto editContext = serializeContext->GetEditContext())
{
auto propertyChoices = [] {
AZStd::vector< AZStd::pair<VariableFlags::InitialValueSource, AZStd::string>> choices;
choices.emplace_back(AZStd::make_pair(VariableFlags::InitialValueSource::Graph, s_InitialValueSourceNames[0]));
choices.emplace_back(AZStd::make_pair(VariableFlags::InitialValueSource::Component, s_InitialValueSourceNames[1]));
return choices;
};
editContext->Class<GraphVariable>("Variable", "Represents a Variable field within a Script Canvas Graph")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::Visibility, &GraphVariable::GetVisibility)
->Attribute(AZ::Edit::Attributes::ChildNameLabelOverride, &GraphVariable::GetDisplayName)
->Attribute(AZ::Edit::Attributes::NameLabelOverride, &GraphVariable::GetDisplayName)
->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &GraphVariable::GetDescriptionOverride)
->DataElement(AZ::Edit::UIHandlers::ComboBox, &GraphVariable::m_InitialValueSource, "Initial Value Source", "Variables can get their values from within the graph or through component properties.")
->Attribute(AZ::Edit::Attributes::GenericValueList, propertyChoices)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &GraphVariable::OnInitialValueSourceChanged)
->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::AttributesAndValues)
->Attribute(AZ::Edit::Attributes::Visibility, &GraphVariable::GetInputControlVisibility)
->DataElement(AZ::Edit::UIHandlers::Default, &GraphVariable::m_datum, "Datum", "Datum within Script Canvas Graph")
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &GraphVariable::OnValueChanged)
->DataElement(AZ::Edit::UIHandlers::ComboBox, &GraphVariable::m_scope, "Scope", "Controls the scope of this variable. i.e. If this is exposed as input to this script, or output from this script, or if the variable is just locally scoped.")
->Attribute(AZ::Edit::Attributes::Visibility, &GraphVariable::GetInputControlVisibility)
->Attribute(AZ::Edit::Attributes::GenericValueList, &GraphVariable::GetScopes)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &GraphVariable::OnScopeTypedChanged)
->DataElement(AZ::Edit::UIHandlers::Default, &GraphVariable::m_datum, "Datum", "Datum within Script Canvas Graph")
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &GraphVariable::OnValueChanged)
->DataElement(AZ::Edit::UIHandlers::Default, &GraphVariable::m_networkProperties, "Network Properties", "Enables whether or not this value should be network synchronized")
->Attribute(AZ::Edit::Attributes::Visibility, &GraphVariable::GetNetworkSettingsVisibility)
->DataElement(AZ::Edit::UIHandlers::Default, &GraphVariable::m_sortPriority, "Display Order", "Allows for customizable display order. -1 implies it will be at the end of the list.")
->Attribute(AZ::Edit::Attributes::Visibility, &GraphVariable::GetInputControlVisibility)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &GraphVariable::OnSortPriorityChanged)
->Attribute(AZ::Edit::Attributes::Min, -1)
;
}
}
@@ -222,34 +250,37 @@ namespace ScriptCanvas
GraphVariable::GraphVariable()
: m_sortPriority(-1)
, m_scope(VariableFlags::Scope::Local)
, m_scope(VariableFlags::Scope::Graph)
, m_inputControlVisibility(AZ::Edit::PropertyVisibility::Show)
, m_visibility(AZ::Edit::PropertyVisibility::ShowChildrenOnly)
, m_signalValueChanges(false)
, m_variableId(VariableId::MakeVariableId())
, m_InitialValueSource(VariableFlags::InitialValueSource::Graph)
{
}
GraphVariable::GraphVariable(const Datum& datum)
: m_sortPriority(-1)
, m_scope(VariableFlags::Scope::Local)
, m_scope(VariableFlags::Scope::Graph)
, m_inputControlVisibility(AZ::Edit::PropertyVisibility::Show)
, m_visibility(AZ::Edit::PropertyVisibility::ShowChildrenOnly)
, m_signalValueChanges(false)
, m_variableId(VariableId::MakeVariableId())
, m_datum(datum)
, m_InitialValueSource(VariableFlags::InitialValueSource::Graph)
{
}
GraphVariable::GraphVariable(Datum&& datum)
: m_sortPriority(-1)
, m_scope(VariableFlags::Scope::Local)
, m_scope(VariableFlags::Scope::Graph)
, m_inputControlVisibility(AZ::Edit::PropertyVisibility::Show)
, m_visibility(AZ::Edit::PropertyVisibility::ShowChildrenOnly)
, m_signalValueChanges(false)
, m_variableId(VariableId::MakeVariableId())
, m_datum(AZStd::move(datum))
, m_InitialValueSource(VariableFlags::InitialValueSource::Graph)
{
}
@@ -268,11 +299,7 @@ namespace ScriptCanvas
if (valuePair.m_varDatum.ExposeAsComponentInput())
{
SetScope(VariableFlags::Scope::Input);
}
else
{
SetScope(VariableFlags::Scope::Local);
SetScope(VariableFlags::Scope::Graph);
}
m_inputControlVisibility = valuePair.m_varDatum.GetInputControlVisibility();
@@ -324,9 +351,9 @@ namespace ScriptCanvas
datumView.ConfigureView((*this));
}
bool GraphVariable::IsExposedAsComponentInput() const
bool GraphVariable::IsComponentProperty() const
{
return IsInScope(VariableFlags::Scope::Input);
return m_scope == VariableFlags::Scope::Graph && m_InitialValueSource == ScriptCanvas::VariableFlags::InitialValueSource::Component;
}
void GraphVariable::SetVariableName(AZStd::string_view variableName)
@@ -413,32 +440,6 @@ namespace ScriptCanvas
m_visibility = visibility;
}
void GraphVariable::RemoveScope(VariableFlags::Scope scopeType)
{
if (IsInScope(scopeType))
{
if (m_scope == VariableFlags::Scope::InOut)
{
if (scopeType == VariableFlags::Scope::Input)
{
m_scope = VariableFlags::Scope::Output;
}
else if (scopeType == VariableFlags::Scope::Output)
{
m_scope = VariableFlags::Scope::Input;
}
else
{
m_scope = VariableFlags::Scope::Local;
}
}
else
{
m_scope = VariableFlags::Scope::Local;
}
}
}
void GraphVariable::SetScope(VariableFlags::Scope scopeType)
{
if (m_scope != scopeType)
@@ -457,23 +458,14 @@ namespace ScriptCanvas
{
switch (scopeType)
{
// All variables are local scoped
case VariableFlags::Scope::Local:
case VariableFlags::Scope::Graph:
return m_scope == VariableFlags::Scope::Graph;
// All graph variables are in function local scope
case VariableFlags::Scope::Function:
return true;
case VariableFlags::Scope::Input:
return m_scope == VariableFlags::Scope::Input || m_scope == VariableFlags::Scope::InOut;
case VariableFlags::Scope::Output:
return m_scope == VariableFlags::Scope::Output || m_scope == VariableFlags::Scope::InOut;
case VariableFlags::Scope::InOut:
return m_scope == VariableFlags::Scope::InOut;
default:
return false;
}
}
bool GraphVariable::IsLocalVariableOnly() const
{
return m_scope == VariableFlags::Scope::Local;
return false;
}
void GraphVariable::GenerateNewId()
@@ -506,6 +498,25 @@ namespace ScriptCanvas
return GraphScopedVariableId(m_scriptCanvasId, m_variableId);
}
AZ::u32 GraphVariable::SetInitialValueSource(VariableFlags::InitialValueSource InitialValueSource)
{
m_InitialValueSource = InitialValueSource;
return OnInitialValueSourceChanged();
}
AZ::u32 GraphVariable::SetInitialValueSourceFromName(AZStd::string_view name)
{
for (int i = 0; i < VariableFlags::InitialValueSource::COUNT; ++i)
{
if (name.compare(s_InitialValueSourceNames[i]) == 0)
{
return SetInitialValueSource(static_cast<VariableFlags::InitialValueSource>(i));
}
}
return 0;
}
void GraphVariable::OnDatumEdited([[maybe_unused]] const Datum* datum)
{
VariableNotificationBus::Event(GetGraphScopedId(), &VariableNotifications::OnVariableValueChanged);
@@ -514,16 +525,7 @@ namespace ScriptCanvas
AZStd::vector<AZStd::pair<VariableFlags::Scope, AZStd::string>> GraphVariable::GetScopes() const
{
AZStd::vector< AZStd::pair<VariableFlags::Scope, AZStd::string>> scopes;
scopes.emplace_back(AZStd::make_pair(VariableFlags::Scope::Local, VariableFlags::GetScopeDisplayLabel(VariableFlags::Scope::Local)));
scopes.emplace_back(AZStd::make_pair(VariableFlags::Scope::Input, VariableFlags::GetScopeDisplayLabel(VariableFlags::Scope::Input)));
if (IsInFunction())
{
scopes.emplace_back(AZStd::make_pair(VariableFlags::Scope::Output, VariableFlags::GetScopeDisplayLabel(VariableFlags::Scope::Output)));
scopes.emplace_back(AZStd::make_pair(VariableFlags::Scope::InOut, VariableFlags::GetScopeDisplayLabel(VariableFlags::Scope::InOut)));
}
scopes.emplace_back(AZStd::make_pair(m_scope, VariableFlags::GetScopeDisplayLabel(m_scope)));
return scopes;
}
@@ -540,6 +542,12 @@ namespace ScriptCanvas
return assetType == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>();
}
AZ::u32 GraphVariable::OnInitialValueSourceChanged()
{
VariableNotificationBus::Event(GetGraphScopedId(), &VariableNotifications::OnVariableInitialValueSourceChanged);
return AZ::Edit::PropertyRefreshLevels::EntireTree;
}
void GraphVariable::OnScopeTypedChanged()
{
VariableNotificationBus::Event(GetGraphScopedId(), &VariableNotifications::OnVariableScopeChanged);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariable.h
+23 -10
View File
@@ -52,16 +52,19 @@ namespace ScriptCanvas
enum class Scope : AZ::u8
{
Local = 0,
Input = 1,
Output = 2,
InOut = 3
Graph = 0,
Function = 1,
};
enum InitialValueSource : AZ::u8
{
Graph,
Component,
COUNT
};
const char* GetScopeDisplayLabel(Scope scopeType);
Scope GetScopeFromLabel(const char* label);
const char* GetScopeToolTip(Scope scopeType);
}
@@ -126,9 +129,9 @@ namespace ScriptCanvas
const Datum* GetDatum() const;
bool IsExposedAsComponentInput() const;
bool IsComponentProperty() const;
void ConfigureDatumView(ModifiableDatumView& accessController);
void ConfigureDatumView(ModifiableDatumView& accessController);
void SetVariableName(AZStd::string_view displayName);
AZStd::string_view GetVariableName() const;
@@ -146,12 +149,10 @@ namespace ScriptCanvas
AZ::Crc32 GetVisibility() const;
void SetVisibility(AZ::Crc32 visibility);
void RemoveScope(VariableFlags::Scope scopeType);
void SetScope(VariableFlags::Scope scopeType);
VariableFlags::Scope GetScope() const;
bool IsInScope(VariableFlags::Scope scopeType) const;
bool IsLocalVariableOnly() const;
void SetExposureCategory(AZStd::string_view exposureCategory) { m_exposureCategory = exposureCategory; }
AZStd::string_view GetExposureCategory() const { return m_exposureCategory; }
@@ -165,6 +166,13 @@ namespace ScriptCanvas
void SetOwningScriptCanvasId(const ScriptCanvasId& scriptCanvasId);
GraphScopedVariableId GetGraphScopedId() const;
AZStd::string_view GetInitialValueSourceName() const { return s_InitialValueSourceNames[m_InitialValueSource]; }
VariableFlags::InitialValueSource GetInitialValueSource() const { return m_InitialValueSource; }
AZ::u32 SetInitialValueSource(VariableFlags::InitialValueSource InitialValueSource);
AZ::u32 SetInitialValueSourceFromName(AZStd::string_view name);
// Editor Callbacks
void OnDatumEdited(const Datum* datum) override;
AZStd::vector<AZStd::pair<VariableFlags::Scope, AZStd::string>> GetScopes() const;
@@ -172,11 +180,14 @@ namespace ScriptCanvas
int GetSortPriority() const;
static const char* s_InitialValueSourceNames[VariableFlags::InitialValueSource::COUNT];
private:
bool IsInFunction() const;
void OnScopeTypedChanged();
AZ::u32 OnInitialValueSourceChanged();
void OnSortPriorityChanged();
void OnValueChanged();
@@ -186,6 +197,7 @@ namespace ScriptCanvas
int m_sortPriority;
VariableFlags::Scope m_scope;
VariableFlags::InitialValueSource m_InitialValueSource;
// Still need to make this a proper bitmask, once we have support for multiple
// input/output attributes. For now, just going to assume it's only the single flag(which is is).
@@ -205,6 +217,7 @@ namespace ScriptCanvas
Datum m_datum;
ReplicaNetworkProperties m_networkProperties;
};
using GraphVariableMapping = AZStd::unordered_map< VariableId, GraphVariable >;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
+1
View File
@@ -224,6 +224,7 @@ namespace ScriptCanvas
return AZ::Success(newId);
}
// #functions2 slot<->variable add this to the graph, using the old datum
AZ::Outcome<VariableId, AZStd::string> GraphVariableManagerComponent::AddVariable(AZStd::string_view name, const Datum& value)
{
if (FindVariable(name))
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableBus.h
+5 -3
View File
@@ -237,11 +237,13 @@ namespace ScriptCanvas
// Invoked after a variable is renamed
virtual void OnVariableRenamed(AZStd::string_view /*newVariableName*/) {}
virtual void OnVariableScopeChanged() {};
virtual void OnVariableScopeChanged() {}
virtual void OnVariablePriorityChanged() {};
virtual void OnVariableInitialValueSourceChanged() {}
virtual void OnVariableValueChanged() {};
virtual void OnVariablePriorityChanged() {}
virtual void OnVariableValueChanged() {}
};
using VariableNotificationBus = AZ::EBus<VariableNotifications>;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp
+8 -10
View File
@@ -211,9 +211,7 @@ namespace ScriptCanvas
AZStd::list<EditableVariableConfiguration> editableVariableConfigurationList;
for (auto varNameValuePair : varNameValueVariableList)
{
Datum defaultValue = varNameValuePair.m_varDatum.GetData();
editableVariableConfigurationList.push_back({ GraphVariable(AZStd::move(varNameValuePair)), defaultValue });
editableVariableConfigurationList.push_back({ GraphVariable(AZStd::move(varNameValuePair)), });
}
rootElementNode.RemoveElementByName(AZ_CRC("m_properties", 0x4227dbda));
@@ -263,12 +261,8 @@ namespace ScriptCanvas
m_variables.emplace_back();
EditableVariableConfiguration& newVarConfig = m_variables.back();
newVarConfig.m_graphVariable.DeepCopy(graphVariable);
newVarConfig.m_defaultValue.DeepCopyDatum((*graphVariable.GetDatum()));
newVarConfig.m_graphVariable.SetVariableName(varName);
return AZ::Success();
}
@@ -340,18 +334,23 @@ namespace ScriptCanvas
if (rootElementNode.GetVersion() < Version::VariableDatumSimplification)
{
Deprecated::VariableNameValuePair varNameValuePair;
if (!rootElementNode.GetChildData(AZ_CRC("m_variableNameValuePair", 0x89adc9d0), varNameValuePair))
if (!rootElementNode.GetChildData(AZ_CRC_CE("m_variableNameValuePair"), varNameValuePair))
{
return false;
}
rootElementNode.RemoveElementByName(AZ_CRC("m_variableNameValuePair", 0x89adc9d0));
rootElementNode.RemoveElementByName(AZ_CRC_CE("m_variableNameValuePair"));
GraphVariable variable(AZStd::move(varNameValuePair));
rootElementNode.AddElementWithData(serializeContext, "GraphVariable", variable);
}
if (rootElementNode.GetVersion() < Version::RemoveUnusedDefaultValue)
{
rootElementNode.RemoveElementByName(AZ_CRC_CE("m_defaultValue"));
}
return true;
}
@@ -362,7 +361,6 @@ namespace ScriptCanvas
serializeContext->Class<EditableVariableConfiguration>()
->Version(Version::Current, &EditableVariableConfiguration::VersionConverter)
->Field("GraphVariable", &EditableVariableConfiguration::m_graphVariable)
->Field("m_defaultValue", &EditableVariableConfiguration::m_defaultValue)
;
if (auto editContext = serializeContext->GetEditContext())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.h
+3 -4
View File
@@ -42,8 +42,8 @@ namespace ScriptCanvas
VariableData(VariableData&&);
VariableData& operator=(VariableData&&);
AZ_INLINE GraphVariableMapping& GetVariables() { return m_variableMap; }
AZ_INLINE const GraphVariableMapping& GetVariables() const { return m_variableMap; }
inline GraphVariableMapping& GetVariables() { return m_variableMap; }
inline const GraphVariableMapping& GetVariables() const { return m_variableMap; }
AZ::Outcome<VariableId, AZStd::string> AddVariable(AZStd::string_view varName, const GraphVariable& graphVariable);
@@ -75,7 +75,7 @@ namespace ScriptCanvas
{
InitialVersion,
VariableDatumSimplification,
RemoveUnusedDefaultValue,
// Should always be last
Current
};
@@ -88,7 +88,6 @@ namespace ScriptCanvas
static void Reflect(AZ::ReflectContext* context);
GraphVariable m_graphVariable;
Datum m_defaultValue;
};
//! Variable Data structure which uses the VariableNameValuePair struct to provide editor specific UI visualization