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

Applied feedback from PR

Browse Source 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
This commit is contained in:
lsemp3d
2021-11-17 07:52:46 -08:00
parent 2e733b4950
commit a623f04f46
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/MethodConfiguration.cpp
+1 -2
View File
@@ -56,7 +56,7 @@ namespace ScriptCanvas
{
const Data::Type outputType = (unpackedTypes.size() == 1 && AZ::BehaviorContextHelper::IsStringParameter(*result)) ? Data::Type::String() : Data::FromAZType(unpackedTypes[resultIndex]);
AZStd::string resultSlotName(Data::GetName(outputType).data());
AZStd::string resultSlotName(Data::GetName(outputType));
AZStd::string className = outputConfig.config.m_className ? *outputConfig.config.m_className : "";
if (className.empty())
@@ -80,7 +80,6 @@ namespace ScriptCanvas
if (outputConfig.isReturnValueOverloaded)
{
DynamicDataSlotConfiguration slotConfiguration;
//slotConfiguration.m_name = outputConfig.outputNamePrefix + resultSlotName;
slotConfiguration.m_dynamicDataType = outputConfig.methodNode->GetOverloadedOutputType(resultIndex);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
-1
View File
@@ -256,7 +256,6 @@ namespace ScriptCanvas
{
DataSlotConfiguration slotConfiguration;
//slotConfiguration.m_name = AZStd::string::format("%s: %s", Data::Traits<ArgType>::GetName().data(), t_Traits::GetArgName(Index));
slotConfiguration.m_name = t_Traits::GetArgName(Index);
slotConfiguration.ConfigureDatum(AZStd::move(Datum(Data::FromAZType(Data::Traits<ArgType>::GetAZType()), Datum::eOriginality::Copy)));
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+1 -1
View File
@@ -518,7 +518,7 @@ namespace ScriptCanvas
{
const AZ::BehaviorParameter& argument(event.m_parameters[AZ::eBehaviorBusForwarderEventIndices::Result]);
Data::Type inputType(AZ::BehaviorContextHelper::IsStringParameter(argument) ? Data::Type::String() : Data::FromAZType(argument.m_typeId));
const AZStd::string argName(Data::GetName(inputType).data());
const AZStd::string argName(Data::GetName(inputType));
DataSlotConfiguration resultConfiguration;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp
+2 -2
View File
@@ -272,7 +272,7 @@ namespace ScriptCanvas
Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId));
// multiple outs will need out value names
const AZStd::string resultSlotName(Data::GetName(outputType).c_str());
const AZStd::string resultSlotName(Data::GetName(outputType));
DataSlotConfiguration slotConfiguration;
@@ -343,7 +343,7 @@ namespace ScriptCanvas
{
Data::Type outputType(AZ::BehaviorContextHelper::IsStringParameter(*result) ? Data::Type::String() : Data::FromAZType(result->m_typeId));
// multiple outs will need out value names
const AZStd::string resultSlotName(Data::GetName(outputType).c_str());
const AZStd::string resultSlotName(Data::GetName(outputType));
Slot* slot = GetSlotByName(resultSlotName);