From 1d3b675f889a742ea577aa73edbdc694975a5d56 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Fri, 21 Jan 2022 09:35:42 -0800 Subject: [PATCH 1/4] Regenerated the Input handler .names file Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Nodes/Input_InputHandler.names | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names index 8ce3fd36df..120c8f8ef3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names @@ -1,7 +1,7 @@ { "entries": [ { - "base": "{0B0AC61B-4BBA-42BF-BDCD-DAF2D3CA41A8}", + "base": "{0A2EB488-5A6A-E166-BB62-23FF81499E33}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,6 +10,13 @@ "tooltip": "Handle processed input events found in input binding assets" }, "slots": [ + { + "base": "Input_Connect Event_0", + "details": { + "name": "Connect Event", + "tooltip": "Connect to input event name as defined in an input binding asset." + } + }, { "base": "DataInput_Event Name_0", "details": { @@ -17,27 +24,34 @@ } }, { - "base": "DataOutput_Value_0", + "base": "Output_On Connect Event_0", "details": { - "name": "Value" + "name": "On Connect Event", + "tooltip": "Connect to input event name as defined in an input binding asset." } }, { - "base": "Output_Pressed_0", + "base": "Output_Pressed_1", "details": { "name": "Pressed", "tooltip": "Signaled when the input event begins." } }, { - "base": "Output_Held_1", + "base": "DataOutput_value_0", + "details": { + "name": "value" + } + }, + { + "base": "Output_Held_2", "details": { "name": "Held", "tooltip": "Signaled while the input event is active." } }, { - "base": "Output_Released_2", + "base": "Output_Released_3", "details": { "name": "Released", "tooltip": "Signaled when the input event ends." From be2241bda956d286fbf0161600d84422635f1a15 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Fri, 21 Jan 2022 09:41:37 -0800 Subject: [PATCH 2/4] Navigate to file after generating translation (only 1) Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../ScriptCanvasNodePaletteDockWidget.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 60d903d748..4b622bc025 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -894,6 +894,26 @@ namespace ScriptCanvasEditor GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); nodePaletteItem->GenerateTranslationData(); } + + if (indexList.size() == 1) + { + AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance(); + QModelIndex sourceIndex = filterModel->mapToSource(indexList[0]); + if (sourceIndex.isValid()) + { + GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); + + AZ::IO::Path gemPath = GetGemPath("ScriptCanvas.Editor"); + gemPath = gemPath / AZ::IO::Path("TranslationAssets"); + gemPath = gemPath / nodePaletteItem->GetTranslationDataPath(); + gemPath.ReplaceExtension(".names"); + + if (fileIO->Exists(gemPath.c_str())) + { + AzQtComponents::ShowFileOnDesktop(gemPath.c_str()); + } + } + } } void NodePaletteDockWidget::OpenTranslationData() From f684fe14ff81d329e1ae90e434710a0418a5d8f7 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Fri, 21 Jan 2022 09:45:27 -0800 Subject: [PATCH 3/4] Categorized Material Data under Rendering Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Assets/TranslationAssets/Classes/MaterialData.names | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names index 9f6af426d0..72e48aa400 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Material Data" + "name": "Material Data", + "category": "Rendering" }, "methods": [ { From d5f7bc7c9beeaeceac4c01ed2e9c86c943978162 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Fri, 21 Jan 2022 10:03:02 -0800 Subject: [PATCH 4/4] Consolidated navigation to file code Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../ScriptCanvasNodePaletteDockWidget.cpp | 43 ++++++++----------- .../ScriptCanvasNodePaletteDockWidget.h | 1 + 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 4b622bc025..9387b58c71 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -881,6 +881,23 @@ namespace ScriptCanvasEditor return ""; } + void NodePaletteDockWidget::NavigateToTranslationFile(GraphCanvas::NodePaletteTreeItem* nodePaletteItem) + { + if (nodePaletteItem) + { + AZ::IO::Path gemPath = GetGemPath("ScriptCanvas.Editor"); + gemPath = gemPath / AZ::IO::Path("TranslationAssets"); + gemPath = gemPath / nodePaletteItem->GetTranslationDataPath(); + gemPath.ReplaceExtension(".names"); + + AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance(); + if (fileIO && fileIO->Exists(gemPath.c_str())) + { + AzQtComponents::ShowFileOnDesktop(gemPath.c_str()); + } + } + } + void NodePaletteDockWidget::GenerateTranslation() { QModelIndexList indexList = GetTreeView()->selectionModel()->selectedRows(); @@ -897,21 +914,11 @@ namespace ScriptCanvasEditor if (indexList.size() == 1) { - AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance(); QModelIndex sourceIndex = filterModel->mapToSource(indexList[0]); if (sourceIndex.isValid()) { GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); - - AZ::IO::Path gemPath = GetGemPath("ScriptCanvas.Editor"); - gemPath = gemPath / AZ::IO::Path("TranslationAssets"); - gemPath = gemPath / nodePaletteItem->GetTranslationDataPath(); - gemPath.ReplaceExtension(".names"); - - if (fileIO->Exists(gemPath.c_str())) - { - AzQtComponents::ShowFileOnDesktop(gemPath.c_str()); - } + NavigateToTranslationFile(nodePaletteItem); } } } @@ -929,19 +936,7 @@ namespace ScriptCanvasEditor QModelIndex sourceIndex = filterModel->mapToSource(index); GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); - if (nodePaletteItem) - { - AZ::IO::Path gemPath = GetGemPath("ScriptCanvas.Editor"); - gemPath = gemPath / AZ::IO::Path("TranslationAssets"); - gemPath = gemPath / nodePaletteItem->GetTranslationDataPath(); - gemPath.ReplaceExtension(".names"); - - AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance(); - if (fileIO->Exists(gemPath.c_str())) - { - AzQtComponents::ShowFileOnDesktop(gemPath.c_str()); - } - } + NavigateToTranslationFile(nodePaletteItem); } } } diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h index 9f5fa0511f..3ee26e3f71 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h @@ -209,6 +209,7 @@ namespace ScriptCanvasEditor void HandleTreeItemDoubleClicked(GraphCanvas::GraphCanvasTreeItem* treeItem); void OpenTranslationData(); void GenerateTranslation(); + void NavigateToTranslationFile(GraphCanvas::NodePaletteTreeItem*); void ConfigureHelper(); void ParseCycleTargets(GraphCanvas::GraphCanvasTreeItem* treeItem);