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

Updated Actor Animation nodes, fixed subtitles and improved tooltip information

Browse Source 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
This commit is contained in:
lsemp3d
2021-11-11 18:31:02 -08:00
parent 5d9f5ae15a
commit 1463e72016
2 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names
+28 -47
View File
@@ -5,7 +5,7 @@
"context": "EBusSender",
"variant": "",
"details": {
"name": "ActorComponentRequestBus",
"name": "Actor",
"category": "Animation"
},
"methods": [
@@ -13,20 +13,20 @@
"key": "GetRenderCharacter",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke GetRenderCharacter"
"tooltip": "When signaled, this will invoke Get Render Character"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after GetRenderCharacter is invoked"
"tooltip": "Signaled after Get Render Character is invoked"
},
"details": {
"name": "GetRenderCharacter"
"name": "Get Render Character"
},
"results": [
{
"typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
"details": {
"name": "bool"
"name": "Enabled"
}
}
]
@@ -49,20 +49,20 @@
"key": "GetRenderActorVisible",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke GetRenderActorVisible"
"tooltip": "When signaled, this will invoke Get Render Actor Visible"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after GetRenderActorVisible is invoked"
"tooltip": "Signaled after Get Render Actor Visible is invoked"
},
"details": {
"name": "GetRenderActorVisible"
"name": "Get Render Actor Visible"
},
"results": [
{
"typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
"details": {
"name": "bool"
"name": "Visible"
}
}
]
@@ -78,7 +78,8 @@
"tooltip": "Signaled after Attach To Entity is invoked"
},
"details": {
"name": "Attach To Entity"
"name": "Attach To Entity",
"category": "Actor Animation"
},
"params": [
{
@@ -91,7 +92,8 @@
{
"typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
"details": {
"name": "unsigned int"
"name": "Attachment Type",
"tooltip": "0: Actor, 1: Skin"
}
}
]
@@ -100,20 +102,20 @@
"key": "SetRenderCharacter",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke SetRenderCharacter"
"tooltip": "When signaled, this will invoke Set Render Character"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after SetRenderCharacter is invoked"
"tooltip": "Signaled after Set Render Character is invoked"
},
"details": {
"name": "SetRenderCharacter"
"name": "Set Render Character"
},
"params": [
{
"typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
"details": {
"name": "bool"
"name": "Enable"
}
}
]
@@ -122,26 +124,27 @@
"key": "GetJointTransform",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke GetJointTransform"
"tooltip": "When signaled, this will invoke Get Joint Transform"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after GetJointTransform is invoked"
"tooltip": "Signaled after Get Joint Transform is invoked"
},
"details": {
"name": "GetJointTransform"
"name": "Get Joint Transform"
},
"params": [
{
"typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
"details": {
"name": "AZ::u64"
"name": "Joint Index"
}
},
{
"typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}",
"details": {
"name": "unsigned int"
"name": "Space",
"tooltip": "0: Local, 1: Model, 2: World"
}
}
],
@@ -154,46 +157,24 @@
}
]
},
{
"key": "DebugDrawRoot",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke Debug Draw Root"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after Debug Draw Root is invoked"
},
"details": {
"name": "Debug Draw Root"
},
"params": [
{
"typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}",
"details": {
"name": "bool"
}
}
]
},
{
"key": "GetJointIndexByName",
"entry": {
"name": "In",
"tooltip": "When signaled, this will invoke GetJointIndexByName"
"tooltip": "When signaled, this will invoke Get Joint Index By Name"
},
"exit": {
"name": "Out",
"tooltip": "Signaled after GetJointIndexByName is invoked"
"tooltip": "Signaled after Get Joint Index By Name is invoked"
},
"details": {
"name": "GetJointIndexByName"
"name": "Get Joint Index By Name"
},
"params": [
{
"typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}",
"details": {
"name": "char"
"name": "Name"
}
}
],
@@ -201,7 +182,7 @@
{
"typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}",
"details": {
"name": "AZ::u64"
"name": "Joint Index"
}
}
]
Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+32 -6
View File
@@ -290,16 +290,28 @@ namespace ScriptCanvasEditor::Nodes
const AZStd::string& className = methodNode->GetMethodClassName();
const AZStd::string& methodName = methodNode->GetName();
GraphCanvas::TranslationKey key;
key = isEBusSender ? "EBusSender" : "BehaviorClass";
key << className;
key << "methods" << methodName;
GraphCanvas::TranslationRequests::Details details;
details.m_name = methodName;
GraphCanvas::TranslationKey key;
key = isEBusSender ? "EBusSender" : "BehaviorClass";
key << className;
GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key + ".details", details);
// Set the class' category as the subtitle fallback
details.m_subtitle = details.m_category;
// Get the method's text data
key << "methods" << methodName;
GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key + ".details", details);
// Add to the tooltip the C++ class for reference
if (!details.m_tooltip.empty())
{
details.m_tooltip.append("\n");
}
details.m_tooltip.append(AZStd::string::format("[C++] %s", className.c_str()));
GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetDetails, details.m_name, details.m_subtitle);
GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
@@ -449,6 +461,13 @@ namespace ScriptCanvasEditor::Nodes
details.m_name = busName;
GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details);
// Add to the tooltip the C++ class for reference
if (!details.m_tooltip.empty())
{
details.m_tooltip.append("\n");
}
details.m_tooltip.append(AZStd::string::format("[C++] %s", busName.c_str()));
GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetTitle, details.m_name);
GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetDefaultPalette, "HandlerWrapperNodeTitlePalette");
@@ -486,6 +505,13 @@ namespace ScriptCanvasEditor::Nodes
// Set the name
graphCanvasEntity->SetName(AZStd::string::format("GC-Node(%s)", decoratedName.c_str()));
// Add to the tooltip the C++ class for reference
if (!details.m_tooltip.empty())
{
details.m_tooltip.append("\n");
}
details.m_tooltip.append(AZStd::string::format("[C++] %s", busName.c_str()));
GraphCanvas::NodeRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeRequests::SetTooltip, details.m_tooltip);
GraphCanvas::NodeTitleRequestBus::Event(graphCanvasNodeId, &GraphCanvas::NodeTitleRequests::SetTitle, details.m_name);
@@ -730,7 +756,7 @@ namespace ScriptCanvasEditor::Nodes
return graphCanvasNodeId;
}
// Function Nodes
// Function Nodes
AZ::EntityId DisplayFunctionNode(AZ::EntityId graphCanvasGraphId, const ScriptCanvas::Nodes::Core::FunctionCallNode* functionNode)
{
return DisplayFunctionNode(graphCanvasGraphId, const_cast<ScriptCanvas::Nodes::Core::FunctionCallNode*>(functionNode));